mlorb
|
1e3d0e901a
|
Merge pull request #1667 from mlorb/ml-sci-3304
Fix links in activity message for protocols in repository [SCI-3304]
|
2019-04-15 11:55:08 +02:00 |
|
aignatov-bio
|
4fec72bc46
|
Merge pull request #1671 from aignatov-bio/ai-sci-3319-duplicate-activity-wronglink
Fix duplicate activity issue and fix link to inventory [SCI-3319]
|
2019-04-15 11:51:09 +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 |
|
Anton Ignatov
|
dd8b3caf65
|
Fix duplicate activtiy issue and fix link to inventory
|
2019-04-15 11:35:30 +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 |
|
Mojca Lorber
|
252fdaf9a8
|
Fix links in activity message for protocols in repository
|
2019-04-12 15:14:41 +02:00 |
|
mlorb
|
538b48cb06
|
Merge pull request #1666 from mlorb/ml-sci-3331
Rename button load more system notification to fix the bug [SCI-3331]
|
2019-04-12 13:24:16 +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 |
|
Mojca Lorber
|
bf2e9e8194
|
Rename button load more system notification to fix the bug
|
2019-04-12 11:58:47 +02:00 |
|
mlorb
|
3c0b1984d0
|
Merge pull request #1658 from mlorb/ml-sci-3297
Fix activity card visuals [SCI-3297]
|
2019-04-12 09:20:11 +02:00 |
|
aignatov-bio
|
8ba0555922
|
Add check for tasks complete in project notifications (#1657)
|
2019-04-12 09:17:34 +02:00 |
|
aignatov-bio
|
ffb0db06b9
|
Add scroll to team selector (#1659)
|
2019-04-12 09:17:14 +02:00 |
|
aignatov-bio
|
2b92a987e6
|
Fix user counter bug on project card (#1662)
|
2019-04-12 09:17:03 +02:00 |
|
mlorb
|
520738025a
|
Merge branch 'master' into ml-sci-3297
|
2019-04-12 08:32:07 +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 |
|
Jure Grabnar
|
eb6de67cb7
|
Merge pull request #1660 from jbargu/jg_sci_3302
Date activity filter filters out activity after reaching bottom of the page [SCI-3302]
|
2019-04-11 10:46:53 +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 |
|
Jure Grabnar
|
8420974779
|
Move scrollTop to reloadActivities
Closes SCI-3302
|
2019-04-10 18:45:12 +02:00 |
|
Jure Grabnar
|
3c47521f0e
|
Reset scrollbar after selecting date filter
Closes SCI-3302
|
2019-04-10 15:46:30 +02:00 |
|
Oleksii Kriuchykhin
|
d378e33038
|
Improve global activities pagination and fetching [SCI-3292]
|
2019-04-10 15:45:17 +02:00 |
|
aignatov-bio
|
f47d0e2932
|
Merge pull request #1561 from aignatov-bio/ai-sci-3131-improve-image-file-upload
Improve the image file upload into RTE input fields [SCI-3131]
|
2019-04-10 14:04:06 +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 |
|
Mojca Lorber
|
c8ddae4d1e
|
Fix activity card visuals
|
2019-04-10 12:37:13 +02:00 |
|
Urban Rotnik
|
0fb745a38c
|
Merge pull request #1645 from urbanrotnik/ur-sci-3234-export-all-counter-reset
Reset counter for export [SCI-3234]
|
2019-04-10 11:57:02 +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 |
|
Urban Rotnik
|
18c1c3c22c
|
enable ScssLint
|
2019-04-09 15:57:47 +02:00 |
|
aignatov-bio
|
7ef7e2397f
|
Change activity filter order and reduce custom date label size [SCI-3301] (#1651)
* Change activity filter order and reduce custom date label size
* Fix hound
|
2019-04-09 14:18:22 +02:00 |
|
Urban Rotnik
|
ee3dc571e1
|
Update attachments view, add ordering on FE
|
2019-04-09 14:17:40 +02:00 |
|
Urban Rotnik
|
a3932cc67f
|
New asset box style update
|
2019-04-09 14:17:40 +02:00 |
|
Jure Grabnar
|
5253952988
|
Remove unlock_instructions email and update activities text
Closes SCI-3140
|
2019-04-09 13:06:54 +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 |
|
aignatov-bio
|
a086f88541
|
Disable save button while image loading (#1646)
|
2019-04-09 09:07:58 +02:00 |
|
Anton Ignatov
|
811f07a62c
|
Update API endpoints for new activities
|
2019-04-08 15:07:45 +02:00 |
|
mlorb
|
f566dd6c83
|
Merge pull request #1648 from mlorb/ml-sci-3214
Remove activities that belong to addons [SCI-3214]
|
2019-04-08 11:48:55 +02:00 |
|
Mojca Lorber
|
501c46bc92
|
Remove activities that belong to addons
|
2019-04-05 16:25:22 +02:00 |
|
Urban Rotnik
|
2cbf70819f
|
Merge pull request #1647 from urbanrotnik/ur-sci-3134
Change step header, remove vertical line
|
2019-04-05 11:08:49 +02:00 |
|
Urban Rotnik
|
26cf8271a1
|
Change step header, remove vertical line
|
2019-04-05 10:57:38 +02:00 |
|
Jure Grabnar
|
bc9eff2ef5
|
Add asset validation on wopi creation
Missing file
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
d9a9045658
|
Hound formatting
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
d60cc2cd1c
|
Refactor create_wopi_file
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
56bb62c5b0
|
Addtional formatting fixes
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
20446fb39d
|
Hound formatting fixes
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
7ac88ee84b
|
Change icons to be relative
|
2019-04-04 17:05:25 +02:00 |
|