scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-26 01:46:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
8596 commits 69 branches 179 tags 166 MiB
Commit graph

2543 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 327baafcd7 Improve CSS structure for project toolbar [SCI-5129] 2020-11-04 16:10:40 +01:00
Oleksii Kriuchykhin 258c57870f Implement the toolbar on the Team Projects page [SCI-5129] 2020-11-02 13:28:37 +01:00
Urban Rotnik 042231469c Fix syntax 2020-10-30 13:37:59 +01:00
Urban Rotnik b94a3a6cb8 Clean up controller 2020-10-26 16:17:39 +01:00
Urban Rotnik 1ffc3449bf Clean up index view 2020-10-26 13:42:32 +01:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Mojca Lorber cf367baefa Merge branch 'develop' into ml-sci-4841 2020-10-12 14:43:03 +02:00
Miha Mencin 3a4a166856
Merge pull request #2888 from okriuchykhin/ok_SCI_5082 
Fix index page for users without a team [SCI-5082]
 2020-10-05 10:16:04 +02:00
Oleksii Kriuchykhin dd64206b25 Fix index page for users without a team [SCI-5082] 2020-10-02 16:57:46 +02:00
Oleksii Kriuchykhin 6c367428a1 Fix team switcher [SCI-5080] 2020-10-02 14:25:44 +02:00
Oleksii Kriuchykhin 21fab4198c Merge branch 'develop' into features/local 2020-10-01 11:52:59 +02:00
aignatov-bio d21aee1843 Remove complete step button from protocol managment 2020-09-29 15:08:01 +02:00
Oleksii Kriuchykhin 25a9f5c685 Add typeface-lato for shipping Lato fonts 2020-09-28 18:02:47 +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
Mojca Lorber 94fea75fda Fix at long inventory name snapshot in title is not visible 2020-09-24 17:19:41 +02:00
Urban Rotnik 7bc31905b5 Fix protocol import modal 2020-09-23 12:54:16 +02:00
Oleksii Kriuchykhin 2cda80dc5f Add Endpoins for Project Membership manipulation [SCI-5001] 2020-09-23 11:03:29 +02:00
mlorb feda5622d8
Merge pull request #2860 from mlorb/ml-sci-5007 
Add info of the locked task to the View status flow modal [SCI-5007]
 2020-09-23 10:19:48 +02:00
Mojca Lorber affae15ccf Simplification 2020-09-22 17:19:15 +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
Mojca Lorber fe779f9146 Add info of the locked task to the View status flow modal 2020-09-22 10:21:55 +02:00
aignatov-bio f8a28f378e Add shared inventories to smart annotation 2020-09-21 14:36:34 +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
aignatov-bio f11f54db33 Small fixes 2020-09-17 13:11:54 +02:00
aignatov-bio 86667feb6b Add remembered state for smart annotation 2020-09-17 11:43:07 +02:00
mlorb 4acd0c4cb9
Merge pull request #2841 from mlorb/ml-sci-4984 
Add saving state for filters on dashboard [SCI-4984]
 2020-09-17 09:53:16 +02:00
aignatov-bio c26f8e7193 Add before send condition for status change 2020-09-16 15:23:53 +02:00
Mojca Lorber 9cd8e3b7ac Change default status values, add project and experiment to saved state and fix parsing error handeling 2020-09-16 09:48:06 +02:00
aignatov-bio 14acf2b624 Add i18n 2020-09-15 14:47:57 +02:00
Mojca Lorber 3c30ee904e Merge branch 'features/task-flows' into ml-sci-4984 2020-09-15 13:27:34 +02:00
mlorb bf707a11a9
Merge branch 'features/task-flows' into ml-sci-4976 2020-09-15 12:59:49 +02:00
aignatov-bio 6dc4422d82 Fix markup 2020-09-15 11:56:44 +02:00
Mojca Lorber fe7d922cc5 Refactor complete step button 2020-09-15 11:18:15 +02:00
Mojca Lorber 13f719a9e1 Add saving state for filters on dashboard 2020-09-14 18:15:57 +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
aignatov-bio 008563a7f4 Update user smart annotation 2020-09-11 13:00:13 +02:00
aignatov-bio 5a063f070d Clone module before condition validation 2020-09-10 16:53:07 +02:00
aignatov-bio 18426b90be Disable button when condition not fullfield 2020-09-10 13:40:52 +02:00
mlorb 3d2aaed791
Merge pull request #2820 from mlorb/ml-sci-4580 
Fix buttons visability on reports page according to new styleguide [SCI-4580]
 2020-09-10 09:32:16 +02:00
Urban Rotnik 78c9394b1f Fix aligment due date and status on canvas card 2020-09-09 14:33:25 +02:00
Mojca Lorber eeb8f4a97a Disable 'complete step' button on locked task 2020-09-09 14:32:37 +02:00
aignatov-bio 7a86bb47c5 Add styling and highligh 2020-09-09 14:17:19 +02:00
aignatov-bio 946b961b1a
Merge pull request #2819 from aignatov-bio/ai-sci-4975-add-permission-checks-for-statuses 
Add front-end checks for statuses [SCI-4975]
 2020-09-09 13:21:04 +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
Urban Rotnik 9419a16df5
Merge pull request #2833 from urbanrotnik/ur-sci-4988-notes-duplication 
Remove notes duplication [SCI-4988]
 2020-09-09 11:29:10 +02:00
aignatov-bio 7763d11634 Fix markup 2020-09-09 11:24:54 +02:00
Urban Rotnik 9066586149 Fix duedate for PDF and DOCX 2020-09-09 10:48:42 +02:00
aignatov-bio 84682c6346
Merge pull request #2823 from mlorb/ml-sci-4575 
Replace old arrow with new one [SCI-4575]
 2020-09-09 09:05:39 +02:00
aignatov-bio 9a771da7f7
Merge pull request #2821 from mlorb/ml-sci-4578 
Fix buttons visability on protocols page according to new styleguide [SCI-4578]
 2020-09-09 09:05:26 +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 7eb43a16d5
Merge pull request #2806 from okriuchykhin/ok_SCI_4859 
Add secondary-navigation-title-name data hook [SCI-4859]
 2020-09-08 16:19:42 +02:00
Urban Rotnik c628fb2598 Remove duplicated notes section in reports 2020-09-08 16:10:24 +02:00
aignatov-bio bd1d6a772b Add completed/uncompleted methods to my_module 2020-09-08 09:45:09 +02:00
aignatov-bio 492d25f9b3 Add description for conditions 2020-09-07 15:12:09 +02:00
Oleksii Kriuchykhin 3150a36a64 Fix canvas edit mode [SCI-4880] 2020-09-07 14:54:49 +02:00
Oleksii Kriuchykhin ea845040aa Fix missing step edit button [SCI-4880] 2020-09-07 13:49:11 +02:00
Oleksii Kriuchykhin dea75553a3 Fix handling of duplicated step positions [SCI-4880] 2020-09-07 10:44:00 +02:00
Mojca Lorber 9dac4079f8 Replace old arrow with new one and remove redundant javascript for arrow collapsing 2020-09-04 14:43:30 +02:00
Mojca Lorber 24745203e1 Fix buttons visability on protocols page according to new styleguide 2020-09-03 17:05:25 +02:00
Mojca Lorber 1f0d9f3ad7 Fix buttons visability on reports page according to new styleguide 2020-09-03 16:19:02 +02:00
aignatov-bio d85703113a Add front-end checks 2020-09-03 14:34:34 +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
Urban Rotnik 447ba6aa64
Merge pull request #2812 from urbanrotnik/ur-sci-4969-status-on-task-card 
Show status on task card [SCI-4969]
 2020-09-01 15:28:48 +02:00
Urban Rotnik ed5869ff8e Show status on task card 2020-09-01 14:56:48 +02:00
Urban Rotnik 5148902d93 Fix error on edit experiment 2020-09-01 13:37:57 +02:00
Urban Rotnik a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Oleksii Kriuchykhin bc4c18e585 Add secondary-navigation-title-name data hook [SCI-4859] 2020-08-27 11:33:26 +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
aignatov-bio c3ddfd5bed
Merge pull request #2786 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard 
Fix dropdrown selector [SCI-4899]
 2020-08-25 14:51:55 +02:00
Alex Kriuchykhin 5006173d59
Merge pull request #2780 from aignatov-bio/ai-sci-4856-add-new-statuses-to-dashboard 
Add new statuses to dashboard [SCI-4856]
 2020-08-24 11:09:57 +02:00
Alex Kriuchykhin 121644decf
Merge pull request #2770 from okriuchykhin/ok_SCI_4881 
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
 2020-08-21 11:01:49 +02:00
Alex Kriuchykhin ccf4e2a747
Merge pull request #2759 from okriuchykhin/ok_SCI_4817 
Refactor task archive and move permissions [SCI-4817]
 2020-08-21 11:01:05 +02:00
Mojca Lorber faf2d4c533 Fix export icon 2020-08-14 17:02:03 +02:00
Mojca Lorber a91aa6ce46 Fix Collapse and expand buttons position 2020-08-13 13:18:50 +02:00
aignatov-bio 9474319d6b Fir error handling in invite user view 2020-08-13 11:34:21 +02:00
aignatov-bio 5360db76be Fix dropdrown selector 2020-08-12 14:00:10 +02:00
aignatov-bio 91b8475db5
Merge pull request #2784 from aignatov-bio/ai-sci-4918-display-all-errors-on-signup 
Fix error handling on registration page [SCI-4918]
 2020-08-12 09:39:21 +02:00
aignatov-bio 84b99eaf3d Fix error handling on registration page 2020-08-11 15:39:35 +02:00
aignatov-bio 56ff4e7702 Add new statuses to dashboard 2020-08-10 09:10:56 +02:00
Urban Rotnik 3c3a2bfb8b Add check if user is locked, show link unlock instructions 2020-08-06 15:18:20 +02:00
Oleksii Kriuchykhin ce8d12e1c4 Create new activities for exporting assigned items (live & snapshots) [SCI-4881] 2020-08-05 09:59:58 +02:00
Urban Rotnik 073979534c
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 16:43:05 +02:00
Urban Rotnik e221d960e7 Revert "Merge pull request #2767 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard" 
This reverts commit 8b6d57058c, reversing
changes made to 957ac92669.
 2020-08-04 15:07:22 +02:00
Urban Rotnik 7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
Urban Rotnik 6853caa0c8
Merge pull request #2760 from aignatov-bio/ai-sci-4894-small-2fa-fixes 
Small 2fa fixes [SCI-4894]
 2020-08-04 11:23:08 +02:00
Urban Rotnik cce76f6f0f
Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults 
Add ordering for result page [SCI-4895]
 2020-08-04 11:17:43 +02:00
Alex Kriuchykhin e965844a9e
Merge pull request #2755 from aignatov-bio/ai-sci-4837-implement-new-statuses-in-preports 
Add new statuses to reports [SCI-4837]
 2020-08-04 09:49:55 +02:00
Alex Kriuchykhin a9bc5b664a
Merge pull request #2750 from aignatov-bio/ai-sci-4835-add-status-flow-modal 
Add modal for status flow [SCI-4835]
 2020-08-04 09:47:40 +02:00
Urban Rotnik aaae33e603
Merge pull request #2764 from aignatov-bio/ai-sci-4766-add-start-date-filter-to-dashboard 
Add start date to current task dashboard filter [SCI-4766]
 2020-08-03 11:56:24 +02:00