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

1762 commits

Author SHA1 Message Date
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 aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Urban Rotnik 2f99e3a464 Remove border, update copy 2020-10-21 09:58:35 +02:00
Urban Rotnik e1e7496307
Merge pull request #2884 from urbanrotnik/ur-sci-5043 
DOCX lists [SCI-5043]
 2020-10-15 11:53:58 +02:00
mlorb 83ba40d135
Merge pull request #2870 from mlorb/ml-sci-4841 
Fix at long inventory name snapshot in title is not visible [SCI-4841]
 2020-10-14 14:38:04 +02:00
Alex Kriuchykhin d5499168f3
Merge pull request #2896 from biosistemika/features/pwa 
Merge features/pwa to develop
 2020-10-13 16:34:57 +02:00
Urban Rotnik ae8b2cbf8f Add text to I18n 2020-10-13 08:37:32 +02:00
Mojca Lorber cf367baefa Merge branch 'develop' into ml-sci-4841 2020-10-12 14:43:03 +02:00
aignatov-bio 7c3a3e4490 Small smart annotation fixes 2020-09-28 12:03:01 +02:00
Mojca Lorber 94fea75fda Fix at long inventory name snapshot in title is not visible 2020-09-24 17:19:41 +02:00
Oleksii Kriuchykhin 2cda80dc5f Add Endpoins for Project Membership manipulation [SCI-5001] 2020-09-23 11:03:29 +02:00
mlorb 547af538b3
Merge pull request #2856 from mlorb/ml-sci-5009 
Update empty states for smart annotation results and dismiss button [SCI-5009]
 2020-09-22 15:31:22 +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
Mojca Lorber d9a78d20d7 Update empty states for smart annotation results and dismiss button 2020-09-18 08:50:01 +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
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
aignatov-bio 14acf2b624 Add i18n 2020-09-15 14:47:57 +02:00
Alex Kriuchykhin 04686d4ffc
Merge pull request #2842 from okriuchykhin/ok_SCI_5004 
Add Completion and Uncompletion consequences [SCI-5004]
 2020-09-15 12:56:27 +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 73cf620960 Add Completion and Uncompletion consequences [SCI-5004] 2020-09-14 20:06:48 +02:00
aignatov-bio c10e2d231e Update frontend permission check 2020-09-14 15:59:09 +02:00
Oleksii Kriuchykhin a7c6ab9d89 Move some consequence executon into background process [SCI-4978] 2020-09-11 16:18:39 +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
aignatov-bio 661220890f Update error handling 2020-09-09 12:25:34 +02:00
aignatov-bio f4a13a73cb Refactor smart annotation front-end 2020-09-09 12:25:34 +02:00
aignatov-bio 5d9d7d6a12
Merge pull request #2829 from aignatov-bio/ai-sci-4983-add-descriptions-for-conditions 
Add description for conditions [SCI-4983]
 2020-09-09 11:33:48 +02:00
aignatov-bio ae1bec2a95
Merge pull request #2818 from mlorb/ml-sci-4572 
Change step checklist and table edit mode [SCI-4572]
 2020-09-09 09:02:56 +02:00
aignatov-bio bdb3caf5cf Add i18n 2020-09-09 08:50:24 +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
Oleksii Kriuchykhin 7668e16419 Enable CORS for PWA [SCI-4979] 2020-09-04 11:47:45 +02:00
aignatov-bio 4c1e120f23
Merge pull request #2810 from aignatov-bio/ai-sci-4968-add-error-handling-for-state-change 
Add error handling for state change [SCI-4968]
 2020-09-03 11:47:48 +02:00
Mojca Lorber 06d75fb07e Change step checklist and table edit mode 2020-09-02 18:04:37 +02:00
aignatov-bio 257329ce80 Fix css for status flows 2020-09-02 15:41:07 +02:00
aignatov-bio 9a8e53c4bc
Fix routes 2020-09-02 12:08:43 +02:00
aignatov-bio 4c7312faf9 Add tests for new workflow endpoints 2020-09-02 11:43:00 +02:00
aignatov-bio 68f31ce7ec Add api endpoints for workflows 2020-09-01 15:01:38 +02:00
aignatov-bio 9ff5e8bd7d Add task state change error handling and validation 2020-09-01 12:41:00 +02:00
Urban Rotnik 581cd69963 Add activities for status change 2020-09-01 11:48:04 +02:00
Urban Rotnik a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
aignatov-bio c07ebe90fa Add migration for task states 2020-08-27 11:34:59 +02:00
Urban Rotnik a5fb873d19 Add default workflow 2020-08-27 10:54:39 +02:00
Oleksii Kriuchykhin a206890a8c Fix step position adjusting on move and destroy [SCI-4880] 2020-08-25 15:46:21 +02:00
Urban Rotnik 5923a4c014 Merge branch 'develop' into features/task-flows 2020-08-25 15:30:22 +02:00