Commit graph

5480 commits

Author SHA1 Message Date
Anton Ignatov
811f07a62c Update API endpoints for new activities 2019-04-08 15:07:45 +02:00
mlorb
f566dd6c83
Merge pull request #1648 from mlorb/ml-sci-3214
Remove activities that belong to addons [SCI-3214]
2019-04-08 11:48:55 +02:00
Mojca Lorber
501c46bc92 Remove activities that belong to addons 2019-04-05 16:25:22 +02:00
Urban Rotnik
2cbf70819f
Merge pull request #1647 from urbanrotnik/ur-sci-3134
Change step header, remove vertical line
2019-04-05 11:08:49 +02:00
Urban Rotnik
26cf8271a1 Change step header, remove vertical line 2019-04-05 10:57:38 +02:00
Jure Grabnar
bc9eff2ef5 Add asset validation on wopi creation
Missing file
2019-04-04 17:05:25 +02:00
Jure Grabnar
d9a9045658 Hound formatting 2019-04-04 17:05:25 +02:00
Jure Grabnar
d60cc2cd1c Refactor create_wopi_file 2019-04-04 17:05:25 +02:00
Jure Grabnar
56bb62c5b0 Addtional formatting fixes 2019-04-04 17:05:25 +02:00
Jure Grabnar
20446fb39d Hound formatting fixes 2019-04-04 17:05:25 +02:00
Jure Grabnar
7ac88ee84b Change icons to be relative 2019-04-04 17:05:25 +02:00
Jure Grabnar
cbf109f884 Fix create WOPI file button
Closes SCI-3137
2019-04-04 17:05:25 +02:00
Jure Grabnar
fddff9c627 Perform styling on the WOPI modal 2019-04-04 17:05:25 +02:00
Jure Grabnar
983f90ddf6 Add file name presence check 2019-04-04 17:05:25 +02:00
Jure Grabnar
38e47b93ab Update labels 2019-04-04 17:05:25 +02:00
Jure Grabnar
b12916b828 Add main functionality 2019-04-04 17:05:25 +02:00
Jure Grabnar
613843d095 Temp commit 2019-04-04 16:58:55 +02:00
Jure Grabnar
9a4cd4fda2 Add file_present true 2019-04-04 16:57:36 +02:00
Jure Grabnar
3b8e6fa47c Test office online 2019-04-04 16:57:36 +02:00
Miha Mencin
ea4cc7ba0f
Update VERSION to 1.16.0
Update VERSION to 1.16.0
2019-04-04 11:07:42 +02:00
aignatov-bio
a1047f4597
Fix activities wording [SCI-3287] (#1635)
* Fix activities wording

* Adding project to export protocol
2019-04-04 10:45:35 +02:00
Miha Mencin
5a73f3f72c
Merge pull request #1643 from biosistemika/SCI-3286-fix-deleted-reports-activities
[SCI-3286] Once result is deleted all corresponding results activity are deleted as well
2019-04-04 10:43:29 +02:00
Miha Mencin
97d9fde3fd SCI-3286 add breadcrumbs to the report activity 2019-04-04 10:30:31 +02:00
Alex Kriuchykhin
ce63f077d8
Merge pull request #1642 from okriuchykhin/ok_SCI_3290
Disable inventory import activity logging [SCI-3290]
2019-04-04 00:53:33 +02:00
Oleksii Kriuchykhin
e7151e6e6b Disable inventory import activity logging [SCI-3290] 2019-04-03 22:42:33 +02:00
Alex Kriuchykhin
93b5d473c0
Merge pull request #1641 from okriuchykhin/ok_SCI_3290
Fix activity generation with discarded inventories [SCI-3290]
2019-04-03 21:19:45 +02:00
Oleksii Kriuchykhin
d6bd703ec8 Fix activity genereation with discarded inventories [SCI-3290] 2019-04-03 21:18:48 +02:00
Alex Kriuchykhin
d8ce4d4a91
Merge pull request #1640 from okriuchykhin/ok_SCI_3281_v2
Fix activity creation for editing wopi file in protocol repository [SCI-3281]
2019-04-03 21:14:36 +02:00
Jure Grabnar
834482c2a7
Merge pull request #1639 from jbargu/jg_3288
Remove archive_task from extends.rb [SCI-3288]
2019-04-03 21:13:42 +02:00
Oleksii Kriuchykhin
14978f7c1f Fix activity creation for editing wopi file in protocol repository [SCI-3281] 2019-04-03 19:51:54 +02:00
Jure Grabnar
7136294386 Remove archive_task from the list of activity_types
Closes SCI-3288
2019-04-03 19:13:00 +02:00
Alex Kriuchykhin
91d379fc78
Merge pull request #1636 from okriuchykhin/ok_SCI_3285
Fix missing old activities on task activity page and user popup in global activities [SCI-3285]
2019-04-03 19:04:13 +02:00
Alex Kriuchykhin
c86b535a25
Merge pull request #1638 from okriuchykhin/ok_SCI_3289
Improve large image saving after editing [SCI-3289]
2019-04-03 16:44:08 +02:00
Oleksii Kriuchykhin
9e91e9e59d Improve large image saving after editing [SCI-3289] 2019-04-03 16:31:56 +02:00
Miha Mencin
f7bc83935c
Merge pull request #1637 from jbargu/jg_sci_3273
Wrong counter of step items, it now starts with one [SCI-3273]
2019-04-03 14:56:09 +02:00
Jure Grabnar
f00f4d39af Refactor step activities using position_plus_one
Closes SCI-3273
2019-04-03 13:10:45 +02:00
Jure Grabnar
26848ecaef Refactor step position + 1 into a method 2019-04-03 13:07:30 +02:00
Oleksii Kriuchykhin
8c2b2513b0 Fix user popup in global activities [SCI-3285] 2019-04-03 12:53:52 +02:00
Urban Rotnik
05963eb245
Merge pull request #1634 from urbanrotnik/ur-sci-3288-archive-task-translation
Fix archive task translation [SCI-3288]
2019-04-03 12:00:35 +02:00
Alex Kriuchykhin
bfd275c313
Merge pull request #1632 from okriuchykhin/ok_SCI_3281
Fix permission checks for file editing and make protocol preview files read only [SCI-3281]
2019-04-03 11:39:59 +02:00
Urban Rotnik
1257c8fd80 Fix archive task translation 2019-04-03 11:21:53 +02:00
Jure Grabnar
6a9ef8b98d
Merge pull request #1633 from jbargu/jg_sci_3276
Wrap user sign_in into rescue block [SCI-3276]
2019-04-03 10:56:56 +02:00
aignatov-bio
e034a0c055
Fix bug with update protocol from repository and modal disable button [SCI-3284] (#1631)
* Fix bug with update protocol from repository and modal disable button
2019-04-03 09:18:18 +02:00
Jure Grabnar
91820ed9c1 Wrap sign_in user into begin/rescue block
Closes SCI-3276
2019-04-03 09:09:20 +02:00
Oleksii Kriuchykhin
01ffb43c23 Include old activites assigned to the task [SCI-3285] 2019-04-02 18:37:55 +02:00
Jure Grabnar
b679eb4a58
Merge pull request #1630 from jbargu/jg_sci_3279_3283
Step with Office Online files can be deleted, asset name is shown in activities screen [SCI-3279, 3283]
2019-04-02 17:59:51 +02:00
Oleksii Kriuchykhin
c47d243b1f Disable WOPI edit button in read only mode [SCI-3281] 2019-04-02 17:45:26 +02:00
Oleksii Kriuchykhin
ffa7c5ecb2 Fix permition checks for file editing and make protocol preview files read only [SCI-3281] 2019-04-02 16:38:53 +02:00
Jure Grabnar
22d193114e Add asset to activity message item type
Closes SCI-3283
2019-04-02 16:10:20 +02:00
aignatov-bio
3a2f78d7a8
Fix freeze top pane tags bug (#1627) 2019-04-02 16:05:48 +02:00