scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-24 17:06:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
9213 commits 69 branches 179 tags 165 MiB
Commit graph

2782 commits

Author SHA1 Message Date
aignatov-bio 12fdea8d89 Add context menu to attahcments 2020-11-04 13:08:40 +01:00
aignatov-bio e8e9244d96 Fix I18n and double loading 2020-11-03 09:07:49 +01:00
Oleksii Kriuchykhin 8eec4e4b59 Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047] 2020-11-02 22:19:33 +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 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
Mojca Lorber 8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
Oleksii Kriuchykhin 258c57870f Implement the toolbar on the Team Projects page [SCI-5129] 2020-11-02 13:28:37 +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
Mojca Lorber a52315fc79 Merge branch 'develop' into ml-sci-5033 2020-10-29 18:28:25 +01:00
aignatov-bio 12991e8fd3 Commit add asset preview mode switcher to step 2020-10-29 16:42:05 +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 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
Oleksii Kriuchykhin 13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +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
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
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
Urban Rotnik b94a3a6cb8 Clean up controller 2020-10-26 16:17:39 +01:00
aignatov-bio 6edcf4b099 Add size label 2020-10-26 15:10:06 +01:00
Urban Rotnik 1ffc3449bf Clean up index view 2020-10-26 13:42:32 +01:00
Urban Rotnik 431b9161b6 Code cleanup 2020-10-26 11:03:43 +01:00
Mojca Lorber ec41bdd414 Move open mobile app button to main navigation 2020-10-26 09:28:44 +01:00
aignatov-bio aefaf4d0c1 Update image edit modal 2020-10-25 16:57:50 +01:00
aignatov-bio d6f8e156c1 Update checkbox style at repository and protocol datatable 2020-10-22 16:42:12 +02:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Mojca Lorber 2639810e1a Fix no step bug 2020-10-22 13:21:05 +02:00
Urban Rotnik 58013e215d Add lock icon to current task section on dashboard 2020-10-22 08:09:51 +02:00
Mojca Lorber 6d7b55301f Fix pwa url and change when banner is displayed 2020-10-21 14:56:20 +02:00
Mojca Lorber 23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +02:00
aignatov-bio 566ef7aef7 Add list view to atachments 2020-10-16 11:00:57 +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
Mojca Lorber cf367baefa Merge branch 'develop' into ml-sci-4841 2020-10-12 14:43:03 +02:00
aignatov-bio 5d6c9e78fd Refactor dashboard layout 2020-10-06 16:09:26 +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
Mojca Lorber 4e4a4a2c4e Change Complete step button on task step 2020-10-02 15:02:42 +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
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
Mojca Lorber 94fea75fda Fix at long inventory name snapshot in title is not visible 2020-09-24 17:19:41 +02:00
aignatov-bio 70a0da17b2 Fix markup 2020-09-24 17:12:53 +02:00
aignatov-bio 780db9d134 Add assets view switcher 2020-09-24 17:10:36 +02:00
Urban Rotnik 7bc31905b5 Fix protocol import modal 2020-09-23 12:54:16 +02:00
aignatov-bio e4b94b582a Add dynamic render of wopi files in viewport 2020-09-23 12:32:46 +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
Urban Rotnik 4eebfa5461 Controller action for card inline preview 2020-08-28 11:05:52 +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
Urban Rotnik ac3c06d882
Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items 
Add export for assigned items [SCI-4748]
 2020-08-03 11:30:31 +02:00
aignatov-bio 536367362c Add statuses to dashboard filters 2020-07-31 10:59:10 +02:00
aignatov-bio 2f5231e832 Add start date to current task dashboard filter 2020-07-29 16:09:23 +02:00
aignatov-bio 15b5f9bb68 Add ordering for result page 2020-07-28 15:39:29 +02:00
aignatov-bio f09ead703c Fix markup 2020-07-28 09:54:47 +02:00
aignatov-bio b644950e4e Fix I18n markup 2020-07-28 09:53:35 +02:00
aignatov-bio 68fc6ec58a Add sorting my module statuses 2020-07-27 16:36:21 +02:00
aignatov-bio 968249c6d8 Fix tests 2020-07-27 13:48:21 +02:00
aignatov-bio 9f7efe6068 Add backend for status flow show 2020-07-27 13:48:21 +02:00
aignatov-bio 6bd12e0397 Add modal for status flow 2020-07-27 13:48:21 +02:00
aignatov-bio 33e3e3d301 Small 2fa fixes 2020-07-27 13:42:51 +02:00
Oleksii Kriuchykhin 94588e4698 Refactor task archive and move permissions [SCI-4817] 2020-07-24 17:00:42 +02:00
Urban Rotnik 025378cd0e Fix translations and JS 2020-07-23 15:53:46 +02:00
Alex Kriuchykhin d4408f6af7
Merge pull request #2738 from aignatov-bio/ai-sci-4732-add-pagination-to-results 
Add pagination to results page [SCI-4732]
 2020-07-23 14:45:10 +02:00
aignatov-bio a0d19b5d98 Add new statuses to reports 2020-07-23 14:24:30 +02:00
Urban Rotnik 512d6f3229 Add actions for update status, clean old complete actions 2020-07-22 16:12:34 +02:00
Urban Rotnik aacee14fc6 Add Status button 2020-07-22 15:30:47 +02:00
aignatov-bio 1d3055011f Merge branch 'features/tinymce-tables' into develop 2020-07-22 13:41:43 +02:00
aignatov-bio 53d62b0310 Fix tests 2020-07-22 13:16:27 +02:00
aignatov-bio ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +02:00
Alex Kriuchykhin c13730ee8d
Merge pull request #2740 from mlorb/ml-sci-4833 
Implement Status labels on a Task card [SCI-4823]
 2020-07-22 11:32:45 +02:00
Oleksii Kriuchykhin 7fd004baa8 Prepare database structure and relations for statuses phase one [SCI-4825] 2020-07-17 18:04:09 +02:00
aignatov-bio e69e3ea8d3 Add export for assigned items 2020-07-17 15:17:09 +02:00
Mojca Lorber 10e607c281 Implement Status labels on a Task card 2020-07-17 14:48:45 +02:00
aignatov-bio 7c4bfad09b Add pagination to results page 2020-07-16 15:47:19 +02:00
aignatov-bio f77902f6d4 Add tinymce table support to docx 2020-07-15 09:44:25 +02:00
aignatov-bio 39b5651283 Revert FontAwesome in reports to CDN 2020-07-14 09:44:03 +02:00
Alex Kriuchykhin 8dd478ad61
Merge pull request #2730 from aignatov-bio/ai-sci-4874-improve-pdf-reports 
Improve pdf reports [SCI-4874]
 2020-07-13 17:02:10 +02:00
aignatov-bio c592954400 Add UX 2020-07-13 16:05:23 +02:00
Mojca Lorber 212ba76c16 Fix Settings pages titles 2020-07-13 14:51:51 +02:00
aignatov-bio f8c6d9f260 Fix markup 2020-07-13 14:31:57 +02:00
aignatov-bio a7fac38fcb Improve pdf reports 2020-07-13 14:29:59 +02:00
aignatov-bio 7d20bf6fea Add recovery screen 2020-07-13 09:51:04 +02:00
aignatov-bio fef6e5f1db Add recovery strategy for 2fa 2020-07-09 17:01:00 +02:00
Urban Rotnik 721f3accbe
Merge pull request #2694 from urbanrotnik/ur-sci-4790 
Show assigned users modal also for view only [SCI-4790]
 2020-07-09 16:12:20 +02:00
Urban Rotnik 4003608c7d Fix style 2020-07-09 15:43:08 +02:00
Urban Rotnik d2415c3b1d Show assigned users modal also for view 2020-07-09 15:11:53 +02:00
mlorb 3f44f44cbe
Merge pull request #2711 from mlorb/ml-sci-4810 
Hide inventory buttons and fix css of disabled button [SCI-4810]
 2020-07-09 15:11:02 +02:00
Urban Rotnik b11f166c38 Fix cucumber tests 2020-07-09 13:14:07 +02:00
Urban Rotnik d92bcee3f6 Helpers for first elements 2020-07-09 13:14:06 +02:00
Miha Mencin b357d7c0e6
Merge pull request #2719 from urbanrotnik/ur-sci-4806-missing-icon 
Add icon before archived items [SCI-4806]
 2020-07-09 12:58:06 +02:00
aignatov-bio 6245e19069
Merge pull request #2718 from biosistemika/master 
Merge master to develop
 2020-07-09 12:56:31 +02:00
Urban Rotnik 950f65b90e
Merge pull request #2715 from urbanrotnik/ur-sci-4771-improve-report-layout 
Improve report layout [SCI-4771]
 2020-07-09 11:48:33 +02:00
mlorb d9038e6f7f
Merge branch 'develop' into ml-sci-4810 2020-07-09 11:46:54 +02:00
Urban Rotnik 7661cea379 Add icon before archived items 2020-07-09 11:34:09 +02:00
Miha Mencin c68aa5c875
Merge pull request #2716 from mlorb/ml-sci-4567 
Change title size to h1 [SCI-4567]
 2020-07-09 11:19:02 +02:00
mlorb efbef2c876
Merge pull request #2384 from mlorb/ml-sci-4261 
Clean up controllers for manage repository columns [SCI-4261]
 2020-07-09 09:18:23 +02:00
Mojca Lorber f64172f787 Revert repository archived items title 2020-07-09 09:17:02 +02:00
aignatov-bio b2a42c182b
Merge pull request #2717 from aignatov-bio/ai-sci-4844-fix-dropdown-options-for-active-repository 
Small archived repositories fixes [SCI-4844]
 2020-07-09 08:56:21 +02:00
aignatov-bio 135ac487d0 Small archived repositories fixes 2020-07-08 13:42:27 +02:00
Mojca Lorber 00b668a4ba Change title size to h1 2020-07-08 13:02:47 +02:00
Urban Rotnik 5d067077b1 Add logo and timestamp to PDF and Doc reports 2020-07-08 10:48:29 +02:00
aignatov-bio a994c75885
Merge pull request #2700 from aignatov-bio/ai-sci-4801-inventory-list-sorting-date-issue 
Fix date columns sorting in repositories list [SCI-4801]
 2020-07-08 09:30:10 +02:00
aignatov-bio 004a7e3943
Merge pull request #2705 from aignatov-bio/ai-sci-4808-update-css-for-inventory-modals 
Update inventory modals CSS [SCI-4808]
 2020-07-08 09:29:02 +02:00
aignatov-bio 88c092dc98 Add i18n and constants 2020-07-07 15:59:02 +02:00
Mojca Lorber 9642e92fdc Hide inventory buttons and fix css of disabled button 2020-07-07 13:53:31 +02:00
aignatov-bio 7a9a25e6a9 Add 2fa wizzard tabs 2020-07-07 13:17:17 +02:00
aignatov-bio be3a1994f8 Add basic UX to 2FA 2020-07-07 13:09:48 +02:00
aignatov-bio 13f7653667 Merge branch 'develop' into features/2fa 2020-07-07 13:05:45 +02:00
aignatov-bio 6352a4ba9b Update inventory modals 2020-07-06 12:47:42 +02:00
aignatov-bio d226bb5622 Fix date columns sorting in repositories list 2020-07-02 14:35:48 +02:00
Urban Rotnik 1bf8198129 Hide checkbox column when user is not admin 2020-07-02 14:29:18 +02:00
aignatov-bio 4b9881e31e Add 2fa to user settings page 2020-07-01 13:25:06 +02:00
Urban Rotnik 62a4a5f203 Add 2fa login 2020-07-01 12:46:26 +02:00
Mojca Lorber 22b71bc9cb Merge branch 'develop' into ml-sci-4261 2020-06-30 13:47:32 +02:00
aignatov-bio fe79fa4788 Fix markup 2020-06-29 10:57:41 +02:00
aignatov-bio 6fa97d3639 Add enable 2fa button to user settings 2020-06-29 10:56:06 +02:00
Oleksii Kriuchykhin 7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Alex Kriuchykhin 2a315ac106
Merge pull request #2681 from biosistemika/SCI-4780-replace-delete-button 
SCI-4780 replace delete button with archive button
 2020-06-24 13:16:11 +02:00
Oleksii Kriuchykhin 29f62419bd Improve repository archive/restore actions [SCI-4780] 2020-06-24 11:32:20 +02:00
aignatov-bio 5fc3146174 Update my module repositories dropdown list 2020-06-24 11:23:17 +02:00
miha 41bb825f33 SCI-4780 Added archive and restore items to repository actions dropdown, minor refactoring of controller 2020-06-23 22:59:21 +02:00
aignatov-bio 414429afcd
Merge pull request #2674 from aignatov-bio/ai-sci-4784-update-manage-columns-for-archived-repository 
Add archived_by and archived_on column to columns manage modal [SCI-4784]
 2020-06-23 09:10:28 +02:00
Urban Rotnik 30de400cf9
Merge pull request #2676 from mlorb/ml-sci-4786 
Revert default_scope for active repositories [SCI-4786]
 2020-06-22 16:17:39 +02:00
Mojca Lorber be19190ff1 Revert default_scope for active repositories 2020-06-22 14:57:35 +02:00
aignatov-bio dc50e7f1fd Add archived_by and archived_on column to columns manage modal 2020-06-22 14:00:44 +02:00
aignatov-bio 6f2d5b359e Add action buttons to repository index 2020-06-19 15:54:45 +02:00
Mojca Lorber 6e8062179c Implement archiving and restoring of whole inventories 2020-06-18 18:07:23 +02:00
aignatov-bio 323929b270 Add restore/delete buttons 2020-06-18 14:09:29 +02:00
aignatov-bio e9830ebfee Add view switcher 2020-06-18 14:08:24 +02:00
aignatov-bio 8b10d49118 Clean up CSS 2020-06-18 14:08:24 +02:00
Urban Rotnik b498aa54d3
Merge pull request #2661 from urbanrotnik/ur-sci-4740-default-scope 
Update default scope [SCI-4740] [SCI-4687][SCI-4746]
 2020-06-18 14:07:10 +02:00
Urban Rotnik 123375f494 Update scopes in reports 2020-06-18 09:33:12 +02:00
Urban Rotnik c0a2d4709c
Merge pull request #2662 from urbanrotnik/ai-sci-4770 
Fix MarvinJS modal header [SCI-4770] - HotFix
 2020-06-16 11:44:04 +02:00
aignatov-bio 95ae8215a7 Fix MarvinJS modal header 2020-06-16 10:28:43 +02:00
aignatov-bio a6ff5b1ed8
Merge pull request #2653 from aignatov-bio/ai-sci-4692-add-archiving-columns-to-datable-helper 
Add archiving column to datatable helper [SCI-4692]
 2020-06-15 15:35:19 +02:00
mlorb 0a7c9aeb1a
Merge pull request #2651 from urbanrotnik/ur-sci-4706-archiving-restoring-rows 
Archiving & restoring rows [SCI-4706]
 2020-06-11 16:41:53 +02:00
aignatov-bio db35da0cee Add archiving column to datatable helper 2020-06-11 12:48:31 +02:00
Urban Rotnik c7d6c4d60e Add repository_rows restoring and archiving actions on FE 2020-06-09 22:16:55 +02:00
aignatov-bio 2b9062ac92 Add checkbox selector to datatable 2020-06-09 13:16:50 +02:00
aignatov-bio 15de84ff2f Not include marvinJS library, if marvinJS disabled 2020-06-08 09:59:26 +02:00
Alex Kriuchykhin f521531fd5
Merge pull request #2638 from okriuchykhin/ok_SCI_4571 
Clear the obsolete code for assigning inventory items to the task [SCI-4571]
 2020-06-08 09:47:56 +02:00
aignatov-bio dd58fc4199 Fix i18n 2020-06-04 18:41:45 +02:00
aignatov-bio 66a77d8de9 Add sidebar reload on view change 2020-06-04 18:41:45 +02:00
aignatov-bio 012b7b3d23 Add switch for active/archive repository view 2020-06-04 18:41:45 +02:00
Urban Rotnik 69d086ba32 Scope snapshots to project 2020-06-03 22:58:22 +02:00
Oleksii Kriuchykhin 48865c8cea Clear the obsolete code for assiging inventory items to the task [SCI-4571] 2020-06-03 22:54:45 +02:00
Oleksii Kriuchykhin 6afebdc5da Remove inventory links of unshared inventory [SCI-4715] 2020-06-01 17:50:31 +02:00
aignatov-bio f963608996 Add I18n and tests 2020-06-01 14:34:04 +02:00
aignatov-bio 8f3c7fa9aa
Merge pull request #2627 from aignatov-bio/ai-sci-4549-fix-shared-inventory-icon 
Fix shared inventory icon [SCI-4549]
 2020-06-01 10:28:07 +02:00
aignatov-bio aee75a2f83 Add repository list view 2020-06-01 10:24:03 +02:00
Alex Kriuchykhin b688b0c335
Merge pull request #2616 from okriuchykhin/ok_SCI_4698_v2 
Fix handling of deleted repositories in reports [SCI-4698]
 2020-05-29 16:51:17 +02:00
Oleksii Kriuchykhin d774a82762 Fix handling of snapshots of deleted repositories in reports [SCI-4698] 2020-05-29 16:30:27 +02:00
aignatov-bio 1430ca5ae9 Fix shared inventory icon 2020-05-29 13:17:07 +02:00
Oleksii Kriuchykhin 7a95355e81 Add extra check for repository presence in report [SCI-4698] 2020-05-29 11:39:07 +02:00
Alex Kriuchykhin be8c7e01e2
Merge pull request #2622 from aignatov-bio/ai-sci-4699-show-selected-snapshot-in-sidebar 
Show selected snapshot in sidebar [SCI-4699]
 2020-05-29 11:14:52 +02:00
Alex Kriuchykhin 26449fdfe2
Merge pull request #2625 from okriuchykhin/ok_SCI_4712 
Fix assigned repositories list and snapshot creation for shared repositories [SCI-4712]
 2020-05-29 09:52:08 +02:00
Oleksii Kriuchykhin 8027cc6a49 Fix assigned repositories list and snapshot creation for shared repositories [SCI-4712] 2020-05-28 16:15:05 +02:00
aignatov-bio 368ee8a689 Show selected snapshot in sidebar 2020-05-28 15:18:26 +02:00
Mojca Lorber 285280827a Refactor repository column base controller 2020-05-28 12:18:46 +02:00
Mojca Lorber c673e27109 Merge branch 'develop' into ml-sci-4261 2020-05-28 08:18:24 +02:00
aignatov-bio aaff5eb67f Add name order for porject/experiment/task sidebar 2020-05-27 13:31:00 +02:00
Oleksii Kriuchykhin b430d507cf Fix handling of deleted repositories in reports [SCI-4698] 2020-05-27 12:15:19 +02:00
aignatov-bio 15f58be1c2 Fix snapshot date creation 2020-05-26 15:59:49 +02:00
Miha Mencin 4b7b3a8622
Merge pull request #2607 from biosistemika/SCI-4674-tehnician-snapshots-permissions 
[SCI-4674] Fix a typo
 2020-05-25 17:30:19 +02:00
Miha Mencin 55aac63fba Fix a typo 2020-05-25 17:28:36 +02:00
Miha Mencin 79ba0b3708
Merge pull request #2605 from biosistemika/SCI-4674-tehnician-snapshots-permissions 
SCI-4674 allow tehnician to create, delete and select snapshot
 2020-05-25 16:55:33 +02:00
Miha Mencin 77e1feda97 SCI-4674 name permissions more properly 2020-05-25 16:29:00 +02:00
Miha Mencin 5994e8c6a6 SCI-4674 create special permissions for snapshots on task 2020-05-25 15:49:31 +02:00
Miha Mencin cd70d9c5a6 SCI-4674 allow tehnician to create, delete and select snapshot 2020-05-25 15:03:37 +02:00
Urban Rotnik df8fe20d03 Keep reportElements up to date with active snapshots and repositories 2020-05-25 13:19:33 +02:00
Urban Rotnik 359517eb17 Add deleted repositories to report 2020-05-25 13:19:30 +02:00
Urban Rotnik 2b493ce6f6 Refactor assigned rows 2020-05-25 13:19:29 +02:00
Urban Rotnik 9536939b3b Show snapshot rows in report 2020-05-25 13:19:28 +02:00
Mojca Lorber 94dc314c73 Hide hamburger menu on login screen 2020-05-25 10:39:35 +02:00
mlorb 384ec40c4e
Merge pull request #2542 from mlorb/ml-sci-4582 
Task details description corrections and some changes of locales [SCI-4582]
 2020-05-25 09:10:37 +02:00
aignatov-bio 100108bd43
Merge pull request #2596 from aignatov-bio/ai-sci-4642-improve-assigned-task-search 
Improve search through assigned tasks [SCI-4642]
 2020-05-25 09:09:19 +02:00
Oleksii Kriuchykhin c98b042585 Improve handling of unassigned inventories with existing snapshots [SCI-4661] 2020-05-22 17:36:04 +02:00
aignatov-bio 230ec487ba Make snapshots versions buttons full size clickable 2020-05-22 17:16:20 +02:00
aignatov-bio ce53235cb9
Merge pull request #2592 from aignatov-bio/ai-sci-4621-fix-order-icon-position-in-simple-view 
Fix ordering in simple table view [SCI-4621]
 2020-05-22 16:52:45 +02:00
Urban Rotnik a754e5765d
Merge pull request #2595 from urbanrotnik/ur-sci-4670-missing-button 
New step missing button [SCI-4670]
 2020-05-22 15:33:58 +02:00
aignatov-bio cbc578f84b Fix snapshot name column id 2020-05-22 15:10:21 +02:00
aignatov-bio 3287070df7 Improve search through assigned tasks 2020-05-22 14:36:28 +02:00
Urban Rotnik 9d3874e343 Add margin to keywords container 2020-05-22 14:23:03 +02:00
Urban Rotnik 1c2883414b Bring newStep top button back 2020-05-22 12:29:14 +02:00
Urban Rotnik a1fa0b4e05 Add check for button visibility 2020-05-22 12:02:38 +02:00
Urban Rotnik a9bed41ff5 Remove obsolete html message 2020-05-22 10:33:13 +02:00
aignatov-bio 0aa1c32813 Fix ordering in simple table view 2020-05-21 16:51:07 +02:00
aignatov-bio d3781a7048
Merge pull request #2588 from aignatov-bio/ai-sci-4660-change-assigned-private-task-view 
Add private tasks to assigned task list [SCI-4660]
 2020-05-21 12:57:59 +02:00
Mojca Lorber 12982260b7 Fix css hover effects 2020-05-21 08:37:40 +02:00
Oleksii Kriuchykhin f2043f111b Change display of the live version for a deleted inventory [SCI-4659] 2020-05-20 21:50:39 +02:00
aignatov-bio d16930e987 Add private tasks to assigned task list 2020-05-20 17:23:48 +02:00
Mojca Lorber e2959fec32 Merge branch 'develop' into ml-sci-4582 2020-05-20 10:37:33 +02:00
Urban Rotnik 431bd0c53b
Merge pull request #2582 from urbanrotnik/ur-sci-4650-font-size-fix 
Fonts size update [SCI-4650]
 2020-05-19 14:55:22 +02:00
mlorb 7cbbcff86a
Merge pull request #2576 from mlorb/ml-sci-4619 
Fix manage permissions on views [SCI-4619]
 2020-05-19 14:29:11 +02:00
Urban Rotnik ac4532eea3 Update fonts 2020-05-19 14:14:58 +02:00
aignatov-bio c00b96ff7e
Merge pull request #2577 from aignatov-bio/ai-sci-4646-fix-task-sections-collapse-animation 
Fix collapse animation for task sections [SCI-4646]
 2020-05-19 10:31:36 +02:00
Alex Kriuchykhin afdd6fd149
Merge pull request #2572 from okriuchykhin/ok_SCI_4629 
Prevent the inventory items editing while snapshot is being created [SCI-4629]
 2020-05-19 10:10:34 +02:00
aignatov-bio 9f4457642d Fix collapse animation for task sections 2020-05-18 16:01:26 +02:00
Mojca Lorber 6b6fba591e Fix manage permissions on views 2020-05-18 15:54:32 +02:00
aignatov-bio acb1b392fc
Merge pull request #2564 from aignatov-bio/ai-sci-4632-remove-task-inventory-tab 
Remove inventory tab from task and routes to inventory page [SCI-4632]
 2020-05-18 11:16:17 +02:00
aignatov-bio f2d81cb199
Merge pull request #2570 from aignatov-bio/ai-sci-4617-make-snapshot-creation-text-switchable 
Make snapshot creation info text switchable [SCI-4617]
 2020-05-18 11:15:46 +02:00
Oleksii Kriuchykhin c0521c3ca7 Prevent the inventory items editing while snapshot is being created [SCI-4629] 2020-05-15 17:46:59 +02:00
aignatov-bio bc81a48b00 Make snapshot creation info text switchable 2020-05-15 14:44:26 +02:00
Urban Rotnik a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
aignatov-bio dc2caca4f3 Small css fixes and test fix 2020-05-15 11:04:17 +02:00
mlorb dbd03a09ef
Merge pull request #2565 from mlorb/ml-sci-4511 
Add New Task layout Collapsed/Expanded States saving [SCI-4511]
 2020-05-15 09:23:05 +02:00
Mojca Lorber 4c15c89cf5 Add New Task layout Collapsed/Expanded States saving 2020-05-15 00:49:23 +02:00
aignatov-bio 51e3c70a4d
Merge pull request #2563 from aignatov-bio/ai-sci-4638-fix-step-content-aligment 
Fix align for step content [SCI-4638]
 2020-05-14 22:10:50 +02:00
aignatov-bio bac98bdbdc Remove inventory tab from task and routes to inventory page 2020-05-14 22:10:13 +02:00
aignatov-bio 443c301ca1 Fix align for step content 2020-05-14 21:53:00 +02:00