aignatov-bio
|
0f80786433
|
Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into ai-sci-5101-add-attachments-dropdown-to-step
|
2020-11-02 18:52:46 +01:00 |
|
aignatov-bio
|
84a7d49023
|
Fix markup
|
2020-11-02 18:51:21 +01:00 |
|
aignatov-bio
|
f85a3493cd
|
Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports
Add filer previews to reports [SCI-5110]
|
2020-11-02 18:48:45 +01:00 |
|
aignatov-bio
|
eca39a00b5
|
Add attachments dropdown to step
|
2020-11-02 18:47:08 +01:00 |
|
mlorb
|
7b1fb3a343
|
Merge pull request #2931 from mlorb/merge-develop-into-features/office-file-previews
Merge develop into features/office file previews
|
2020-11-02 15:20:23 +01:00 |
|
Mojca Lorber
|
8aed48d1ae
|
Merge branch 'develop' into features/office-file-previews
|
2020-11-02 13:45:06 +01:00 |
|
Urban Rotnik
|
2549d9deeb
|
Merge pull request #2929 from urbanrotnik/ur-sci-5147-generate-word-with-included-smart
Fix SA in protocol description [SCI-5147]
|
2020-11-02 09:55:40 +01:00 |
|
mlorb
|
349e89eb28
|
Merge pull request #2887 from mlorb/ml-sci-5033
Change Complete step button on task step [SCI-5033]
|
2020-11-02 09:48:19 +01:00 |
|
Mojca Lorber
|
04e3b67968
|
Change the way buttons are toggled
|
2020-10-30 18:47:01 +01:00 |
|
aignatov-bio
|
187e4bc541
|
Merge pull request #2922 from aignatov-bio/ai-sci-5107-add-step-attachments-size-backend
Add asset preview mode switcher to step [SCI-5107]
|
2020-10-30 16:30:40 +01:00 |
|
Urban Rotnik
|
1295299370
|
Fix SA in protocol description
|
2020-10-30 12:55:30 +01:00 |
|
Mojca Lorber
|
a52315fc79
|
Merge branch 'develop' into ml-sci-5033
|
2020-10-29 18:28:25 +01:00 |
|
aignatov-bio
|
6193f91192
|
Update view mode switcher logic
|
2020-10-29 16:42:05 +01:00 |
|
aignatov-bio
|
12991e8fd3
|
Commit add asset preview mode switcher to step
|
2020-10-29 16:42:05 +01:00 |
|
aignatov-bio
|
7a6e2386f2
|
Merge pull request #2910 from aignatov-bio/ai-sci-5103-update-file-preview
Update file preview [SCI-5103][SCI-5104]
|
2020-10-29 15:35:12 +01:00 |
|
aignatov-bio
|
f51416d83a
|
Update permission markup
|
2020-10-29 14:59:14 +01:00 |
|
Urban Rotnik
|
e923128c0e
|
Merge pull request #2927 from biosistemika/features/signature-requests
Features/signature requests into develop
|
2020-10-29 14:48:25 +01:00 |
|
aignatov-bio
|
b0fe68553a
|
Fix tests
|
2020-10-29 14:30:26 +01:00 |
|
aignatov-bio
|
21f584a2c4
|
Fix markup
|
2020-10-29 14:30:26 +01:00 |
|
aignatov-bio
|
131d487e69
|
Add file preview to list view
|
2020-10-29 14:30:26 +01:00 |
|
aignatov-bio
|
d99e279ecc
|
Add gallery to file preview
|
2020-10-29 14:30:26 +01:00 |
|
aignatov-bio
|
c56f7912ef
|
Update file preview
|
2020-10-29 14:23:32 +01:00 |
|
Urban Rotnik
|
bb5c703696
|
Merge pull request #2878 from urbanrotnik/ur-sci-5040
Support multiple file upload in TinyMCE fields [SCI-5040]
|
2020-10-29 14:14:38 +01:00 |
|
Urban Rotnik
|
f5118e5461
|
Merge pull request #2901 from okriuchykhin/ok_SCI_5063
Refactor experiment workflow image generation [SCI-5063]
|
2020-10-29 13:55:23 +01:00 |
|
Urban Rotnik
|
c6a891bcea
|
Merge pull request #2912 from urbanrotnik/ur-sci-5091
Add current team to smart annotations permission check [SCI-5091]
|
2020-10-29 13:32:29 +01:00 |
|
Oleksii Kriuchykhin
|
13fcfedf41
|
Refactor experiment workflow image generation [SCI-5063]
|
2020-10-29 13:16:09 +01:00 |
|
aignatov-bio
|
111a5338af
|
Merge pull request #2895 from aignatov-bio/ai-sci-5031-refactor-export-all-method
Refactor export all my module generator [SCI-5031]
|
2020-10-29 13:05:34 +01:00 |
|
Urban Rotnik
|
25d050cec4
|
Add current team to smar annotations permission check
|
2020-10-29 12:17:40 +01:00 |
|
aignatov-bio
|
23f9fb212d
|
Merge pull request #2915 from aignatov-bio/ai-sci-5105-update-image-edit-modal
Update image edit modal [SCI-5105]
|
2020-10-29 09:15:32 +01:00 |
|
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 |
|
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 |
|
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 |
|