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 |
|
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 |
|