Commit graph

6126 commits

Author SHA1 Message Date
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
Jure Grabnar
fe3e92468f
Merge pull request #1611 from jbargu/jg_sci_3226_3243
Too much empty space between date buttons [SCI-3243] [SCI-3226]
2019-03-29 12:30:53 +01:00
aignatov-bio
5c8f976ad1
Adding missed project comment activities [SCI-3250] (#1612)
* Adding missed project comment activities

* Fix markup
2019-03-29 11:45:31 +01:00
Oleksii Kriuchykhin
7d4fbcb32e Fix unconfirmed users clean-up issues [SCI-3172] 2019-03-29 11:11:53 +01:00
Jure Grabnar
8bc10e1ca7 Change breadcrumbs for cloning experiment to destination project 2019-03-29 09:52:07 +01:00
Alex Kriuchykhin
913bdd91be
Merge pull request #1610 from okriuchykhin/ok_SCI_3251
Make subject search more precise in global activities [SCI-3251]
2019-03-29 09:28:13 +01:00
aignatov-bio
b51dcc9d75
Adding children selector to global activities subjects [SCI-3247] (#1605)
* Adding children selector to global activities subjects

* Fix naming, add seperate check for project id
2019-03-29 09:26:27 +01:00
aignatov-bio
ba4b35d004
Fix date hot buttons (#1606) 2019-03-29 09:07:46 +01:00
aignatov-bio
ce7bbd6b07
Adding deselect button to objects filter and some localizations fix (#1608) 2019-03-29 09:04:58 +01:00
Jure Grabnar
226cf21787 No top margin for select custom dates button 2019-03-29 08:42:15 +01:00
Jure Grabnar
e9133bbea9 Remove empty space between date buttons
Closes SCI-3243
2019-03-29 08:29:16 +01:00
Jure Grabnar
e8a4fd5360 Fix date label
Closes SCI-3226
2019-03-29 08:18:15 +01:00
Alex Kriuchykhin
88b4ca0798
Merge pull request #1609 from okriuchykhin/ok_SCI_3213
Fix role name in change user role in team activity [SCI-3213]
2019-03-28 17:32:51 +01:00
Alex Kriuchykhin
9137740266
Merge pull request #1607 from okriuchykhin/ok_SCI_3229
Fix links for archived objects in global activities [SCI-3229][SCI-3241]
2019-03-28 17:32:24 +01:00
Oleksii Kriuchykhin
58af23e9b5 Make subject search more precise in global activities [SCI-3251] 2019-03-28 17:03:05 +01:00
Oleksii Kriuchykhin
6bc944fcc7 Fix role name in change user role in team activity [SCI-3213] 2019-03-28 16:26:07 +01:00
Oleksii Kriuchykhin
5008339d81 Add handling of links for objects from another team [SCI-3229][SCI-3241] 2019-03-28 14:56:34 +01:00