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

1747 commits

Author SHA1 Message Date
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
Urban Rotnik 26db4f3515 Add Archive and Restore service 2020-06-09 18:50:36 +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
Oleksii Kriuchykhin 48865c8cea Clear the obsolete code for assiging inventory items to the task [SCI-4571] 2020-06-03 22:54:45 +02:00
Miha Mencin d89dce9f72
Merge pull request #2632 from okriuchykhin/ok_SCI_4715 
Remove inventory links of unshared inventory [SCI-4715]
 2020-06-02 10:46:33 +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
mlorb 26bdabb0c3
Merge pull request #2609 from mlorb/ml-sci-4529 
Add rename task and rename experiment activities [SCI-4529]
 2020-06-01 12:58:36 +02:00
aignatov-bio 7b27c4a4a8
Merge pull request #2619 from aignatov-bio/ai-sci-4553-fix-whats-new-title 
Fix What’s New title [SCI-4553]
 2020-05-28 14:24:06 +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
Oleksii Kriuchykhin 0465dba2cf Fix file dowload from MS Office online [SCI-4673] 2020-05-27 16:59:28 +02:00
aignatov-bio 149600e2f5 Fix What’s New title 2020-05-27 15:27:12 +02:00
Urban Rotnik fcd3efe07e Fix constantizing for repository 2020-05-27 09:19:11 +02:00
Mojca Lorber 9b7d321666 Add rename task and rename experiment activities 2020-05-26 15:34:20 +02:00
Urban Rotnik 359517eb17 Add deleted repositories to report 2020-05-25 13:19:30 +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 3287070df7 Improve search through assigned tasks 2020-05-22 14:36:28 +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
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
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
Oleksii Kriuchykhin d77930af61 Fix failing tests for repository rows controller [SCI-4629] 2020-05-18 14:12:06 +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 2b3dda8ce0
Merge pull request #2569 from aignatov-bio/ai-sci-4613-add-title-for-assign-modal 
Add a title for full view assign modal [SCI-4613]
 2020-05-18 11:15:36 +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
Urban Rotnik a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00