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

2016 commits

Author SHA1 Message Date
Urban Rotnik 7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +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 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 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 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 68fc6ec58a Add sorting my module statuses 2020-07-27 16:36: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
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 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 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 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
Urban Rotnik 512d6f3229 Add actions for update status, clean old complete actions 2020-07-22 16:12:34 +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
Urban Rotnik 3232b4d6bf Add test for canvas_controller 2020-07-21 13:49:59 +02:00
aignatov-bio 75930b99c3 Fix global activities filters 2020-07-20 15:01:00 +02:00
aignatov-bio e69e3ea8d3 Add export for assigned items 2020-07-17 15:17:09 +02:00
aignatov-bio 7c4bfad09b Add pagination to results page 2020-07-16 15:47:19 +02:00
aignatov-bio c592954400 Add UX 2020-07-13 16:05:23 +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
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 d2415c3b1d Show assigned users modal also for view 2020-07-09 15:11:53 +02:00
Urban Rotnik d8d0f7ef8e Fix counter in assign dropdown menu on task 2020-07-09 14:50:37 +02:00
Urban Rotnik b11f166c38 Fix cucumber tests 2020-07-09 13:14:07 +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 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 de9df7f1b0 Add NotImplementedError 2020-07-08 13:28:12 +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 5d067077b1 Add logo and timestamp to PDF and Doc reports 2020-07-08 10:48:29 +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 ceddfdd978 Remove flash message for redirects from root url 2020-07-07 11:13:36 +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 b127d8c754 Improve active/archive switcher 2020-07-06 14:03:55 +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 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 1c34762af3
Merge pull request #2690 from aignatov-bio/ai-sci-4791-fix-shared-inventories-in-task-repositories-dropdown 
Fix repositories dropdown on task page [SCI-4791]
 2020-06-29 09:51:51 +02:00
Alex Kriuchykhin faa76a6442
Merge pull request #2660 from okriuchykhin/ok_SCI_4707_v2 
Improve user input filtering on user settings page and for task tags [SCI-4707]
 2020-06-29 09:30:45 +02:00
aignatov-bio 968963c24b Fix repositories dropdown on task page 2020-06-26 11:19:40 +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
Alex Kriuchykhin e1b862a332
Merge pull request #2679 from urbanrotnik/ur-sci-4741-api-endopints-update 
Filter out non active repositories and rows [SCI-4741]
 2020-06-24 12:51:13 +02:00
Alex Kriuchykhin 8a17b721db
Merge pull request #2678 from urbanrotnik/ur-sci-4878 
Update all rows on repository archive/restore [SCI-4787]
 2020-06-24 12:06:41 +02:00
Oleksii Kriuchykhin 8e0ed286fb Improve repositories loading for archive/restore [SCI-4780] 2020-06-24 12:01:38 +02:00
Urban Rotnik 2f4bf95373 Revert scrope 2020-06-24 11:42:59 +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
Urban Rotnik c565cbe579 Filter out non active repositories and rows 2020-06-23 10:23:22 +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 6f2d5b359e Add action buttons to repository index 2020-06-19 15:54:45 +02:00
Mojca Lorber 3d59bbd50e Fix default scope bugs 2020-06-18 18:08:53 +02:00
Mojca Lorber 6e8062179c Implement archiving and restoring of whole inventories 2020-06-18 18:07:23 +02:00
aignatov-bio e7659da0e7 Fix tests 2020-06-18 14:09:29 +02:00
aignatov-bio 323929b270 Add restore/delete buttons 2020-06-18 14:09:29 +02:00
Urban Rotnik 123375f494 Update scopes in reports 2020-06-18 09:33:12 +02:00
Urban Rotnik 41c1230db1 Remove position check from contorller 2020-06-17 11:55:43 +02:00
Urban Rotnik 83bd8c3ad4 Add default scope for non archived repositories 2020-06-16 09:18:22 +02:00
Oleksii Kriuchykhin 0641ad094f Improve user input filtering on user settings page and for task tags [SCI-4707] 2020-06-15 15:41:06 +02:00
Urban Rotnik 39eb8145c2 Rename params method 2020-06-11 16:11:23 +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
aignatov-bio 4a6d7d0e12 Add archived inventories 2020-06-04 19:07:10 +02:00
aignatov-bio 66a77d8de9 Add sidebar reload on view change 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
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 4d6282510d
Merge pull request #2629 from aignatov-bio/ai-sci-4599-fix-ordering-for-projects-in-sidebar 
Fixed projects ordering in sidebar on team page [SCI-4599]
 2020-06-01 11:19:29 +02:00
aignatov-bio 2269299b61 Fixed projects ordering in sidebar on team page 2020-06-01 10:55:23 +02:00
aignatov-bio aee75a2f83 Add repository list view 2020-06-01 10:24:03 +02:00
Alex Kriuchykhin c6291ef09e
Merge pull request #2623 from aignatov-bio/ai-sci-4709-filter-assigned-private-tasks 
Filter private assigned tasks [SCI-4709]
 2020-05-29 18:19:42 +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 116747f261 Filter private assigned tasks 2020-05-28 15:35:19 +02:00
aignatov-bio 34eaf4a138
Merge pull request #2618 from aignatov-bio/ai-sci-4599-order-elements-in-sidebar 
Add name order for porject/experiment/task sidebar [SCI-4599]
 2020-05-28 14:23:53 +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 aaff5eb67f Add name order for porject/experiment/task sidebar 2020-05-27 13:31:00 +02:00
aignatov-bio 15f58be1c2 Fix snapshot date creation 2020-05-26 15:59:49 +02:00
Mojca Lorber 9b7d321666 Add rename task and rename experiment activities 2020-05-26 15:34:20 +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
Alex Kriuchykhin 6ada4dc723
Merge pull request #2604 from okriuchykhin/ok_SCI_4669 
Fix viewing of office files in repository snapshots [SCI-4669]
 2020-05-25 13:55:31 +02:00
Oleksii Kriuchykhin 3cabe2250b Fix viewing of office files in repository snapshots [SCI-4669] 2020-05-25 12:30:08 +02:00
Mojca Lorber 76a1f73989 Change order of snapshots versions 2020-05-25 12:15:24 +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
Alex Kriuchykhin b5e0e4649c
Merge pull request #2597 from urbanrotnik/4663-fix-button-visibility 
Fix for snapshot creation [SCI-4672]
 2020-05-22 16:38:29 +02:00
Urban Rotnik a407bf857f Fix for show and create 2020-05-22 16:19:21 +02:00
aignatov-bio 3287070df7 Improve search through assigned tasks 2020-05-22 14:36:28 +02:00
Mojca Lorber 92861fdd32 Expand assigned inventory after updating assigned items on task 2020-05-21 22:36:09 +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
Miha Mencin 7de12990a9 SCI-4628 moving snapshot provisioning logic into repository model, making snapshot unique selection validation conditional 2020-05-21 00:36:24 +02:00
aignatov-bio d16930e987 Add private tasks to assigned task list 2020-05-20 17:23:48 +02:00
aignatov-bio f8b246eb2a Fix repositories order in dropdown 2020-05-19 16:18:01 +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 8b968f6f67 Fix selection of the default snapshot on tasks [SCI-4637] 2020-05-18 11:06:42 +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
aignatov-bio ce1540aaa9 Small task inventories corrections 2020-05-14 16:41:02 +02:00
Oleksii Kriuchykhin ba1661b40f Fix handling of deleted repositories for snapshots [SCI-4596] 2020-05-13 18:00:56 +02:00
Oleksii Kriuchykhin c74fa3c244 Make snapshots selectable [SCI-4596] 2020-05-13 17:58:05 +02:00
Alex Kriuchykhin 76d1196724
Merge pull request #2544 from okriuchykhin/ok_SCI_4597 
Refactor Repository permissions and implement deduplication for files in snapshots [SCI-4597]
 2020-05-13 16:42:47 +02:00
aignatov-bio 8e20dccc66
Merge pull request #2510 from aignatov-bio/ai-sci-4509-add-recent-protocols-tab 
Add recent protocol tab to load protocal from repository [SCI-4509]
 2020-05-08 13:17:26 +02:00
aignatov-bio 6997586357
Merge pull request #2541 from aignatov-bio/ai-sci-4591-merge-assign-unassign-service 
Merge assign and unassign service [SCI-4591]
 2020-05-08 13:15:06 +02:00
aignatov-bio d2a479c2e8
Merge pull request #2526 from aignatov-bio/ai-sci-4559-add-assigned-tasks-dropdown-to-inventory 
Add assigned task dropdown to repository and task page [SCI-4559][SCI-4565]
 2020-05-08 12:39:28 +02:00
aignatov-bio d3faec1070 Rename service 2020-05-08 12:28:37 +02:00
aignatov-bio 2728df5bac Move helper method to my_module_helper 2020-05-08 11:56:29 +02:00
aignatov-bio c9545ddb19 Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab 2020-05-08 10:28:33 +02:00
aignatov-bio 29903f570d Merge assign and unassign service 2020-05-07 13:51:07 +02:00
aignatov-bio 8ec7a4b7b4 Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory 2020-05-07 13:03:00 +02:00
aignatov-bio 8076d8f464 Create helper for partial 2020-05-07 12:51:18 +02:00
Urban Rotnik a38b850601
Merge pull request #2520 from urbanrotnik/ur-sci-4522-activity-links 
Activities links [SCI-4522] &  [SCI-4514]
 2020-05-06 22:11:58 +02:00
Oleksii Kriuchykhin 25f9c5bc7d Refactor Repository permissions and implement deduplication for files in snapshots [SCI-4597] 2020-05-06 15:17:54 +02:00
Urban Rotnik 8ff7c33431 Fix start date activity message 2020-05-06 12:34:45 +02:00
aignatov-bio 938f00484b Fix markup 2020-04-29 15:17:15 +02:00
aignatov-bio 19d30e2019 Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task 2020-04-29 15:13:38 +02:00
Alex Kriuchykhin 0e865f8e45
Merge pull request #2525 from okriuchykhin/ok_SCI_4552 
Implement background processing of repository snapshots [SCI-4552]
 2020-04-29 12:03:23 +02:00
aignatov-bio 61bbca6bcf Fix path names and markup 2020-04-28 19:12:17 +02:00
Urban Rotnik 5c72200801 Remove tooltips settings for user 2020-04-28 12:44:47 +02:00
aignatov-bio b9c5089c2b Add search to assigned tasks dropdown 2020-04-28 12:41:59 +02:00
Oleksii Kriuchykhin e6ad5047e0 Implement background processing of repository snapshots [SCI-4552] 2020-04-28 12:09:36 +02:00
aignatov-bio 0604815c00 Add assigned task dropdown to repository 2020-04-24 15:43:10 +02:00
aignatov-bio f65b50c6ff Fix rebase conflicts 2020-04-23 16:36:22 +02:00
Urban Rotnik de4e4ca967 Add before_action for team switch 2020-04-23 16:20:01 +02:00