Commit graph

5125 commits

Author SHA1 Message Date
Luka Murn
9efeb32077
Merge pull request #1560 from biosistemika/lm-fix-rubocop-line-length
Change line length in rubocop to 120
2019-03-19 16:15:50 +01:00
Jure Grabnar
8831ebdcc9
Merge pull request #1559 from jbargu/jg_sci_2949
Office file in inventory item can be edited in spite of assigned item to a locked task[SCI-2949]
2019-03-18 21:11:51 +01:00
Luka Murn
a4ce2b66ce
Merge pull request #1565 from Ducz0r/lm-fix-stack-trace-on-wopi-middleware
Fix stack trace trimming on WOPI middleware
2019-03-15 14:34:22 +01:00
Oleksii Kriuchykhin
06b5667ec5 Update VERSION to 1.15.8 2019-03-14 11:12:41 +01:00
Alex Kriuchykhin
81a25d9f84
Merge pull request #1564 from okriuchykhin/rails_update
Update Rails to 5.1.6.2
2019-03-14 09:56:00 +01:00
Luka Murn
fc4b271803 Fix stack trace trimming on WOPI middleware 2019-03-14 08:34:04 +01:00
Oleksii Kriuchykhin
0b0141de5f Update Rails to 5.1.6.2 2019-03-13 20:32:29 +01:00
Miha Mencin
70f7161c65
Update version 2019-03-13 14:45:07 +01:00
Luka Murn
5987be79c3
Change line length in rubocop to 120 2019-03-08 14:09:38 +01:00
Jure Grabnar
eceda4909f Move edit_file permission for wopi file in a special function
Used for overwritting it in addons.

Closes SCI-2949
2019-03-08 12:22:35 +01:00
Alex Kriuchykhin
bb29a97962
Merge pull request #1557 from okriuchykhin/ok_SCI_3151
Improve JS files inclusion in export all [SCI-3151]
2019-03-07 17:46:45 +01:00
Oleksii Kriuchykhin
af9daf3a5e Improve JS files inclusion in export all [SCI-3151] 2019-03-07 17:42:47 +01:00
Alex Kriuchykhin
ec1aec3bf1
Merge pull request #1556 from okriuchykhin/ok_SCI_3048
Fix local storage file download links [SCI-3048]
2019-03-07 16:58:30 +01:00
Oleksii Kriuchykhin
0c99ea9c5c Fix local storage file download links [SCI-3048] 2019-03-07 16:46:05 +01:00
Alex Kriuchykhin
3da3ef0e8e
Merge pull request #1555 from okriuchykhin/ok_SCI_3151
Embed tables JS files to main HTML of Export All [SCI-3151]
2019-03-07 14:34:28 +01:00
Oleksii Kriuchykhin
8cc95bf491 Embed tables JS files to main HTML of Export All [SCI-3151] 2019-03-07 14:23:10 +01:00
Alex Kriuchykhin
d5110a4f87
Merge pull request #1554 from okriuchykhin/ok_SCI_3150
Fix JS files inclusion in export all report [SCI-3150]
2019-03-07 11:17:51 +01:00
Oleksii Kriuchykhin
2b239e2f35 Fix JS files inclusion in export all report [SCI-3150] 2019-03-07 11:14:38 +01:00
Luka Murn
4e2b971e9b
Update VERSION to 1.15.6 2019-03-06 10:43:52 +01:00
Miha Mencin
8fbda40c49
Merge pull request #1552 from biosistemika/mm-sci-3119-create-templates-at-login
put the scheduling logic into session create action
2019-03-05 10:56:48 +01:00
Miha Mencin
9807c80286 move the create action to the tope section of controller 2019-03-05 10:49:36 +01:00
Miha Mencin
67fe486874 put the scheduling logic into session create action 2019-03-05 10:43:39 +01:00
aignatov-bio
6dcaea973d
Merge pull request #1550 from aignatov-bio/ai-sci-3123-keep-title-bold
Bold text for read messages SCI-3123
2019-03-05 10:30:16 +01:00
Miha Mencin
0bd40dca4e
Merge pull request #1549 from biosistemika/mm-sci-3119-create-templates-at-login
Prepare a mechanism to schedule the template creation at user login
2019-03-05 09:24:23 +01:00
Miha Mencin
6deaff6382 fixing hound errors 2019-03-04 18:36:32 +01:00
Miha Mencin
fa7bba9de7 scheduling creation of demo project at the sign in time
remove wrong schema, fix comment, add migration
2019-03-04 18:26:15 +01:00
Anton Ignatov
33682bb561 Bold text for read messages 2019-03-04 13:48:25 +01:00
Miha Mencin
2ba040980f reverting the team changes, the scope is not needed 2019-03-01 17:48:38 +01:00
Miha Mencin
844303ae7c SCI-3119 schedule the creaton of template 2019-03-01 17:47:04 +01:00
Miha Mencin
b501327c87
Update version 2019-03-01 15:30:31 +01:00
aignatov-bio
d69f8c5636
Merge pull request #1547 from aignatov-bio/ai-sci-3114-recapthca-bug
Remove script from modal SCI-3114
2019-03-01 14:58:49 +01:00
Anton Ignatov
f636b5adff Remove script from modal 2019-03-01 14:56:06 +01:00
aignatov-bio
9a007b5d75
Merge pull request #1542 from aignatov-bio/ai-sci-3108-missing-user-name-in-activity
Fix missing user name in activty, when moving experiment [SCI-3108]
2019-03-01 14:16:59 +01:00
Alex Kriuchykhin
985820a97c
Merge pull request #1527 from okriuchykhin/ok_SCI_3101
Move templates project creation for new team to delayed job [SCI-3101]
2019-03-01 13:55:49 +01:00
Alex Kriuchykhin
09ed7922da
Merge pull request #1543 from okriuchykhin/ok_SCI_3107
Improve speed of index query in projects overview service [SCI-3107]
2019-03-01 13:53:56 +01:00
aignatov-bio
bf9c571c09
Merge pull request #1546 from aignatov-bio/ai-sci-3114-recapthca-bug
Fix the issues we were having with reCAPTCHA on the the February lauch day [SCI - 3114]
2019-03-01 13:28:45 +01:00
Anton Ignatov
1ae4a60f79 Fix recaptha error 2019-03-01 12:58:31 +01:00
Oleksii Kriuchykhin
1fedb4c91e Improve speed of index query in projects overview service [SCI-3107] 2019-02-28 17:46:34 +01:00
Anton Ignatov
9e472c0ccf Fix missing user name in activty, when moving experiment 2019-02-28 16:06:23 +01:00
Miha Mencin
1ef8108521
update version to 1.15.4 2019-02-28 13:01:59 +01:00
Miha Mencin
20db41d361
Merge pull request #1540 from biosistemika/sci-3112-change-the-comments
SCI-3112 Change the the comments in demo project generator
2019-02-28 11:43:20 +01:00
Miha Mencin
4f9daa9590 SCI-3112 Change the the comments in demo project generator 2019-02-28 11:39:44 +01:00
Miha Mencin
088a860683
Merge pull request #1539 from biosistemika/features/templates
Features/templates
2019-02-28 10:23:13 +01:00
Jure Grabnar
18c738263d
Merge pull request #1536 from jbargu/jg_sci_3100
Missing item smart annotation in Demo project [SCI-3100, 3098]
2019-02-28 09:52:28 +01:00
Miha Mencin
d03ef2cd2a
Merge branch 'master' into features/templates 2019-02-28 09:41:20 +01:00
Jure Grabnar
93490a1f47 Add missing created_at and fix typo
Closes SCI-3100, SCI-3098
2019-02-28 07:29:25 +01:00
Miha Mencin
e0ef3781a8
Merge pull request #1538 from biosistemika/revert-1522-ai-sci-3058-task-info-section-improvments
Revert "Task info section improvements [SCI - 3058]"
2019-02-27 21:51:53 +01:00
Miha Mencin
a372ebf07d
Revert "Task info section improvements [SCI - 3058]" 2019-02-27 21:00:11 +01:00
Jure Grabnar
0fbbe8b5de Add result comments to demo project
Closes [SCI-3100].
2019-02-27 20:32:28 +01:00
Miha Mencin
576520659c
Merge pull request #1532 from biosistemika/mm-sci-3031-remove-duplicated-relations
added uniquness validator and index on user_projects and user_teams r…
2019-02-27 19:53:25 +01:00