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

6599 commits

Author SHA1 Message Date
Urban Rotnik c628fb2598 Remove duplicated notes section in reports 2020-09-08 16:10:24 +02:00
Urban Rotnik d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
aignatov-bio 4083ed1755 Fix tests 2020-09-08 14:52:23 +02:00
Oleksii Kriuchykhin dd347aa834 Improve step reposition after deletion [SCI-4880] 2020-09-08 11:48:06 +02:00
aignatov-bio e1255bf942 Remove duplicate action 2020-09-08 09:50:26 +02:00
aignatov-bio 0be99c12c2 revert changes 2020-09-08 09:45:42 +02:00
aignatov-bio ee333a982a Revert back state logic 2020-09-08 09:45:42 +02:00
aignatov-bio bd1d6a772b Add completed/uncompleted methods to my_module 2020-09-08 09:45:09 +02:00
Mojca Lorber 7e9ef9496f Update smart annotation appearance in the text 2020-09-07 18:30:54 +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
aignatov-bio f2ffe17636 Skip implications for my_module canvas position update 2020-09-07 13:05:26 +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
aignatov-bio 8b1e11a314 Add conditions_fulfilled? method 2020-09-03 14:20:38 +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
aignatov-bio 5cb497b61d Split params validation to create and update 2020-09-03 09:49:00 +02:00
aignatov-bio 39105a807a
Merge pull request #2816 from aignatov-bio/ai-sci-4960-fix-css-issue-for-status-flow 
Fix css for status flows [SCI-4970]
 2020-09-03 09:46:19 +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
Mojca Lorber 634dd2ae5e Add css variable 2020-09-02 12:00:52 +02:00
aignatov-bio 4c7312faf9 Add tests for new workflow endpoints 2020-09-02 11:43:00 +02:00
Mojca Lorber d57eb68f93 Fix tables header corners 2020-09-01 16:25:30 +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
aignatov-bio 68f31ce7ec Add api endpoints for workflows 2020-09-01 15:01:38 +02:00
Urban Rotnik ed5869ff8e Show status on task card 2020-09-01 14:56:48 +02:00
aignatov-bio e1229f5606 Fix test and status validations 2020-09-01 14:49:58 +02:00
Urban Rotnik 5148902d93 Fix error on edit experiment 2020-09-01 13:37:57 +02:00
aignatov-bio ce84c1546b Fix tests 2020-09-01 12:41:00 +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 8b0b296b90
Merge pull request #2774 from okriuchykhin/ok_SCI_4829 
Add task status to export all [SCI-4829]
 2020-08-31 11:13:44 +02:00
aignatov-bio 6229ba6041 Add morkflow generator 2020-08-27 12:13:13 +02:00
aignatov-bio c07ebe90fa Add migration for task states 2020-08-27 11:34:59 +02:00
Oleksii Kriuchykhin bc4c18e585 Add secondary-navigation-title-name data hook [SCI-4859] 2020-08-27 11:33:26 +02:00
Urban Rotnik a5fb873d19 Add default workflow 2020-08-27 10:54:39 +02:00
aignatov-bio 7a0dc13f3d
Merge pull request #2790 from aignatov-bio/ai-sci-4866-implement-snapshotting-as-consequence 
Add consequence for repository snapshotting [SCI-4866]
 2020-08-25 15:55:31 +02:00
Oleksii Kriuchykhin ed2eb81c68 Switch to position swapping when updating step position [SCI-4880] 2020-08-25 15:46:23 +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 4a837951db Update variable name 2020-08-25 15:02:25 +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
Urban Rotnik 86bcd9b13b
Merge pull request #2799 from urbanrotnik/ur-sci-4945-user-state-fix 
Set stateDuration to 0 [SCI-4945]
 2020-08-25 05:48:18 +02:00
Urban Rotnik b6495becdb Set stateDuration to 0 2020-08-24 15:51:35 +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
Oleksii Kriuchykhin e0f7e181f6 Fix user deletion script [SCI-4829] 2020-08-21 13:12:14 +02:00
Oleksii Kriuchykhin e6e47f5106 Fix failing tests [SCI-4829] 2020-08-21 11:58:12 +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
Alex Kriuchykhin 287f7cce79
Merge pull request #2771 from okriuchykhin/ok_SCI_4889 
Improve handling of old repository table states [SCI-4889]
 2020-08-21 10:59:34 +02:00
Mojca Lorber 059c8c88d9 Fix css for modal-body 2020-08-20 14:12:45 +02:00
Mojca Lorber faf2d4c533 Fix export icon 2020-08-14 17:02:03 +02:00
aignatov-bio 19a0d05467 Fix for checklist ordering 2020-08-14 12:32:39 +02:00
Urban Rotnik 38d3411007 Update checklist item positions with validations skip 2020-08-13 20:06:03 +02:00
Mojca Lorber a91aa6ce46 Fix Collapse and expand buttons position 2020-08-13 13:18:50 +02:00
aignatov-bio fdb2e46700 Add consequence for repository snapshotting 2020-08-13 12:51:33 +02:00
aignatov-bio 9474319d6b Fir error handling in invite user view 2020-08-13 11:34:21 +02:00
Urban Rotnik 0c28b5d667
Merge pull request #2788 from urbanrotnik/ur-sci-4925-report-activities-fix 
Fix activities query [SCI-4925]
 2020-08-13 10:09:45 +02:00
Urban Rotnik 9f74a86ebe Fix activities query 2020-08-12 16:56:49 +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
Urban Rotnik 7d186156a0 Fix permission check lapsus 2020-08-11 17:00:36 +02:00
aignatov-bio 84b99eaf3d Fix error handling on registration page 2020-08-11 15:39:35 +02:00
mlorb 02bb29cf79
Merge pull request #2772 from mlorb/ml-sci-4907 
Fix inventory card view for snapshots as default view [SCI-4907]
 2020-08-11 14:43:19 +02:00
Mojca Lorber 5d15e73866 Fix failing tests 2020-08-11 13:33:44 +02:00
Urban Rotnik f5ffd685d8
Merge pull request #2773 from urbanrotnik/ur-sci-4879-word-format-fix 
Fix word reports when using headings [SCI-4879]
 2020-08-11 13:01:43 +02:00
Mojca Lorber 7af9c387cf Fix errors 2020-08-11 10:27:23 +02:00
Mojca Lorber 94e6b554f1 Revert back the view 2020-08-10 17:29:29 +02:00
Urban Rotnik 29152eeb6d
Merge pull request #2783 from urbanrotnik/ur-sci-4920-permission-repository-fix 
Fix permission check [SCI-4920]
 2020-08-10 15:59:21 +02:00
Miha Mencin b333700f40
Merge pull request #2779 from okriuchykhin/ok_SCI_4910 
Fix rendering of RTE in API [SCI-4910]
 2020-08-10 15:26:35 +02:00
Urban Rotnik e429c78d56 Fix permission check 2020-08-10 15:22:49 +02:00
Miha Mencin 9c351dd2ed
Merge pull request #2782 from aignatov-bio/ai-sci-4902-add-cell-border-to-docx-report 
Add border to tinymce table in docx [SCI-4902]
 2020-08-10 15:02:39 +02:00
aignatov-bio 67b6592470
Merge pull request #2781 from aignatov-bio/ai-sci-4919-fix-dashboard-calendar 
Fix dashboard calendar due date selection [SCI-4919]
 2020-08-10 14:34:23 +02:00
aignatov-bio e9028961db Add border to tinymce table in docx 2020-08-10 13:47:32 +02:00
aignatov-bio a3ad8b5aab Fix dashboard calendar due date selection 2020-08-10 12:55:56 +02:00
Miha Mencin 1080ad2821
Merge pull request #2778 from okriuchykhin/ok_SCI_4911 
Add created_at and user to API Step serializer [SCI-4911]
 2020-08-10 10:27:53 +02:00
Miha Mencin 98c3721d8c
Merge pull request #2775 from urbanrotnik/ur-sci-4904-unlock-instruction 
Add check if user is locked, show link unlock instructions [SCI-4904]
 2020-08-10 10:27:06 +02:00
Urban Rotnik 3c1c562e4c Override password reset action, sign_in user only if 2fa disabled 2020-08-10 09:24:15 +02:00
aignatov-bio 56ff4e7702 Add new statuses to dashboard 2020-08-10 09:10:56 +02:00
Oleksii Kriuchykhin 91d9f5d6ee Fix rendering of RTE in API [SCI-4910] 2020-08-07 16:51:57 +02:00
Oleksii Kriuchykhin 3d3fd1625c Add created_at and user to API Step serializer [SCI-4911] 2020-08-07 14:54:05 +02:00
Urban Rotnik 3c3a2bfb8b Add check if user is locked, show link unlock instructions 2020-08-06 15:18:20 +02:00
Miha Mencin ae013b6fa8
join two renders 2020-08-06 14:06:23 +02:00
Miha Mencin 04c294adb1
Fix the failing test: repository row should be in correct repository 2020-08-06 13:23:40 +02:00
Oleksii Kriuchykhin 02a4da1a55 Add task status to export all [SCI-4829] 2020-08-06 10:50:11 +02:00
Urban Rotnik bdf1e62f60 Fix word reports when using headings 2020-08-05 16:25:10 +02:00
Mojca Lorber 3a8fc01ff7 Fix inventory card view for snapshots as default view 2020-08-05 15:43:43 +02:00
Oleksii Kriuchykhin 6a50f7f27e Improve handling of old repository table states [SCI-4889] 2020-08-05 13:15:38 +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
Alex Kriuchykhin abe2243ad2
Merge pull request #2762 from okriuchykhin/ok_SCI_4767 
Fix import of the old format TinyMCE images [SCI-4767]
 2020-08-04 09:43:32 +02:00
Alex Kriuchykhin 22015beeb5
Merge pull request #2757 from urbanrotnik/ur-sci-4813-base64-multipart-upload 
Extend asset API upload to support base64 [SCI-4813]
 2020-08-04 09:43:01 +02:00
Urban Rotnik 9b06510dcc Update PUT result file endpoint, refactor 2020-08-03 15:14:58 +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 868f2e8242
Merge pull request #2765 from aignatov-bio/ai-sci-4878-fix-activities-on-task-tab 
Fix CSS for activities on task page [SCI-4878]
 2020-08-03 11:31:47 +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 73911cf7ce Fix CSS for activities on task page 2020-07-30 13:30:23 +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
Oleksii Kriuchykhin 60017661c1 Fix import of the old format TinyMCE images [SCI-4767] 2020-07-27 16:39:39 +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 1a8333612a Merge branch 'features/pwa' into develop 2020-07-27 09:47:41 +02:00
Oleksii Kriuchykhin 7bedbd3511 Fix canvas update method [SCI-4817] 2020-07-24 18:38:53 +02:00
Oleksii Kriuchykhin 94588e4698 Refactor task archive and move permissions [SCI-4817] 2020-07-24 17:00:42 +02:00
Urban Rotnik 9c05da1071 Fix task error 2020-07-24 15:25:29 +02:00
Urban Rotnik 4958139699 Extend asset API upload to support base64 2020-07-24 14:57:03 +02:00
Urban Rotnik 025378cd0e Fix translations and JS 2020-07-23 15:53:46 +02:00
Alex Kriuchykhin 8b24a0f704
Merge pull request #2754 from urbanrotnik/ur-sci-4730-protocol-error 
Add blacklist for dashboard activities [SCI-4730]
 2020-07-23 15:21:51 +02:00
Alex Kriuchykhin 26cfa001c8
Merge pull request #2747 from urbanrotnik/ur-sci-4769-canvas-test 
Add test for canvas_controller [SCI-4769]
 2020-07-23 15:18:01 +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 ac1915351d
Merge pull request #2748 from aignatov-bio/ai-sci-4886-add-permission-checks-to-docx 
Add scopes and permission checks for docx report [SCI-4886]
 2020-07-23 14:26:53 +02:00
aignatov-bio a0d19b5d98 Add new statuses to reports 2020-07-23 14:24:30 +02:00
Urban Rotnik 9bcf1a5df5 Add blacklist for dashboard activities 2020-07-23 14:22:58 +02:00
Urban Rotnik 077f5eefdb
Merge pull request #2753 from urbanrotnik/ur-sci-4890-inventory-empty-text-value 
Fix undefined text cell [SCI-4890]
 2020-07-23 12:56:43 +02:00
aignatov-bio 04a6a2a250 Small fixes 2020-07-23 11:35:22 +02:00
Alex Kriuchykhin cb9fe04584
Merge pull request #2745 from aignatov-bio/ai-sci-4785-fix-inventories-activity-filters 
Fix global activities filters [SCI-4785]
 2020-07-23 10:09:36 +02:00
aignatov-bio b214d2df77
Merge pull request #2746 from aignatov-bio/ai-sci-4815-fix-margins-on-view-switch 
Fix switch view margins [SCI-4815]
 2020-07-23 08:57:20 +02:00
Urban Rotnik 51ca828399 Fix undefined text cell 2020-07-22 17:27:36 +02:00
Urban Rotnik 6bb760c0a9 Remove cucumber test for complete/uncomplete step 2020-07-22 16:50:10 +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 005bfb2ba7 Fix merge conflicts 2020-07-22 12:37:18 +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 fa62b33a42 Add status implications checks to the permissions [SCI-4825] 2020-07-21 16:00:09 +02:00
aignatov-bio e170917b10 Add scopes and permission checks for docx report 2020-07-21 14:11:42 +02:00
Urban Rotnik 3232b4d6bf Add test for canvas_controller 2020-07-21 13:49:59 +02:00
Urban Rotnik 7019e42736
Merge pull request #2743 from urbanrotnik/ur-sci-4816-change-font-size-email 
Fix font size in dropdown [SCI-4816]
 2020-07-20 15:50:10 +02:00
aignatov-bio 691b8ec327 Fix switch view margins 2020-07-20 15:17:24 +02:00
aignatov-bio 75930b99c3 Fix global activities filters 2020-07-20 15:01:00 +02:00
Alex Kriuchykhin eb7fe360ff
Merge pull request #2729 from urbanrotnik/ur-sci-4853 
Remove :not_shared permission level for TeamRepository entity [SCI-4853]
 2020-07-20 11:49:07 +02:00
Alex Kriuchykhin 806f6e32eb
Merge pull request #2737 from mlorb/ml-sci-4838 
Fix naming of filter field for repositories tables [SCI-4838]
 2020-07-20 11:42:02 +02:00
Urban Rotnik 748dd7912b Fix font size in dropdown 2020-07-20 11:36:25 +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 6ceb4abfb5 Add constant for results limit 2020-07-17 11:12:39 +02:00
aignatov-bio 7c4bfad09b Add pagination to results page 2020-07-16 15:47:19 +02:00
Mojca Lorber 9464d2753d Fix naming of filter field for repositories tables 2020-07-15 10:52:47 +02:00
aignatov-bio 2aeb661be9 Fix markup 2020-07-15 09:47:29 +02:00
aignatov-bio f77902f6d4 Add tinymce table support to docx 2020-07-15 09:44:25 +02:00
Mojca Lorber f7083a000a Add devise lockable to user 2020-07-14 14:49:51 +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 c73998b6bf Fix markup 2020-07-13 16:32:28 +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
Urban Rotnik 07e2df8951 Remove :not_shared permission level for TeamRepository entity 2020-07-13 12:56:26 +02:00
Alex Kriuchykhin 65f2f4a5b8
Merge pull request #2703 from okriuchykhin/ok_SCI_4776 
Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776]
 2020-07-13 10:59:10 +02:00
aignatov-bio 7d20bf6fea Add recovery screen 2020-07-13 09:51:04 +02:00
Mojca Lorber cea9e6f956 Add check for search state 2020-07-10 15:39:01 +02:00
Oleksii Kriuchykhin b4fab62d38 Merge branch 'develop' into ok_SCI_4776 2020-07-10 13:40:46 +02:00
Alex Kriuchykhin 594d8031ce
Merge pull request #2726 from mlorb/ml-sci-4855 
Remove search state load from repositories table [SCI-4855]
 2020-07-10 13:07:44 +02:00
Mojca Lorber 39ae1ed25e Fix search status 2020-07-10 12:52:07 +02:00
Alex Kriuchykhin edf8fc6428
Merge pull request #2725 from aignatov-bio/ai-sci-4820-double-events-on-inventory 
Disable inventories table initialization on turbolinks preview [SCI-4820]
 2020-07-10 12:50:15 +02:00
Oleksii Kriuchykhin c7fcc3f89b Fix issue with missing archived items on task page [SCI-4854] 2020-07-10 11:43:06 +02:00
aignatov-bio 50714eb59d Disable inventories table initialization on turbolinks preview 2020-07-10 11:05:27 +02:00
Mojca Lorber 21f0d431b0 Remove search state load from repositories table 2020-07-10 11:05:22 +02:00
Miha Mencin 12a8d50098
Merge pull request #2722 from okriuchykhin/ok_SCI_4845 
Fix missing unshared inventories with snapshots in reports [SCI-4845]
 2020-07-10 09:21:58 +02:00
aignatov-bio fef6e5f1db Add recovery strategy for 2fa 2020-07-09 17:01:00 +02:00
Urban Rotnik 7aa40a284e
Merge pull request #2724 from urbanrotnik/ur-sci-4771-improve-report-layout 
Text wrap for page numbers [SCI-4771]
 2020-07-09 16:52:41 +02:00
Urban Rotnik 1f220f70ee Text wrap for page numbers 2020-07-09 16:24:14 +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 309178344e
Merge pull request #2723 from urbanrotnik/ur-sci-4721-v2 
Fix counter in assign dropdown menu on task [SCI-4721]
 2020-07-09 15:43:34 +02:00
Urban Rotnik 4003608c7d Fix style 2020-07-09 15:43:08 +02:00
Oleksii Kriuchykhin 7efe5c32eb Fix missing unshared and unassigned inventories with snapshots in reports [SCI-4845] 2020-07-09 15:38:38 +02:00
mlorb 0f43f6a479
Merge pull request #2721 from mlorb/ml-sci-4788-v2 
Fix bug with not hidden navigation on inventory page [SCI-4788]
 2020-07-09 15:12:44 +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 d8d0f7ef8e Fix counter in assign dropdown menu on task 2020-07-09 14:50:37 +02:00
Miha Mencin 2cb3720602
Merge pull request #2720 from aignatov-bio/ai-sci-4842-snapshot-archived-label-wrong-position 
Add archived label to correct column [SCI-4842]
 2020-07-09 14:49:54 +02:00
Mojca Lorber cb8070c012 Fix pointer event 2020-07-09 14:25:54 +02:00
Mojca Lorber 1a2b321523 Fix bug with not hidden navigation on inventory page 2020-07-09 14:09:55 +02:00
aignatov-bio c240474f76 Add archived label to correct column 2020-07-09 13:39:26 +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
mlorb 73e2654d78
Merge pull request #2701 from mlorb/ml-sci-4793 
Add empty states to inventories datatable and fix filtering bug [SCI-4793]
 2020-07-09 11:49:16 +02:00