scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
8575 commits 70 branches 179 tags 165 MiB
Commit graph

2004 commits

Author SHA1 Message Date
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
Mojca Lorber 9893e8d5c8 Add 403 error handling to current tasks dashboard widget 2020-11-06 10:39:04 +01:00
Mojca Lorber 04e3b67968 Change the way buttons are toggled 2020-10-30 18:47:01 +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
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
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
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
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
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
aignatov-bio 008563a7f4 Update user smart annotation 2020-09-11 13:00:13 +02:00
Urban Rotnik 0ae39678d4
Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state 
Add error message for locked task, update some permission checks[SCI-4982]
 2020-09-09 14:04:08 +02:00
Urban Rotnik 45a09e5a3c Fix tests 2020-09-09 13:17:07 +02:00
aignatov-bio f4a13a73cb Refactor smart annotation front-end 2020-09-09 12:25:34 +02:00
Urban Rotnik aa88b6bdb4 Move redirect to controller 2020-09-09 11:26:43 +02:00
aignatov-bio 687093e110
Merge pull request #2817 from aignatov-bio/ai-sci-4972-fix-complete-state-for-tasks 
Add completed/uncompleted methods to my_module [SCI-4972]
 2020-09-09 08:20:36 +02:00
Alex Kriuchykhin c413ac21a1
Merge pull request #2798 from aignatov-bio/ai-sci-4831-update-api-for-new-statuses 
Add API endpoints for workflows [SCI-4831]
 2020-09-08 16:23:05 +02:00
Urban Rotnik d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
aignatov-bio bd1d6a772b Add completed/uncompleted methods to my_module 2020-09-08 09:45:09 +02:00