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
8275 commits 70 branches 179 tags 165 MiB
Commit graph

6442 commits

Author SHA1 Message Date
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
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
Mojca Lorber 19c5b7e5a2 Remove redundant css class 2020-07-09 11:44:36 +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
Alex Kriuchykhin 3534d0c60f
Merge pull request #2712 from okriuchykhin/ok_SCI_4840 
Fix assigned counter on inventory items assigning modal [SCI-4840]
 2020-07-08 13:53:57 +02:00
aignatov-bio 135ac487d0 Small archived repositories fixes 2020-07-08 13:42:27 +02:00
Mojca Lorber de9df7f1b0 Add NotImplementedError 2020-07-08 13:28:12 +02:00
Mojca Lorber 00b668a4ba Change title size to h1 2020-07-08 13:02:47 +02:00
Urban Rotnik d6f37ce28e
Merge pull request #2710 from urbanrotnik/ur-sci-4568-remove-flash-message 
Remove flash message for redirects from root url [SCI-4568]
 2020-07-08 11:42:05 +02:00
Urban Rotnik 33aa1d3641
Merge pull request #2709 from urbanrotnik/ur-sci-4804 
Fix Repository rows count & table header adjustmen [SCI-4804]
 2020-07-08 11:39:44 +02:00
Urban Rotnik 2e1d1cc210 Clean styles 2020-07-08 11:35:25 +02:00
Urban Rotnik 5d067077b1 Add logo and timestamp to PDF and Doc reports 2020-07-08 10:48:29 +02:00
aignatov-bio b85985afc3
Merge pull request #2707 from aignatov-bio/ai-sci-4839-fix-smart-annotation-name-on-archived-items 
Fix smart annotation for archived items [SCI-4839]
 2020-07-08 09:30:54 +02:00
aignatov-bio 8c91181abc
Merge pull request #2702 from aignatov-bio/ai-sci-4800-keep-table-page-after-item-update 
Keep table page after repository item update [SCI-4800]
 2020-07-08 09:30:26 +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 65c28d641f
Merge pull request #2698 from aignatov-bio/ai-sci-4807-disable-column-reordering-repositories-list 
Disable column reordering in repositories list [SCI-4807]
 2020-07-08 09:29:51 +02:00
aignatov-bio 716319354b
Merge pull request #2706 from aignatov-bio/ai-sci-4820-fix-sidebar-inventory-refresh 
Improve active/archive switcher [SCI-4820]
 2020-07-08 09:29:16 +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
Oleksii Kriuchykhin 482765e942 Fix assigned counter on inventory items assigning modal [SCI-4840] 2020-07-07 14:40:19 +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
Urban Rotnik b347fcf5c9
Merge pull request #2699 from urbanrotnik/ur-sci-4809-hide-buttons-when-no-permissions 
Hide checkbox column when user is not an admin [SCI-4809]
 2020-07-07 11:29:54 +02:00
Urban Rotnik ceddfdd978 Remove flash message for redirects from root url 2020-07-07 11:13:36 +02:00
Urban Rotnik d16a2ed9c9 Fix Datatable header adjustments on repositories index 2020-07-07 09:49:05 +02:00
Urban Rotnik 79ef4ece28 Fix repository rows count 2020-07-07 09:48:18 +02:00
Oleksii Kriuchykhin aa38d92982 Improve completed_on generation for steps/my_modules [SCI-4776] 2020-07-07 09:34:51 +02:00
aignatov-bio 784788e9f3 Fix smart annotation for archived items 2020-07-06 14:22:45 +02:00
aignatov-bio b127d8c754 Improve active/archive switcher 2020-07-06 14:03:55 +02:00
aignatov-bio 6352a4ba9b Update inventory modals 2020-07-06 12:47:42 +02:00
Oleksii Kriuchykhin 3af20c96c7 Fix tests and checklist item validation [SCI-4776] 2020-07-03 16:48:32 +02:00
Oleksii Kriuchykhin dc481cf236 Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776] 2020-07-03 16:48:29 +02:00
aignatov-bio cc1b75644d Keep table page after repository item update 2020-07-03 13:45:02 +02:00
Mojca Lorber db8c7cd97c Add empty states to inventories datatable and fix filtering bug 2020-07-02 15:51:07 +02:00
Miha Mencin 6726a19cbe
Merge pull request #2695 from okriuchykhin/ok_SCI_4738 
Add repository snapshots to export all [SCI-4738]
 2020-07-02 15:18:47 +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 9340148b41 Disable column reordering in repositories list 2020-07-02 11:50:40 +02:00
aignatov-bio 9b33cbc104 Rename ensure 2fa method 2020-07-02 11:24:33 +02:00
aignatov-bio 46256c89c9 Fix tests 2020-07-01 15:44:52 +02:00
aignatov-bio 742fb0d27b Small 2fa improvments 2020-07-01 14:41:55 +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
Mojca Lorber cf9c3be4cf Move before actions in RepositoryColumnsController 2020-06-30 13:44:49 +02:00
aignatov-bio 1a5f32bd94
Merge pull request #2692 from aignatov-bio/ai-sci-4754-enable-2fa-button-in-settings 
Add enable 2fa button to user settings [SCI-4754]
 2020-06-29 15:11:45 +02:00
aignatov-bio 630bef1adf Add special characters to smart annotation 2020-06-29 14:47:35 +02:00
Oleksii Kriuchykhin 166a0ddd34 Improve code styling [SCI-4738] 2020-06-29 11:43:23 +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
Urban Rotnik de8aca9dbd Rename column 2020-06-29 10:42:19 +02:00