Urban Rotnik
|
782d1dfc2d
|
Merge pull request #1677 from urbanrotnik/ur-sci-3345-export-all-counter-fix-2
Exports left after export [SCI-3345]
|
2019-04-16 14:44:48 +02:00 |
|
Urban Rotnik
|
4f8faba84e
|
Exports left after export fix
|
2019-04-16 14:21:47 +02:00 |
|
Urban Rotnik
|
0ba0dccd57
|
Merge pull request #1675 from urbanrotnik/ur-sci-3345-export-all-counter-fix
Fix for exports_left, fix for some edge cases [SCI-3345]
|
2019-04-16 10:32:31 +02:00 |
|
Urban Rotnik
|
22af36dd2d
|
Fix for exports_left, fix for some edge cases
|
2019-04-16 09:59:02 +02:00 |
|
Urban Rotnik
|
7eeba0e57e
|
Merge pull request #1670 from urbanrotnik/ur-sci-3343-dynamic-filtering-default-fix
Dynamic filtering default fix [SCI-3343]
|
2019-04-15 11:40:16 +02:00 |
|
Urban Rotnik
|
83f2a5c961
|
Dynamic filtering default fix
|
2019-04-15 11:20:43 +02:00 |
|
Alex Kriuchykhin
|
a61d637e6d
|
Merge pull request #1669 from okriuchykhin/ok_SCI_3340
Fix crash when no activities present [SCI-3340]
|
2019-04-15 11:13:25 +02:00 |
|
Oleksii Kriuchykhin
|
a43e42fdb3
|
Fix crash when no activities present [SCI-3340]
|
2019-04-15 10:51:59 +02:00 |
|
aignatov-bio
|
063f02dc56
|
Add ability to select filters with keyboard [SCI-3200] (#1649)
* Add ability to select fitlers with keyboard
|
2019-04-15 10:30:08 +02:00 |
|
aignatov-bio
|
8d7cc57da1
|
Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654)
* Add zoom to image annotation and check jpeg file quality before save
* Move compression to front end
* Move quality extractor to paperclip processor
|
2019-04-15 09:49:44 +02:00 |
|
Alex Kriuchykhin
|
3250ab70f4
|
Merge pull request #1668 from okriuchykhin/ok_SCI_3292_v2
Switch to kaminari pagination in global activities [SCI-3292]
|
2019-04-12 16:04:48 +02:00 |
|
Oleksii Kriuchykhin
|
231106e131
|
Switch to kaminari pagination in global activities [SCI-3292]
|
2019-04-12 15:37:45 +02:00 |
|
Jure Grabnar
|
be90881849
|
Merge pull request #1665 from jbargu/jg_sci_2949_3318
Disable editing of office file in view mode when module is locked [SCI-2949, 3318]
|
2019-04-12 13:00:18 +02:00 |
|
Jure Grabnar
|
1e5721ce95
|
Disable editing of office file in view mode when module is locked
Closes SCI-2949
|
2019-04-11 17:21:07 +02:00 |
|
Alex Kriuchykhin
|
7f20b7fa20
|
Merge pull request #1661 from okriuchykhin/ok_SCI_3292
Improve global activities pagination and fetching [SCI-3292]
|
2019-04-11 16:23:37 +02:00 |
|
aignatov-bio
|
9377628f5e
|
Release team space after update image [SCI-3299] (#1656)
* Release team space after update image
|
2019-04-11 09:20:05 +02:00 |
|
Oleksii Kriuchykhin
|
d378e33038
|
Improve global activities pagination and fetching [SCI-3292]
|
2019-04-10 15:45:17 +02:00 |
|
aignatov-bio
|
cfbb2a83a6
|
Merge pull request #1650 from aignatov-bio/ai-sci-3295-update-api-endpoints-new-activities
Update API endpoints for new activities [SCI-3295]
|
2019-04-10 13:46:30 +02:00 |
|
Urban Rotnik
|
caccf8d9f0
|
Reset counter for export in last 24 hours
Fix for check if user has avaiable exports, bit refactored increas_counter method.
|
2019-04-10 10:56:33 +02:00 |
|
aignatov-bio
|
e2e299b424
|
Add dynamic generating filters for global activities [SCI-3228] (#1644)
* Add dynamic generating filters
* Add url methods
|
2019-04-09 09:08:27 +02:00 |
|
Anton Ignatov
|
811f07a62c
|
Update API endpoints for new activities
|
2019-04-08 15:07:45 +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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Urban Rotnik
|
86ddbc68b6
|
fixup! Show date actual value without link
|
2019-04-02 14:21:06 +02:00 |
|
Urban Rotnik
|
8eaeeee9f8
|
Show date actual value without link
|
2019-04-02 13:15:34 +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 |
|
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 |
|
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 |
|
Mojca Lorber
|
3c69225d6b
|
Change activities for task protocols
|
2019-03-29 15:09:20 +01:00 |
|
Oleksii Kriuchykhin
|
7d4fbcb32e
|
Fix unconfirmed users clean-up issues [SCI-3172]
|
2019-03-29 11:11:53 +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 |
|
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
|
d7d45bec70
|
Fix links for archived objects in global activities [SCI-3229]
|
2019-03-28 13:43:50 +01:00 |
|
mlorb
|
5f663b3c74
|
Merge pull request #1600 from mlorb/ml-sci-3215
Implement missing tests for global activities [SCI-3215][SCI-3219]
|
2019-03-28 11:10:38 +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 |
|
aignatov-bio
|
8416d1ab1c
|
Merge branch 'master' into ai-sci-3239-add-localization-team-for-objects
|
2019-03-28 09:13:34 +01:00 |
|
Jure Grabnar
|
07609d34c8
|
User/teams are now alphabetically listed
|
2019-03-27 15:34:01 +01:00 |
|