Commit graph

1154 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
9e91e9e59d Improve large image saving after editing [SCI-3289] 2019-04-03 16:31:56 +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
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
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
aignatov-bio
3a2f78d7a8
Fix freeze top pane tags bug (#1627) 2019-04-02 16:05:48 +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
Oleksii Kriuchykhin
91a87cbf3a Fix comment menu position on canvas [SCI-3174] 2019-04-02 12:54:21 +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
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
Jure Grabnar
d9c10c6c7b Remove reapplying callback actions on project index page
Closes SCI-3242.
2019-04-01 15:02:47 +02: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
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
e8a4fd5360 Fix date label
Closes SCI-3226
2019-03-29 08:18:15 +01:00
aignatov-bio
08263ab64e
adding filters for task activities [SCI-3076] (#1553)
* update task activity screen
2019-03-28 10:55:48 +01:00
Urban Rotnik
685b7138b7
Merge pull request #1597 from urbanrotnik/ur-SCI-3224-add-message-for-empty-activity-list
Add message for empty activity list [SCI-3224]
2019-03-28 09:16:29 +01:00
Urban Rotnik
d0a8652969 Add message for empty activity list 2019-03-28 09:14:01 +01:00
aignatov-bio
5c9d2cbc60
Merge pull request #1601 from aignatov-bio/ai-sci-3175-help-window-does-not-close-bug
Fix tooltip freeze bug [SCi-3175]
2019-03-28 09:12:37 +01:00
Jure Grabnar
aa186f675a Fix clear filter not clearing date label
Closes SCI-3226
2019-03-27 18:47:34 +01:00
Jure Grabnar
9881ff38ee Add color to HOT buttons 2019-03-27 15:34:01 +01:00
Anton Ignatov
03123c34f8 adding date placeholder 2019-03-27 14:39:29 +01:00
Anton Ignatov
46ee2557d4 Fix tooltip stuck bug 2019-03-27 13:53:32 +01:00
Anton Ignatov
1d244508f5 Adding placeholders to filters 2019-03-27 11:19:58 +01:00
aignatov-bio
c2e1e85913
Adding localization for activity name and activity group (#1598) 2019-03-27 10:33:33 +01:00
aignatov-bio
a3c1796497
Adding arrow to drop down [SCI-3212] (#1594)
* Adding arrow to dropdown
2019-03-26 16:49:12 +01:00
Oleksii Kriuchykhin
2ff43a3320 Change filtering logic when no filters are selected [SCI-3223] 2019-03-26 16:04:03 +01:00
Alex Kriuchykhin
935e3a65cf
Merge pull request #1586 from okriuchykhin/ok_SCI_3199
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][SCI-3225]
2019-03-26 16:02:44 +01:00
aignatov-bio
54fd3a748b
Adding activity groups [SCI-3203] (#1588)
* Adding activty groups
2019-03-26 15:29:21 +01:00
aignatov-bio
cee3796f35
Merge pull request #1583 from aignatov-bio/ai-sci-3203-show-selection-left
Move dropdown container to left [SCI-3203]
2019-03-26 09:37:12 +01:00
Oleksii Kriuchykhin
e3a3ec4491 Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][3225] 2019-03-25 17:38:13 +01:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
Anton Ignatov
2d5df1b3b7 Moving dropdown container to left 2019-03-25 13:56:32 +01:00
aignatov-bio
9fff93ab0e
Merge pull request #1576 from biosistemika/image-editor-prototype
Feature/Image annotation
2019-03-22 16:31:00 +01:00
aignatov-bio
723024202e
Image editor improvements [SCI - 3158, 3160, 3156, 3154] (#1563)
* Improvments SCI - 3158, 3160, 3156, 3154
2019-03-22 09:27:50 +01:00
aignatov-bio
5d9e4f30d4
Duplicates name protocol bug and rake task to rename duplicates [SCI-3047] (#1541)
* Fix double protocols bug and rake task to rename duplicates
2019-03-20 12:41:14 +01:00
aignatov-bio
6eae12efab
Updating permission check for image editing [SCI - 3153, 3159] (#1568)
*Add permission check for assets editing

* Add check for image format
2019-03-19 13:52:57 +01:00
Anton Ignatov
87280f083a [SCI-3166] Finalize global activities front end 2019-03-19 13:50:55 +01:00
aignatov-bio
a0a3c4b97f
Fix file format bug (#1569) 2019-03-19 11:06:36 +01:00
Oleksii Kriuchykhin
af94f79f0d Submit image as FormData [SCI-2879] 2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin
feb75f62e1 Add workaround for image caching in fabric js [SCI-2855] 2019-03-11 15:10:32 +01:00
Oleksii Kriuchykhin
80e525fd97 Improve image editor behaviour [SCI-2855] 2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin
89e968c410 Add tui.image-editor [SCI-2815] 2019-03-11 15:08:15 +01:00
Oleksii Kriuchykhin
0b87e8e1e4 Merge branch 'features/global-activities' into ok_SCI_3024_v3 2019-03-08 10:29:51 +01:00
aignatov-bio
ec2dbb897f
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521)
* Adding side pane filtering and top pane
2019-03-06 10:34:04 +01:00
Oleksii Kriuchykhin
c3705ccb25 Improve group collapse JS code [SCI-2994][SCI-3024] 2019-03-04 13:44:43 +01:00
Anton Ignatov
1ae4a60f79 Fix recaptha error 2019-03-01 12:58:31 +01:00
Miha Mencin
d03ef2cd2a
Merge branch 'master' into features/templates 2019-02-28 09:41:20 +01:00
Oleksii Kriuchykhin
0930277c4e Add views and helpers for global activities individual cards [SCI-2994][SCI-3024] 2019-02-27 16:02:53 +01:00