Commit graph

8966 commits

Author SHA1 Message Date
Urban Rotnik
bf4062b7cb Refactor rescue block 2020-10-29 09:12:12 +01:00
Urban Rotnik
54f38c8ded Move validation before request 2020-10-29 08:45:55 +01:00
aignatov-bio
16249201f3 Fix markup 2020-10-28 16:44:28 +01:00
aignatov-bio
2f1217688c Add filer previews to reports 2020-10-28 16:32:22 +01:00
Miha Mencin
235f87e0d9
Merge pull request #2924 from biosistemika/release/1.20.2
Release/1.20.2
2020-10-28 13:58:25 +01:00
Miha Mencin
f3f70bf59a
Bump version to 1.20.2 2020-10-28 12:26:48 +01:00
Alex Kriuchykhin
98e6cdcaa7
Merge pull request #2920 from biosistemika/revert-2919-ok_SCI_5123
Revert "Init user session for devise controllers after token auth [SCI-5123]"
2020-10-27 13:22:17 +01:00
Alex Kriuchykhin
8ef5bafc1a
Revert "Init user session for devise controllers after token auth [SCI-5123]" 2020-10-27 13:20:14 +01:00
aignatov-bio
bb983af42f
Merge pull request #2911 from aignatov-bio/ai-sci-4579-update-checkbox-style
Update checkbox style at repository and protocol datatable [SCI-4579]
2020-10-27 10:22:56 +01:00
Urban Rotnik
cb9db57645
Merge pull request #2909 from urbanrotnik/ur-sci-5006
Add lock icon to current task section on dashboard [SCI-5006]
2020-10-27 08:20:55 +01:00
Alex Kriuchykhin
792edb62d6
Merge pull request #2919 from okriuchykhin/ok_SCI_5123
Init user session for devise controllers after token auth [SCI-5123]
2020-10-26 17:21:56 +01:00
Oleksii Kriuchykhin
00a2f5f41b Init user session for devise controllers after token auth [SCI-5123] 2020-10-26 16:35:49 +01:00
Urban Rotnik
b94a3a6cb8 Clean up controller 2020-10-26 16:17:39 +01:00
aignatov-bio
2d84a34cec
Merge pull request #2900 from aignatov-bio/ai-sci-5109-add-list-view-for-files
Add list view to attachments [SCI-5109]
2020-10-26 15:12:21 +01:00
aignatov-bio
6edcf4b099 Add size label 2020-10-26 15:10:06 +01:00
Miha Mencin
840b84aa9a
Merge pull request #2916 from okriuchykhin/ok_SCI_5139
Add activities for step completion and checklist toggling through API [SCI-5139]
2020-10-26 14:19:31 +01:00
mlorb
b941c8c9d4
Merge pull request #2917 from mlorb/ml-sci-5119
Move open mobile app button to main navigation [SCI-5119]
2020-10-26 14:02:57 +01:00
aignatov-bio
540b6ab789
Merge pull request #2914 from aignatov-bio/ai-sci-5052-fix-label-font-size-for-status-label
Fix font size and font weight for status label [SCI-5052]
2020-10-26 14:01:37 +01:00
Alex Kriuchykhin
050e1e0973
Merge pull request #2913 from okriuchykhin/ok_SCI_5123
Add token authentication to Active Storage controllers [SCI-5123]
2020-10-26 13:46:03 +01:00
Urban Rotnik
1ffc3449bf Clean up index view 2020-10-26 13:42:32 +01:00
aignatov-bio
bddd1956ab Fix font size and font weight for status label 2020-10-26 12:35:40 +01:00
Mojca Lorber
3c531d896f Add image 2020-10-26 11:43:17 +01:00
Urban Rotnik
431b9161b6 Code cleanup 2020-10-26 11:03:43 +01:00
Mojca Lorber
ec41bdd414 Move open mobile app button to main navigation 2020-10-26 09:28:44 +01:00
Oleksii Kriuchykhin
4d64883963 Add activities for step completion and checklist toggling through API [SCI-5139] 2020-10-25 22:33:50 +01:00
aignatov-bio
aefaf4d0c1 Update image edit modal 2020-10-25 16:57:50 +01:00
Urban Rotnik
b23f110184
Merge pull request #2905 from urbanrotnik/ur-sci-5085-active-filters
Add mark for active filters [SCI-5085]
2020-10-25 16:06:59 +01:00
Oleksii Kriuchykhin
5f70984919 Add token authentication to Active Storage controllers [SCI-5123] 2020-10-23 19:22:31 +02:00
Urban Rotnik
c5a1d34c36
Merge pull request #1967 from jbargu/jg_sci_2228
[SCI-2228] Remove samples, sample types, sample groups, custom sample columns from the codebase
2020-10-23 15:33:22 +02:00
Urban Rotnik
75351a3aed px to em 2020-10-23 14:11:56 +02:00
Urban Rotnik
6ccd34291d
Merge pull request #2904 from urbanrotnik/ur-sci-5093
Fix smart annotation in checklist title [SCI-5093]
2020-10-23 13:36:22 +02:00
Urban Rotnik
d43d487d33
Merge pull request #2907 from urbanrotnik/ur-sci-5045-remove-border
Remove border, update copy [SCI-5045]
2020-10-23 13:35:57 +02:00
aignatov-bio
d6f8e156c1 Update checkbox style at repository and protocol datatable 2020-10-22 16:42:12 +02:00
aignatov-bio
3b0f35aef3 Fix markup 2020-10-22 14:33:17 +02:00
aignatov-bio
f4bf2ab75f Remove empty children from extents 2020-10-22 14:29:35 +02:00
Urban Rotnik
1089e7e4fd Merge branch 'jg_sci_2228' of github.com:jbargu/scinote-web into jg_sci_2228 2020-10-22 14:27:32 +02:00
Urban Rotnik
aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Miha Mencin
9f2b7f962b
Merge pull request #2908 from mlorb/ml-sci-5120
Fix pwa url and change when banner is displayed [SCI-5120]
2020-10-22 13:41:12 +02:00
Mojca Lorber
2639810e1a Fix no step bug 2020-10-22 13:21:05 +02:00
Urban Rotnik
20958adc34
Merge pull request #2906 from urbanrotnik/ur-sci-5043-v2
Fix missing elements from list elements[SCI-5043]
2020-10-22 08:11:49 +02:00
Urban Rotnik
58013e215d Add lock icon to current task section on dashboard 2020-10-22 08:09:51 +02:00
Mojca Lorber
6d7b55301f Fix pwa url and change when banner is displayed 2020-10-21 14:56:20 +02:00
Urban Rotnik
2f99e3a464 Remove border, update copy 2020-10-21 09:58:35 +02:00
Urban Rotnik
a87302a183 Include styled text in list items elements 2020-10-21 08:27:10 +02:00
Urban Rotnik
e7d2d78935 Add mark for active filters 2020-10-20 16:45:54 +02:00
Urban Rotnik
a728ba2f2d Fix smart annotation in checklist title 2020-10-20 13:02:49 +02:00
aignatov-bio
f43d72cd00
Merge pull request #2903 from aignatov-bio/ai-sci-5116-update-image-for-doorkeeper-auth
Update image for doorkeeper auth [SCI-5116]
2020-10-19 17:20:33 +02:00
aignatov-bio
2968e677b8 Update image for doorkeeper auth 2020-10-19 16:23:20 +02:00
Miha Mencin
c31a7373fb
Merge pull request #2902 from mlorb/ml-sci-5089
Add 'Open in APP' button to the task
2020-10-19 12:28:35 +02:00
Mojca Lorber
23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +02:00