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 |
|
Anton Ignatov
|
94efd2e649
|
Fix tests
|
2019-04-02 16:04:50 +02:00 |
|
Alex Kriuchykhin
|
93350d1ac8
|
Merge pull request #1626 from okriuchykhin/ok_SCI_3174
Fix comment menu position on canvas [SCI-3174]
|
2019-04-02 15:10:14 +02:00 |
|
Alex Kriuchykhin
|
76e016f164
|
Merge pull request #1628 from urbanrotnik/ur-sci-3282-fix-dates-for-activities
Show date value without link [SCI-3282]
|
2019-04-02 14:40:53 +02:00 |
|
Urban Rotnik
|
86ddbc68b6
|
fixup! Show date actual value without link
|
2019-04-02 14:21:06 +02:00 |
|
Jure Grabnar
|
a2623b5124
|
Fix non-existant current_team in WOPI create_activity
Closes SCI-3279
|
2019-04-02 14:20:01 +02:00 |
|
Anton Ignatov
|
c9f9523210
|
Remove src when save description and rename token tag
|
2019-04-02 13:41:32 +02:00 |
|
Urban Rotnik
|
8eaeeee9f8
|
Show date actual value without link
|
2019-04-02 13:15:34 +02:00 |
|
Oleksii Kriuchykhin
|
91a87cbf3a
|
Fix comment menu position on canvas [SCI-3174]
|
2019-04-02 12:54:21 +02:00 |
|
Jure Grabnar
|
ac1b43165d
|
Merge pull request #1625 from jbargu/jg_sci_3257
Remove html_safe on activities [SCI-3257]
|
2019-04-02 12:04:01 +02:00 |
|
aignatov-bio
|
e6102c72c7
|
Adding missed activities [SCI-3253] (#1614)
* Adding missed activties
* Adding test for activities
|
2019-04-02 11:50:37 +02:00 |
|
Jure Grabnar
|
8443ed0fb3
|
Add sanitize input to old activity messages
|
2019-04-02 11:25:07 +02:00 |
|
Jure Grabnar
|
5dd0cf091f
|
Remove html_safe from activites head title
|
2019-04-02 11:16:08 +02:00 |
|
aignatov-bio
|
e93b0c3109
|
Adding preload filters for global activities [SCI-3254] (#1619)
* Adding preload filter for global activities
* Adding link to task activities
|
2019-04-02 11:14:36 +02:00 |
|
Urban Rotnik
|
6ec22c0b3b
|
Merge pull request #1618 from urbanrotnik/ur-sci-3240-missing-activities-of-intentory
Missing activities, fix for showing report name, add step positions, fixed links [SCI-3240] [SCI-3246]
|
2019-04-02 11:02:57 +02:00 |
|
Jure Grabnar
|
85bbdcf4b3
|
Remove .html_safe from activity
Closes SCI-3257
|
2019-04-02 11:02:22 +02:00 |
|
Urban Rotnik
|
73dd6678ee
|
Fix for show date value
|
2019-04-02 10:36:11 +02:00 |
|
aignatov-bio
|
daaa6a367b
|
Adding custom scrollbar to global activities [SCI-3206] (#1623)
* Adding custom scrollbar to global activities
|
2019-04-02 09:56:50 +02:00 |
|
Urban Rotnik
|
dc0c629798
|
Fix to show report name in Activities
|
2019-04-01 15:58:28 +02:00 |
|
Urban Rotnik
|
0ed96d68de
|
Add step position for steps in Protocol repository. Add default value for blank names also.
|
2019-04-01 15:58:17 +02:00 |
|
Urban Rotnik
|
b91f08fe99
|
Add activity for copying Inventory and Invetory item
|
2019-04-01 15:40:00 +02:00 |
|
Jure Grabnar
|
5443bfcbd1
|
Merge pull request #1622 from jbargu/jg_3242
Remove JS memory leak on project index page
|
2019-04-01 15:36:30 +02:00 |
|
Alex Kriuchykhin
|
b3aa6be23d
|
Merge pull request #1621 from okriuchykhin/ok_SCI_3255
Add global activities to reports [SCI-3255]
|
2019-04-01 15:07:06 +02:00 |
|
Jure Grabnar
|
d9c10c6c7b
|
Remove reapplying callback actions on project index page
Closes SCI-3242.
|
2019-04-01 15:02:47 +02:00 |
|
Jure Grabnar
|
e165459ef5
|
Merge pull request #1574 from jbargu/jg_sci_3149_3163
Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]
|
2019-04-01 14:32:54 +02:00 |
|
mlorb
|
b24a07f1c8
|
Merge pull request #1616 from mlorb/ml-sci-3237
Change activities for task protocols [SCI-3237]
|
2019-04-01 14:32:16 +02:00 |
|
Jure Grabnar
|
83130426e2
|
Merge pull request #1617 from jbargu/jg_3244
Duplicated activity, report activity ... [SCI-3244]
|
2019-04-01 14:31:53 +02:00 |
|
Urban Rotnik
|
213226fba8
|
Merge pull request #1620 from urbanrotnik/ur-sci-3245-activity-error-when-delete-result
Fix showing result icon when result is deleted [SCI-3245]
|
2019-04-01 14:25:19 +02:00 |
|
Jure Grabnar
|
ebc2d8ee75
|
Fix experiment_spec test using the old variable
Closes SCI-3244
|
2019-04-01 12:50:35 +02:00 |
|
Jure Grabnar
|
111b0e2b7f
|
Merge pull request #1615 from jbargu/jg_sci_3252
Change breadcrumbs for copy as template experiment, missing activity for move workflow [SCI-3252]
|
2019-04-01 12:30:48 +02:00 |
|
Oleksii Kriuchykhin
|
98e58ff7eb
|
Add global activities to reports [SCI-3255]
|
2019-04-01 11:26:51 +02:00 |
|
Urban Rotnik
|
03dcc91cf1
|
Fix showing result icon when result is deleted
|
2019-04-01 09:58:13 +02:00 |
|
Jure Grabnar
|
6b5cd34811
|
Capitalize the C in clear
Closes SCI-3244
|
2019-03-29 16:02:45 +01:00 |
|
Jure Grabnar
|
3a79f7ca01
|
Add activity to save_pdf_to_inventory_item
|
2019-03-29 16:01:36 +01:00 |
|
Jure Grabnar
|
6533368763
|
Add activity for importing inv items
|
2019-03-29 15:41:34 +01:00 |
|
Mojca Lorber
|
3c69225d6b
|
Change activities for task protocols
|
2019-03-29 15:09:20 +01:00 |
|
Jure Grabnar
|
8585be1c90
|
Remove duplicated Task archived activity
|
2019-03-29 15:07:41 +01:00 |
|
Jure Grabnar
|
f843092aac
|
Add activity for moving worklfows
Closes SCI-3252
|
2019-03-29 13:51:17 +01:00 |
|
Alex Kriuchykhin
|
a9501603c2
|
Merge pull request #1613 from okriuchykhin/ok_SCI_3172
Fix unconfirmed users clean-up issues [SCI-3172]
|
2019-03-29 13:10:34 +01:00 |
|