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

1782 commits

Author SHA1 Message Date
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
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
Mojca Lorber faf2d4c533 Fix export icon 2020-08-14 17:02:03 +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 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 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 3a9d97e85e
Merge pull request #2756 from aignatov-bio/ai-sci-4891-add-2fa-after-forgot-password 
Redirect to sign in after recover password [SCI-4891]
 2020-07-28 09:57:09 +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
Urban Rotnik 025378cd0e Fix translations and JS 2020-07-23 15:53:46 +02:00
aignatov-bio d044f7616b Redirect to sign in after recover password 2020-07-23 15:48:51 +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 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 9bcf1a5df5 Add blacklist for dashboard activities 2020-07-23 14:22:58 +02:00
Urban Rotnik aecd6b228b
Merge pull request #2744 from urbanrotnik/ur-sci-4764-increase-characters-limit-for-rte 
Increase chars limit for RTE [SCI-4764]
 2020-07-23 12:58:36 +02:00
aignatov-bio 04a6a2a250 Small fixes 2020-07-23 11:35:22 +02:00
Urban Rotnik 512d6f3229 Add actions for update status, clean old complete actions 2020-07-22 16:12:34 +02:00
aignatov-bio 1d3055011f Merge branch 'features/tinymce-tables' into develop 2020-07-22 13:41:43 +02:00
aignatov-bio ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +02:00
Urban Rotnik 9dffc27428 Increase chars limit for RTE 2020-07-20 13:33:38 +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
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
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
Mojca Lorber f7083a000a Add devise lockable to user 2020-07-14 14:49:51 +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 7d20bf6fea Add recovery screen 2020-07-13 09:51:04 +02:00
Oleksii Kriuchykhin b4fab62d38 Merge branch 'develop' into ok_SCI_4776 2020-07-10 13:40:46 +02:00
aignatov-bio fef6e5f1db Add recovery strategy for 2fa 2020-07-09 17:01:00 +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
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
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 88c092dc98 Add i18n and constants 2020-07-07 15:59:02 +02:00
aignatov-bio 13f7653667 Merge branch 'develop' into features/2fa 2020-07-07 13:05:45 +02:00
aignatov-bio 6edabf33ba Fic i18n 2020-07-06 12:51:48 +02:00
aignatov-bio 6352a4ba9b Update inventory modals 2020-07-06 12:47:42 +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
Mojca Lorber db8c7cd97c Add empty states to inventories datatable and fix filtering bug 2020-07-02 15:51:07 +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 6fa97d3639 Add enable 2fa button to user settings 2020-06-29 10:56:06 +02:00
aignatov-bio 6a41290d9d Add tables to TinyMce and small table improvments 2020-06-24 15:51:59 +02:00
Oleksii Kriuchykhin 7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Urban Rotnik 193375818e Disable checkboxes for shared inventories 2020-06-24 13:41:00 +02:00
Oleksii Kriuchykhin 29f62419bd Improve repository archive/restore actions [SCI-4780] 2020-06-24 11:32:20 +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
Mojca Lorber 8d9d3778e1 Fix activities filters 2020-06-19 10:46:58 +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 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
Urban Rotnik 39eb8145c2 Rename params method 2020-06-11 16:11:23 +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
Urban Rotnik fabfd7ddaf Add controller action for Archive&Restore 2020-06-09 19:18:30 +02:00