Mojca Lorber
|
9253cf5ade
|
Change javascript for modal handeling and some other small fixes
|
2020-12-03 12:53:19 +01:00 |
|
mlorb
|
74f0f0474a
|
Merge branch 'features/folders' into ml-sci-5240
|
2020-12-03 12:50:19 +01:00 |
|
Oleksii Kriuchykhin
|
dc15accc86
|
Update sidebar usages in partials [SCI-5177]
|
2020-12-03 10:21:53 +01:00 |
|
Oleksii Kriuchykhin
|
9546b8f71d
|
Prepare backend for the improved navigation [SCI-5177]
|
2020-12-03 10:19:11 +01:00 |
|
Alex Kriuchykhin
|
92d579ab8e
|
Merge pull request #2935 from okriuchykhin/ok_SCI_5135
Generate backend for moving the projects and folders [SCI-5135]
|
2020-12-02 14:59:01 +01:00 |
|
Urban Rotnik
|
87b5552b27
|
Add equals team validations for project and folder
|
2020-12-02 14:53:46 +01:00 |
|
Urban Rotnik
|
df2b8ab3df
|
Remove jsonapi_parameters gem, accept rails params in controller
|
2020-12-02 13:15:49 +01:00 |
|
Urban Rotnik
|
7c1a0a9044
|
Add projects to project_folder serializer
|
2020-12-02 13:15:49 +01:00 |
|
Urban Rotnik
|
97733498d9
|
Include project_folders at Projects API endpoints
|
2020-12-02 13:15:48 +01:00 |
|
Urban Rotnik
|
a4fc01d595
|
Add jsonapi_parameters gem, use relationships for parent_folder relation
|
2020-12-02 13:15:48 +01:00 |
|
Urban Rotnik
|
088fa79874
|
Add Project Folders API endpoints
|
2020-12-02 13:15:48 +01:00 |
|
Oleksii Kriuchykhin
|
dfce57d481
|
Generate backend for moving the projects and folders [SCI-5135]
|
2020-12-02 12:11:01 +01:00 |
|
Urban Rotnik
|
13d157d1c7
|
Merge pull request #2983 from urbanrotnik/ur-sci-5252-technician-can-not-complete-step
Remove manage permissions check from step toggle [SCI-5252]
|
2020-12-01 13:37:40 +01:00 |
|
Mojca Lorber
|
d7e3b57d0d
|
[SCI-5240] Implement Create new folder function
|
2020-12-01 09:59:08 +01:00 |
|
Oleksii Kriuchykhin
|
78e050ccc0
|
Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171]
|
2020-11-27 14:27:24 +01:00 |
|
Urban Rotnik
|
dc9fae6af0
|
Remove manage permissions check from step toggle
|
2020-11-27 11:37:39 +01:00 |
|
Alex Kriuchykhin
|
80a53e14c2
|
Merge pull request #2966 from okriuchykhin/ok_SCI_5235
Fix permission check for archived tasks [SCI-5235]
|
2020-11-27 10:46:25 +01:00 |
|
aignatov-bio
|
d162fb6d35
|
Merge pull request #2980 from aignatov-bio/ai-sci-5241-add-confirmation-for-file-delete
Add delete asset confirmation modal [SCI-5241]
|
2020-11-26 15:35:40 +01:00 |
|
aignatov-bio
|
c6f4d23a78
|
Fix protocol preview file background
|
2020-11-26 15:35:06 +01:00 |
|
Urban Rotnik
|
efd4f8abde
|
Add members dropdown on project filters flyout
|
2020-11-26 12:29:43 +01:00 |
|
aignatov-bio
|
d13ff053b5
|
Merge pull request #2960 from aignatov-bio/ai-sci-5228-fix-sorting-of-assets-in-reports
Fix assets sorting in report [SCI-5228]
|
2020-11-26 11:46:50 +01:00 |
|
Urban Rotnik
|
be49216e71
|
Fix teams tests
|
2020-11-25 20:02:45 +01:00 |
|
Urban Rotnik
|
5717e37f2b
|
Remove obsolete code, fix tests
|
2020-11-25 18:34:46 +01:00 |
|
Urban Rotnik
|
afc6d12b49
|
Project and folders sorting
|
2020-11-25 18:34:39 +01:00 |
|
Oleksii Kriuchykhin
|
0de237cece
|
Implement project search with grouping by folder [SCI-5207]
|
2020-11-25 11:59:02 +01:00 |
|
aignatov-bio
|
dc62e2780a
|
Merge pull request #2963 from aignatov-bio/ai-sci-5186-add-new-comments-layout
Add comments sidebar layout [SCI-5186][SCI-5188][SCI-5189]
|
2020-11-24 11:25:36 +01:00 |
|
Alex Kriuchykhin
|
1380d5873d
|
Merge pull request #2946 from okriuchykhin/ok_SCI_5136
Implement search endpoint for Projects & folders search [SCI-5136]
|
2020-11-23 13:09:33 +01:00 |
|
aignatov-bio
|
60ce51149d
|
Add CRUD to comments
|
2020-11-20 20:25:28 +01:00 |
|
Oleksii Kriuchykhin
|
eafc4cf367
|
Fix permission check for archived tasks [SCI-5235]
|
2020-11-20 14:39:17 +01:00 |
|
aignatov-bio
|
da4b8aaf2f
|
Add comments list
|
2020-11-20 12:29:40 +01:00 |
|
Oleksii Kriuchykhin
|
86e5078622
|
Add project folders to global search [SCI-5180]
|
2020-11-20 11:10:03 +01:00 |
|
aignatov-bio
|
483ff8f1f2
|
Merge pull request #2964 from biosistemika/features/office-file-previews
Features/office file previews merge branch
|
2020-11-19 11:11:39 +01:00 |
|
aignatov-bio
|
fcdad51222
|
Fix assets sorting in report
|
2020-11-17 15:33:25 +01:00 |
|
miha
|
ef880d8373
|
SCI-5223 return the missing method into controller
|
2020-11-16 15:49:26 +01:00 |
|
Oleksii Kriuchykhin
|
6dfeae2283
|
Make folders selectable for 'Export all' functionality [SCI-5183]
|
2020-11-13 14:39:10 +01:00 |
|
aignatov-bio
|
45efc9a43a
|
Remove skip asset permission check for wopi creation
|
2020-11-12 14:13:30 +01:00 |
|
Mojca Lorber
|
1618d79144
|
Merge branch 'develop' into ml-sci-5152
|
2020-11-11 10:47:43 +01:00 |
|
Oleksii Kriuchykhin
|
038cd8d5d7
|
Fix repository state columns handling [SCI-5190]
|
2020-11-10 17:24:04 +01:00 |
|
Oleksii Kriuchykhin
|
ee1bcd7aac
|
Implement search endpoint for Projects & folders search [SCI-5136]
|
2020-11-09 16:16:09 +01:00 |
|
Mojca Lorber
|
9893e8d5c8
|
Add 403 error handling to current tasks dashboard widget
|
2020-11-06 10:39:04 +01:00 |
|
aignatov-bio
|
e8592d911d
|
Fix markup
|
2020-11-05 10:04:27 +01:00 |
|
aignatov-bio
|
8145a292fd
|
Clear code and add missed I18n translation
|
2020-11-05 10:03:15 +01:00 |
|
aignatov-bio
|
5d0ab1f2e9
|
Fix markup
|
2020-11-04 13:32:34 +01:00 |
|
aignatov-bio
|
12fdea8d89
|
Add context menu to attahcments
|
2020-11-04 13:08:40 +01:00 |
|
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
|
eca39a00b5
|
Add attachments dropdown to step
|
2020-11-02 18:47:08 +01:00 |
|
Mojca Lorber
|
8aed48d1ae
|
Merge branch 'develop' into features/office-file-previews
|
2020-11-02 13:45:06 +01:00 |
|
Mojca Lorber
|
04e3b67968
|
Change the way buttons are toggled
|
2020-10-30 18:47:01 +01:00 |
|
Urban Rotnik
|
042231469c
|
Fix syntax
|
2020-10-30 13:37:59 +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
|
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 |
|
Oleksii Kriuchykhin
|
13fcfedf41
|
Refactor experiment workflow image generation [SCI-5063]
|
2020-10-29 13:16:09 +01:00 |
|
Urban Rotnik
|
bf4062b7cb
|
Refactor rescue block
|
2020-10-29 09:12:12 +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 |
|
Alex Kriuchykhin
|
8ef5bafc1a
|
Revert "Init user session for devise controllers after token auth [SCI-5123]"
|
2020-10-27 13:20:14 +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 |
|
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 |
|
Urban Rotnik
|
431b9161b6
|
Code cleanup
|
2020-10-26 11:03:43 +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 |
|
Oleksii Kriuchykhin
|
5f70984919
|
Add token authentication to Active Storage controllers [SCI-5123]
|
2020-10-23 19:22:31 +02:00 |
|
Urban Rotnik
|
aa1520bfb8
|
Merge branch 'develop' into jg_sci_2228
|
2020-10-22 14:21:39 +02:00 |
|
Urban Rotnik
|
58013e215d
|
Add lock icon to current task section on dashboard
|
2020-10-22 08:09:51 +02:00 |
|
aignatov-bio
|
016fc8a632
|
Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews
|
2020-10-15 15:25:54 +02:00 |
|
aignatov-bio
|
0a4b89cf39
|
Merge branch 'develop' into features/office-file-previews
|
2020-10-15 15:19:56 +02:00 |
|
aignatov-bio
|
f1a5811d5f
|
Merge pull request #2809 from biosistemika/ai-sci-4960-render-wopi-preview-only-in-view-port
Render wopi preview only in view port
|
2020-10-14 21:29:56 +02:00 |
|
Oleksii Kriuchykhin
|
7cd12bfb07
|
Fix protocol repository save/load timestamps [SCI-5067]
|
2020-10-06 15:30:04 +02:00 |
|
Oleksii Kriuchykhin
|
6c367428a1
|
Fix team switcher [SCI-5080]
|
2020-10-02 14:25:44 +02:00 |
|
aignatov-bio
|
9010f9c1db
|
Merge pull request #2876 from aignatov-bio/ai-sci-5066-fix-switch-team
Fix switch team on link for object from other team [SCI-5066]
|
2020-09-30 10:09:19 +02:00 |
|
Urban Rotnik
|
7c312a844f
|
Fix updating updated_at on protocol while load/sync with repository
|
2020-09-29 15:37:40 +02:00 |
|
aignatov-bio
|
9d64121577
|
Refactor WOPI discovery
|
2020-09-29 12:58:05 +02:00 |
|
Urban Rotnik
|
dc0072e707
|
Support multiple file upload in TinyMCE fields
|
2020-09-29 08:21:31 +02:00 |
|
aignatov-bio
|
16fe11f0f7
|
Fix smitch team on link for object from other team
|
2020-09-28 17:16:18 +02:00 |
|
aignatov-bio
|
1ed65eddfa
|
Move ordering to front-end
|
2020-09-25 15:06:09 +02:00 |
|
Alex Kriuchykhin
|
fb28fa557b
|
Merge pull request #2872 from okriuchykhin/ok_SCI_5062
Improve performance of fetching of statuses [SCI-5062]
|
2020-09-25 15:00:30 +02:00 |
|
Alex Kriuchykhin
|
3eb448c39b
|
Merge pull request #2862 from okriuchykhin/ok_SCI_5001
Add Endpoins for Project Membership manipulation [SCI-5001]
|
2020-09-25 14:25:20 +02:00 |
|
Oleksii Kriuchykhin
|
134e549ed5
|
Improve performance of fetching of statuses [SCI-5062]
|
2020-09-25 10:14:57 +02:00 |
|
Urban Rotnik
|
f4f0bc706a
|
Fix step deletion
|
2020-09-25 08:43:03 +02:00 |
|
aignatov-bio
|
780db9d134
|
Add assets view switcher
|
2020-09-24 17:10:36 +02:00 |
|
Oleksii Kriuchykhin
|
2cda80dc5f
|
Add Endpoins for Project Membership manipulation [SCI-5001]
|
2020-09-23 11:03:29 +02:00 |
|
Alex Kriuchykhin
|
136ce06022
|
Merge pull request #2851 from okriuchykhin/ok_SCI_4999
Add Create and Update endpoints for experiments [SCI-4999]
|
2020-09-22 10:20:00 +02:00 |
|
Alex Kriuchykhin
|
e19efe3975
|
Merge pull request #2850 from okriuchykhin/ok_SCI_4997
Add Create and Update endpoints for projects [SCI-4997]
|
2020-09-21 13:22:12 +02:00 |
|
aignatov-bio
|
e5d3fac112
|
Merge branch 'features/smart-annotation-improvements' into develop
|
2020-09-17 14:52:51 +02:00 |
|
aignatov-bio
|
6ed8757eb1
|
Merge branch 'features/task-flows' into develop
|
2020-09-17 14:52:05 +02:00 |
|
aignatov-bio
|
86667feb6b
|
Add remembered state for smart annotation
|
2020-09-17 11:43:07 +02:00 |
|
Oleksii Kriuchykhin
|
0147e1aee1
|
Add Create and Update endpoints for experiments [SCI-4999]
|
2020-09-16 23:15:36 +02:00 |
|
Oleksii Kriuchykhin
|
dd4a62bb45
|
Add Create and Update endpoints for projects [SCI-4997]
|
2020-09-16 17:03:39 +02:00 |
|
Alex Kriuchykhin
|
6269802be4
|
Merge pull request #2843 from okriuchykhin/ok_SCI_4881
Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881]
|
2020-09-15 12:53:01 +02:00 |
|
Oleksii Kriuchykhin
|
db3de835f8
|
Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881]
|
2020-09-15 11:58:35 +02:00 |
|
Oleksii Kriuchykhin
|
57716fd89c
|
Fix API and tests for new task completion logic [SCI-5004]
|
2020-09-15 11:19:25 +02:00 |
|
Oleksii Kriuchykhin
|
73cf620960
|
Add Completion and Uncompletion consequences [SCI-5004]
|
2020-09-14 20:06:48 +02:00 |
|
Oleksii Kriuchykhin
|
a7c6ab9d89
|
Move some consequence executon into background process [SCI-4978]
|
2020-09-11 16:18:39 +02:00 |
|