scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-26 01:46:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
10387 commits 69 branches 179 tags 166 MiB
Commit graph

1619 commits

Author SHA1 Message Date
aignatov-bio 483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews 
Features/office file previews merge branch
 2020-11-19 11:11:39 +01:00
aignatov-bio fcdad51222 Fix assets sorting in report 2020-11-17 15:33:25 +01:00
Oleksii Kriuchykhin 6dfeae2283 Make folders selectable for 'Export all' functionality [SCI-5183] 2020-11-13 14:39:10 +01:00
Miha Mencin 6e2972dc9b
Merge pull request #2943 from okriuchykhin/ok_SCI_5190 
Add check for zero page size in repository states [SCI-5190]
 2020-11-11 10:23:06 +01:00
Oleksii Kriuchykhin 038cd8d5d7 Fix repository state columns handling [SCI-5190] 2020-11-10 17:24:04 +01:00
Urban Rotnik 8ac59fd699 Fix acessiable_by_team scope 2020-11-06 10:43:18 +01:00
Mojca Lorber 8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
aignatov-bio 12991e8fd3 Commit add asset preview mode switcher to step 2020-10-29 16:42:05 +01:00
Oleksii Kriuchykhin e87407bbd3 Create database structure for project folders [SCI-5126] 2020-10-29 15:44:21 +01:00
Urban Rotnik e923128c0e
Merge pull request #2927 from biosistemika/features/signature-requests 
Features/signature requests into develop
 2020-10-29 14:48:25 +01:00
Oleksii Kriuchykhin 13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +01:00
Miha Mencin 235f87e0d9
Merge pull request #2924 from biosistemika/release/1.20.2 
Release/1.20.2
 2020-10-28 13:58:25 +01:00
aignatov-bio f4bf2ab75f Remove empty children from extents 2020-10-22 14:29:35 +02:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Mojca Lorber 2639810e1a Fix no step bug 2020-10-22 13:21:05 +02:00
Miha Mencin c31a7373fb
Merge pull request #2902 from mlorb/ml-sci-5089 
Add 'Open in APP' button to the task
 2020-10-19 12:28:35 +02:00
Mojca Lorber 23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +02:00
aignatov-bio bdcc7939ad Update export all generator 2020-10-16 18:25:01 +02:00
aignatov-bio 3fe3c2087f Fix hound issues 2020-10-16 11:27:23 +02:00
aignatov-bio 566ef7aef7 Add list view to atachments 2020-10-16 11:00:57 +02:00
aignatov-bio 016fc8a632 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews 2020-10-15 15:25:54 +02:00
Urban Rotnik d88040fd1b Move snapshot default selection to core from addon 2020-10-15 15:21:44 +02:00
aignatov-bio 0a4b89cf39 Merge branch 'develop' into features/office-file-previews 2020-10-15 15:19:56 +02:00
aignatov-bio f1a5811d5f
Merge pull request #2809 from biosistemika/ai-sci-4960-render-wopi-preview-only-in-view-port 
Render wopi preview only in view port
 2020-10-14 21:29:56 +02:00
aignatov-bio e240b629c4 Fix rubocop issues 2020-10-14 12:12:32 +02:00
aignatov-bio 36bab10de7 Update export all to tree structure 2020-10-14 12:08:04 +02:00
aignatov-bio a7da7b0de3 Refactor export all my module generator 2020-10-12 15:55:06 +02:00
Oleksii Kriuchykhin caa2098550 Improve handling of empty cells in inventory imports [SCI-5094] 2020-10-12 14:42:47 +02:00
Oleksii Kriuchykhin 7cd12bfb07 Fix protocol repository save/load timestamps [SCI-5067] 2020-10-06 15:30:04 +02:00
Urban Rotnik e9ac999645
Merge pull request #2880 from urbanrotnik/ur-sci-5067-protocols-sync 
Fix updating updated_at on protocol while load/sync with repository [SCI-5067]
 2020-09-29 16:54:42 +02:00
Urban Rotnik 7c312a844f Fix updating updated_at on protocol while load/sync with repository 2020-09-29 15:37:40 +02:00
Oleksii Kriuchykhin 1603ec6d1a Switch to a new version of Yomu gem 2020-09-29 13:11:50 +02:00
aignatov-bio 9d64121577 Refactor WOPI discovery 2020-09-29 12:58:05 +02:00
aignatov-bio 1ed65eddfa Move ordering to front-end 2020-09-25 15:06:09 +02:00
Urban Rotnik 3de2aee921
Merge pull request #2864 from urbanrotnik/ur-sci-4993 
Assign user to cloned experiment [SCI-4993]
 2020-09-23 13:37:07 +02:00
aignatov-bio 0865802255
Merge pull request #2853 from aignatov-bio/ai-sci-5024-disable-autostrip-on-status-change 
Disable autostrip attrbiutes on status change [SCI-5024]
 2020-09-23 13:18:07 +02:00
Urban Rotnik 5be7a1b32d Assign user to cloned experiment 2020-09-23 11:31:18 +02:00
mlorb feda5622d8
Merge pull request #2860 from mlorb/ml-sci-5007 
Add info of the locked task to the View status flow modal [SCI-5007]
 2020-09-23 10:19:48 +02:00
Mojca Lorber affae15ccf Simplification 2020-09-22 17:19:15 +02:00
aignatov-bio bbfd4b1c02 Run autostrip when related field changed 2020-09-22 12:48:52 +02:00
aignatov-bio f8a28f378e Add shared inventories to smart annotation 2020-09-21 14:36:34 +02:00
Oleksii Kriuchykhin e456661a98 Fix task archiving and moving [SCI-5030] 2020-09-17 17:15:41 +02:00
aignatov-bio ec9446d0cb Disable autostrip attrbiutes on status change 2020-09-17 15:26:48 +02:00
aignatov-bio e5d3fac112 Merge branch 'features/smart-annotation-improvements' into develop 2020-09-17 14:52:51 +02:00
aignatov-bio 6ed8757eb1 Merge branch 'features/task-flows' into develop 2020-09-17 14:52:05 +02:00
Urban Rotnik 462fb12a41 Update SQL query 2020-09-17 13:30:27 +02:00
Urban Rotnik 777afd0e9b Add improved search for smart annotations 2020-09-17 13:19:52 +02:00
Oleksii Kriuchykhin ff1476d46a Fix status consequences execution order [SCI-5004] 2020-09-16 13:45:58 +02:00
Oleksii Kriuchykhin 73cf620960 Add Completion and Uncompletion consequences [SCI-5004] 2020-09-14 20:06:48 +02:00
Oleksii Kriuchykhin a7c6ab9d89 Move some consequence executon into background process [SCI-4978] 2020-09-11 16:18:39 +02:00
aignatov-bio 5a063f070d Clone module before condition validation 2020-09-10 16:53:07 +02:00
aignatov-bio 18426b90be Disable button when condition not fullfield 2020-09-10 13:40:52 +02:00
aignatov-bio 946b961b1a
Merge pull request #2819 from aignatov-bio/ai-sci-4975-add-permission-checks-for-statuses 
Add front-end checks for statuses [SCI-4975]
 2020-09-09 13:21:04 +02:00
aignatov-bio 5d9d7d6a12
Merge pull request #2829 from aignatov-bio/ai-sci-4983-add-descriptions-for-conditions 
Add description for conditions [SCI-4983]
 2020-09-09 11:33:48 +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
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
aignatov-bio 492d25f9b3 Add description for conditions 2020-09-07 15:12:09 +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
aignatov-bio 8b1e11a314 Add conditions_fulfilled? method 2020-09-03 14:20:38 +02:00
Oleksii Kriuchykhin a508b07275 Add view mode field to the Asset model [SCI-4958] 2020-09-02 15:02:56 +02:00
aignatov-bio e1229f5606 Fix test and status validations 2020-09-01 14:49:58 +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 a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +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
Urban Rotnik 4eebfa5461 Controller action for card inline preview 2020-08-28 11:05:52 +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
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 e6e47f5106 Fix failing tests [SCI-4829] 2020-08-21 11:58:12 +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
aignatov-bio fdb2e46700 Add consequence for repository snapshotting 2020-08-13 12:51:33 +02:00
aignatov-bio 56ff4e7702 Add new statuses to dashboard 2020-08-10 09:10:56 +02:00
Oleksii Kriuchykhin 02a4da1a55 Add task status to export all [SCI-4829] 2020-08-06 10:50:11 +02:00
Urban Rotnik 7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
aignatov-bio 68fc6ec58a Add sorting my module statuses 2020-07-27 16:36:21 +02:00
Oleksii Kriuchykhin 1a8333612a Merge branch 'features/pwa' into develop 2020-07-27 09:47:41 +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 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
aignatov-bio ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +02:00
Oleksii Kriuchykhin fa62b33a42 Add status implications checks to the permissions [SCI-4825] 2020-07-21 16:00:09 +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
Oleksii Kriuchykhin 7fd004baa8 Prepare database structure and relations for statuses phase one [SCI-4825] 2020-07-17 18:04:09 +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
Urban Rotnik 07e2df8951 Remove :not_shared permission level for TeamRepository entity 2020-07-13 12:56:26 +02:00
Oleksii Kriuchykhin b4fab62d38 Merge branch 'develop' into ok_SCI_4776 2020-07-10 13:40:46 +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
Oleksii Kriuchykhin 7efe5c32eb Fix missing unshared and unassigned inventories with snapshots in reports [SCI-4845] 2020-07-09 15:38:38 +02:00
aignatov-bio 6245e19069
Merge pull request #2718 from biosistemika/master 
Merge master to develop
 2020-07-09 12:56:31 +02:00
aignatov-bio 13f7653667 Merge branch 'develop' into features/2fa 2020-07-07 13:05:45 +02:00
Oleksii Kriuchykhin aa38d92982 Improve completed_on generation for steps/my_modules [SCI-4776] 2020-07-07 09:34:51 +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
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 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
Oleksii Kriuchykhin 166a0ddd34 Improve code styling [SCI-4738] 2020-06-29 11:43:23 +02:00
Urban Rotnik de8aca9dbd Rename column 2020-06-29 10:42:19 +02:00
Miha Mencin bfdf53c514
Merge pull request #2673 from urbanrotnik/ur-sci-4749 
Fix valdiation for snapshot selection [SCI-4749]
 2020-06-29 09:42:37 +02:00
Urban Rotnik 88f54b16d7 Add 2fa fields to user 2020-06-24 17:58:58 +02:00
Oleksii Kriuchykhin 7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Urban Rotnik 2f4bf95373 Revert scrope 2020-06-24 11:42:59 +02:00
Urban Rotnik 91af7135c1 Update scopes for repository items 2020-06-23 18:24:46 +02:00
Urban Rotnik 6de322498b Delegate archived methods to parent repository 2020-06-23 17:16:02 +02:00
Urban Rotnik e89bf58e1c Refactory restore inventory service 2020-06-23 08:24:52 +02:00
Mojca Lorber 22a45237be Remove doubled code 2020-06-22 15:41:24 +02:00
Mojca Lorber be19190ff1 Revert default_scope for active repositories 2020-06-22 14:57:35 +02:00
Urban Rotnik 07ca1de737 Fix valdiation for snapshot selection 2020-06-22 07:30:49 +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
Urban Rotnik b498aa54d3
Merge pull request #2661 from urbanrotnik/ur-sci-4740-default-scope 
Update default scope [SCI-4740] [SCI-4687][SCI-4746]
 2020-06-18 14:07:10 +02:00
Urban Rotnik a05be67d3a
Merge pull request #2652 from urbanrotnik/ur-sci-4703-archived-tag 
Add archived tags to assigned repository rows [SCI-4703]
 2020-06-18 13:47:57 +02:00
Urban Rotnik 123375f494 Update scopes in reports 2020-06-18 09:33:12 +02:00
Urban Rotnik d5b82f857e Add tag for DOCX 2020-06-18 08:52:59 +02:00
Oleksii Kriuchykhin 86b2eea383 Add repository snapshots to export all [SCI-4738] 2020-06-17 23:21:56 +02:00
Urban Rotnik 83bd8c3ad4 Add default scope for non archived repositories 2020-06-16 09:18:22 +02:00
Urban Rotnik 868c1c1fa0 Improve row state passing 2020-06-15 13:42:16 +02:00
Urban Rotnik 15342cd8f2 Fix update_canvas 2020-06-15 10:52:35 +02:00
Urban Rotnik 9bac0fb867 Add archived tags to assigned repository rows 2020-06-10 14:48:03 +02:00
Urban Rotnik 26db4f3515 Add Archive and Restore service 2020-06-09 18:50:36 +02:00
Urban Rotnik ebbce8d09e Add restore columns to migrations 2020-06-09 18:43:22 +02:00
mlorb 75f2a49cc4
Merge branch 'features/inventory-archiving' into ml-sci-4689 2020-06-08 16:30:24 +02:00
Mojca Lorber a9a278409c Fix test 2020-06-08 16:22:37 +02:00
Urban Rotnik 9b114a50c3
Merge pull request #2642 from urbanrotnik/ur-sci-4721-counter-fix 
Fix assigned items counter [SCI-4721]
 2020-06-08 09:10:44 +02:00
Urban Rotnik 17620e3e86
Merge pull request #2631 from urbanrotnik/ur-sci-4534-not-visible-checklist 
Export and import checklist items with delimiter [SCI-4534]
 2020-06-08 09:10:26 +02:00
Mojca Lorber 42d6d727b9 Add archive to repository rows 2020-06-04 23:29:37 +02:00
aignatov-bio 4a6d7d0e12 Add archived inventories 2020-06-04 19:07:10 +02:00
Mojca Lorber d3806e53a5 Add archive to repository 2020-06-04 15:44:47 +02:00
Urban Rotnik c2ecc1749e Fix assigned items counter 2020-06-04 15:36:31 +02:00
Oleksii Kriuchykhin f1f26587c0 Fix appearence of snapshots from another my_module in report [SCI-4728] 2020-06-04 09:42:22 +02:00
Urban Rotnik 69d086ba32 Scope snapshots to project 2020-06-03 22:58:22 +02:00
aignatov-bio f986a0ed56 Fix owner team for snapshots 2020-06-02 11:40:30 +02:00
Oleksii Kriuchykhin 6afebdc5da Remove inventory links of unshared inventory [SCI-4715] 2020-06-01 17:50:31 +02:00
Urban Rotnik 446a2db186 Export and import checklist items with delimiter 2020-06-01 17:19:33 +02:00
Alex Kriuchykhin b688b0c335
Merge pull request #2616 from okriuchykhin/ok_SCI_4698_v2 
Fix handling of deleted repositories in reports [SCI-4698]
 2020-05-29 16:51:17 +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 aaff5eb67f Add name order for porject/experiment/task sidebar 2020-05-27 13:31:00 +02:00
Oleksii Kriuchykhin b430d507cf Fix handling of deleted repositories in reports [SCI-4698] 2020-05-27 12:15:19 +02:00
Alex Kriuchykhin 8ed8f148a3 Revert "Fix handling of deleted repositories in reports [SCI-4698]" 2020-05-27 10:39:44 +02:00
Oleksii Kriuchykhin 6424bd23da Fix handling of deleted repositories in reports [SCI-4698] 2020-05-27 08:21:55 +02:00
Urban Rotnik b264b86cba Prepand callback 2020-05-25 14:00:41 +02:00
Urban Rotnik d9690115f8 Move refresh reference from controller to model 2020-05-25 13:19:34 +02:00
Urban Rotnik df8fe20d03 Keep reportElements up to date with active snapshots and repositories 2020-05-25 13:19:33 +02:00
Urban Rotnik 359517eb17 Add deleted repositories to report 2020-05-25 13:19:30 +02:00
Urban Rotnik 2b493ce6f6 Refactor assigned rows 2020-05-25 13:19:29 +02:00
Urban Rotnik 9536939b3b Show snapshot rows in report 2020-05-25 13:19:28 +02:00
Oleksii Kriuchykhin c98b042585 Improve handling of unassigned inventories with existing snapshots [SCI-4661] 2020-05-22 17:36:04 +02:00
Oleksii Kriuchykhin 388f52a064 Make a snapshot name synced with the inventory name if changed [SCI-4656] 2020-05-21 11:51:37 +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
Urban Rotnik a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
Urban Rotnik ba68eef044 Fix for empty status cell 2020-05-14 17:59:25 +02:00
Miha Mencin 15508a5065 codestyle fix 2020-05-14 12:57:16 +02:00
Miha Mencin 76232f0298 SCI-4601 fix the associations, minor styling changes 2020-05-14 11:47:19 +02:00
Oleksii Kriuchykhin 9c70fa1990 Fix code style [SCI-4596] 2020-05-13 18:00:58 +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 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 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
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 1fe1b782f1 Fix for user filter in task activity page 2020-04-30 09:20:29 +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
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 10fdd0c1c7 Merge branch 'develop' into features/new-task-layout 2020-04-23 14:07:40 +02:00
Oleksii Kriuchykhin 943285d4a0 Fix Azure AD user creation on sign in [SCI-4544] 2020-04-22 16:47:06 +02:00
Oleksii Kriuchykhin f811d11c59 Add versions sidebar to assigned repository rows full view modal [SCI-4525] 2020-04-21 14:49:36 +02:00
Oleksii Kriuchykhin b85c192b68 Remove duplicate method from repository [SCI-4516] 2020-04-15 14:48:26 +02:00
Oleksii Kriuchykhin 1ca3c875a6 Add option for storing Azure app configs in settings using JSON format [SCI-4544] 2020-04-14 15:56:41 +02:00
aignatov-bio fe718349da Add recent protocol tab to load protocal from repository 2020-04-09 17:29:39 +02:00
Oleksii Kriuchykhin 837437309e Fix failing tests [SCI-4516] 2020-04-09 17:11:58 +02:00
Oleksii Kriuchykhin 3a67c99982 Switch to STI for repositories, fix cell values snapshotting [SCI-4516] 2020-04-09 12:33:04 +02:00
Oleksii Kriuchykhin a9c3102835 Add repository snapshots with service, refactor item assigning [SCI-4516] 2020-04-07 18:26:39 +02:00
aignatov-bio 9a64ebdfd0 Update sql and add accordion effect 2020-04-03 13:15:56 +02:00
aignatov-bio dd3f2cb219 Update my_module assigned repository method 2020-04-03 12:33:42 +02:00
aignatov-bio 9678372dd5 Add assigned repositories list 2020-04-02 12:05:07 +02:00
aignatov-bio 4c33abff05 Assign user after task created 2020-03-30 15:16:14 +02:00
aignatov-bio 6bdd45e7b7 Fix timezone when import datetime 2020-03-24 17:45:09 +01:00
Miha Mencin fd8462b008 codstyle 2020-03-18 10:35:31 +01:00
Miha Mencin ecd49cb1e7 fix format and export_format mess 2020-03-18 09:57:57 +01:00
Miha Mencin 24b979aa6f fix CR comments 2020-03-18 09:53:47 +01:00
Miha Mencin c89503f691 SCI-4464 fix the import of the dates, some tests 2020-03-17 21:20:50 +01:00
Oleksii Kriuchykhin 675b578272 Add used space calculation method to the team model [SCI-4459] 2020-03-17 16:56:55 +01:00
Oleksii Kriuchykhin a518bfe023 Enable time fraction for task due date [SCI-4408] 2020-03-16 17:55:35 +01:00
aignatov-bio d924faaafd
Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout 
Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]
 2020-03-12 11:26:23 +01:00
aignatov-bio a32a3db8e5 Split joins scope 2020-03-11 14:30:41 +01:00
aignatov-bio bfaf5a1786 Fix markup 2020-03-11 11:39:17 +01:00
aignatov-bio c13721f842 Fix recent work service and move templates to html 2020-03-11 11:34:59 +01:00
Miha Mencin 26b687f2e6
Merge pull request #2460 from biosistemika/features/dashboard 
Features/dashboard
 2020-03-10 18:06:23 +01:00
Alex Kriuchykhin 4bea0781da
Merge pull request #2418 from okriuchykhin/ok_SCI_4276 
Add API endpoints for new column types [SCI-4276]
 2020-03-09 12:58:54 +01:00
Miha Mencin 62b934f012 Merge branch 'develop' into features/dashboard 2020-03-09 09:56:32 +01:00
Alex Kriuchykhin de0d389b96
Merge pull request #2454 from okriuchykhin/ok_SCI_4434 
Refactor inventory limit checks [SCI-4434]
 2020-03-06 15:33:01 +01:00
Oleksii Kriuchykhin 02817a5a1e Refactor inventory limit checks [SCI-4434] 2020-03-05 15:26:25 +01:00
aignatov-bio 4af992ef35 Fix date import for repository 2020-03-05 14:34:31 +01:00
aignatov-bio eb4a783337 Fix task visibility for current task widget 2020-03-03 13:13:46 +01:00
Oleksii Kriuchykhin 78ceb41a9e Improve loading of tasks statistics for dashboard [SCI-4356] 2020-02-28 16:17:32 +01:00
Miha Mencin 1fd876bb40
Merge pull request #2425 from mlorb/ml-sci-4348 
Dashboard current tasks visual layout and backend [SCI-4348] [SCI-4355]
 2020-02-28 12:11:31 +01:00
Mojca Lorber 3c09923d96 Refactoring current tasks backend 2020-02-28 11:51:08 +01:00
Mojca Lorber 415721112a Optimize completed_steps_percentage 2020-02-27 17:12:31 +01:00
Mojca Lorber 9bd2e8bec4 Dashboard current tasks visual layout and backend 2020-02-21 10:41:42 +01:00
aignatov-bio cf4dbd5ff4 Add calendar widget 2020-02-20 17:02:38 +01:00
Oleksii Kriuchykhin 9d0d75acc5 Add API endpoints for new column types [SCI-4276] 2020-02-18 15:13:46 +01:00
Oleksii Kriuchykhin 0fec8f4d95 Improve speed of inventory import [SCI-4336] 2020-02-11 13:51:34 +01:00
Alex Kriuchykhin 9c763f2111 Merge pull request #2383 from okriuchykhin/ok_SCI_4220 
Extend inventory import to support new data types [SCI-4220]
 2020-02-10 11:04:34 +01:00
Oleksii Kriuchykhin f97577ec12 Remove byebug entry [SCI-4220] 2020-02-10 10:40:38 +01:00
Oleksii Kriuchykhin 7d107bf45b Fix tests [SCI-4317] 2020-02-05 11:58:27 +01:00
Oleksii Kriuchykhin 8c5637a19c Add explicit ordering of items for repository columns [SCI-4317] 2020-02-05 11:11:06 +01:00
Oleksii Kriuchykhin 632b54cb98 Merge branch 'develop' into ok_SCI_4220 2020-02-03 15:50:06 +01:00
Oleksii Kriuchykhin d9cf2b57fd Fix failing tests [SCI-4220] 2020-02-03 15:48:49 +01:00
Oleksii Kriuchykhin b0c785f4fb Extend inventory import to support new data types [SCI-4220] 2020-02-03 15:20:01 +01:00
Urban Rotnik 3db48c44f7 Add ordered scope 2020-01-30 13:47:14 +01:00
Urban Rotnik 2007524365
Merge pull request #2352 from urbanrotnik/ur-sci-4272-multiple-checklist-items-fix 
Fix for items with newline [SCI-4272]
 2020-01-30 13:05:41 +01:00
Urban Rotnik 13c9dd8cf6 Safe navigation for serializer value of RepositoryListItem 2020-01-28 13:38:37 +01:00
Urban Rotnik 503c05805d Move editable? method from helper to model 2020-01-25 09:43:05 +01:00
Urban Rotnik 8d7f51edde Fix for items with newline 2020-01-22 13:15:29 +01:00
Alex Kriuchykhin e3e36d40a7
Merge pull request #2322 from okriuchykhin/ok_SCI_4251 
Fix global search for repositories and checklists update [SCI-4251]
 2020-01-16 16:37:12 +01:00
Urban Rotnik 7655dd0bea
Merge pull request #2321 from urbanrotnik/ur-sci-4257 
Remove Checklist item min length validation and modal fixes [SCI-4257]
 2020-01-16 16:02:30 +01:00
Oleksii Kriuchykhin 8c2b1e5037 Fix global search for repositories and checklists update [SCI-4251] 2020-01-16 15:30:19 +01:00
Urban Rotnik 469714c40d Remove Checklist item min length validation and modal fixes 2020-01-16 15:21:01 +01:00
Urban Rotnik 507443ba38 Add custom method for repository report JSON data 2020-01-16 14:42:26 +01:00
Oleksii Kriuchykhin bb32117796 Improve user experience for repository saving and fix checklist saving [SCI-4237] 2020-01-15 15:23:03 +01:00
Alex Kriuchykhin da26d8a018
Merge pull request #2304 from okriuchykhin/ok_SCI_4204 
Refactor repository cell cloning to support all data types [SCI-4204]
 2020-01-15 13:04:50 +01:00
Alex Kriuchykhin 9412cccc9c
Merge pull request #2306 from urbanrotnik/ur-sci-fix-for-list-items-update 
Fix for list items update
 2020-01-15 12:34:33 +01:00
Urban Rotnik 97954b3930 fixup! Fix list item update 2020-01-15 11:28:31 +01:00
Oleksii Kriuchykhin 9e8bd23616 Merge latest branch 'develop' into ok_SCI_3988 2020-01-15 10:52:20 +01:00
Oleksii Kriuchykhin eed68a2590 Refactor repository cell clonning to support all data types [SCI-4204] 2020-01-14 16:55:10 +01:00
Oleksii Kriuchykhin 7b82e33eb6 Fix repository filtering and improve speed [SCI-4224] 2020-01-13 16:09:07 +01:00
aignatov-bio ac2f431a0b
Merge pull request #2292 from aignatov-bio/ai-sci-4221-fix-big-numbers-in-repository-number-value 
Fix big number in repository number value [SCI-4221]
 2020-01-13 10:42:13 +01:00
Alex Kriuchykhin 67b1bf4611
Merge pull request #2286 from urbanrotnik/ur-sci-4161-v2 
Fix for numeric item in SQL array [SCI-4161]
 2020-01-13 10:15:48 +01:00
Alex Kriuchykhin 007cae39e8
Merge pull request #2291 from okriuchykhin/ok_SCI_4197 
Fix sorting for date time columns [SCI-4197]
 2020-01-10 15:25:53 +01:00
aignatov-bio 9ede0ef716 Fix big number in repository number value 2020-01-10 13:00:14 +01:00
Oleksii Kriuchykhin 4799e6a1eb Fix failing tests [ok_SCI_4197] 2020-01-10 11:09:47 +01:00
Urban Rotnik 9296f0eb4f Add extra format for exports 2020-01-10 11:09:30 +01:00
Urban Rotnik 824e116cfa Add presence validation for STI type on DateTime column types 2020-01-10 11:09:30 +01:00
Urban Rotnik 728823ed65 fixup! Fix for numeric item in SQL array 2020-01-10 09:46:25 +01:00
Oleksii Kriuchykhin ad5a5f3ebf Fix sorting for date time columns [SCI-4197] 2020-01-09 16:18:28 +01:00
Urban Rotnik 39593b6342 Fix for numeric item in SQL array 2020-01-09 11:24:38 +01:00
Oleksii Kriuchykhin 2ec27e54f3 Fix repository status item deletion issue [SCI-4212] 2020-01-08 17:32:07 +01:00
Oleksii Kriuchykhin 522ae12f08 Merge branch 'develop' into ok_SCI_3988 2020-01-07 17:07:22 +01:00
Oleksii Kriuchykhin d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
Alex Kriuchykhin 1de5e0a47b
Merge pull request #2264 from aignatov-bio/ai-sci-4157-add-new-columns-support-for-report 
Add helper for repository tables in docx report [SCI-4157]
 2020-01-07 15:33:12 +01:00
Oleksii Kriuchykhin 1b902ff4b3 Merge branch 'develop' into ok_SCI_3988 2020-01-07 15:26:30 +01:00
aignatov-bio c3c070c11a Update checklist formatted value 2020-01-06 13:03:05 +01:00
aignatov-bio 83f8df2012 Rebase branch and fix checklist formatted 2020-01-06 12:40:09 +01:00
aignatov-bio 4895f41238 Add helper for repository tables in docx report 2020-01-06 12:40:09 +01:00
Urban Rotnik c15bcf0769 Add search support for numeric 2020-01-06 10:12:11 +01:00
Urban Rotnik 87288d0771 Add search for statuses 2020-01-06 10:12:08 +01:00
aignatov-bio 3bd44dc5ab
Merge pull request #2271 from aignatov-bio/ai-sci-4168-refactor-checklist-model 
Refactor checklist column data structure [SCI-4168]
 2019-12-24 11:12:36 +01:00
aignatov-bio 54800cb69b Merge branch 'features/new-column-types' into ai-sci-4168-refactor-checklist-model 2019-12-20 15:46:39 +01:00
aignatov-bio 16c4879e56 Merge migrations and update sorting 2019-12-20 15:42:54 +01:00
Urban Rotnik dfe3c5292e Add TimeRange and DateRange renderer 2019-12-20 14:57:04 +01:00
Urban Rotnik 5d4453470a Add DateTimeRange renderer 2019-12-20 14:56:11 +01:00
Urban Rotnik 2a63854123 Edit and new renderers for DateTime columns 2019-12-20 14:55:11 +01:00
Alex Kriuchykhin 0566b17d50
Merge pull request #2272 from okriuchykhin/ok_SCI_4166 
Add view/edit renderers for numeric data type [SCI-4166]
 2019-12-19 11:57:13 +01:00
aignatov-bio dc91893d7e Refactor checklist column data structure 2019-12-18 14:10:41 +01:00
Oleksii Kriuchykhin e24bc2775a Add view/edit renderers for numeric data type [SCI-4166] 2019-12-18 11:55:12 +01:00
Urban Rotnik 7153711570 Move delimiter from column to metadata 2019-12-18 10:22:52 +01:00
Alex Kriuchykhin 792e6f2eb9
Merge pull request #2263 from okriuchykhin/ok_SCI_4142 
Implement SSO with Azure AD [SCI-4142]
 2019-12-12 16:12:40 +01:00
aignatov-bio 7664f4be78 Add checklist and list edit mode 2019-12-11 14:49:14 +01:00
Oleksii Kriuchykhin 1aa334fdaa Merge branch 'develop' into release-1-17-8 2019-12-11 10:55:00 +01:00
Oleksii Kriuchykhin ff4ef818fb Implement SSO with Azure AD [SCI-4142] 2019-12-10 17:24:53 +01:00
Urban Rotnik d35f7119b7 Moved delete action to service 2019-12-10 14:29:37 +01:00
Urban Rotnik 5345cf0342 Updated date and time comparison 2019-12-10 14:29:36 +01:00
Urban Rotnik 5055490a23 Refactor asset value methods 2019-12-10 14:29:36 +01:00
Urban Rotnik 82b93bf9a4 Fix failing tests 2019-12-10 14:29:35 +01:00
Urban Rotnik b68aadf506 Update params nesting 2019-12-10 14:29:35 +01:00
Urban Rotnik 0c990ef8cf Add functions for creating new cells with values 2019-12-10 14:29:34 +01:00
Urban Rotnik 5b710241e1 Add delete condition to update_data method on CellValues 2019-12-10 14:29:33 +01:00
Urban Rotnik 79a50860b6 Add methods update_data, data_changed, formatted for all types off ColumnValues 2019-12-10 14:29:29 +01:00
Mojca Lorber a3a5b21951 small fixes 2019-12-10 12:02:08 +01:00
mlorb 1122fe2d2f
Merge branch 'features/new-column-types' into ml-sci-4029 2019-12-10 10:54:41 +01:00
Alex Kriuchykhin 2e15548680
Merge pull request #2245 from okriuchykhin/ok_SCI_4107 
Fix TinyMCE images and avatars for export all [SCI-4107]
 2019-12-10 10:35:09 +01:00
Urban Rotnik e764e856d8 Fix syntax error 2019-12-10 09:40:40 +01:00
Mojca Lorber 8503dd7007 Add numeric repository column type 2019-12-09 16:38:21 +01:00
Alex Kriuchykhin 7a97f813b2
Merge pull request #2252 from biosistemika/SCI-4109-export-with-assigned-item-bugfix 
SCI-4109 fix the file copying
 2019-12-09 16:04:43 +01:00
aignatov-bio 09079fbcda Fix naming and tests 2019-12-09 13:48:36 +01:00
aignatov-bio 643abc3fd7 Fixes tests 2019-12-09 13:48:36 +01:00
aignatov-bio d8676596f1 Add checklists column type 2019-12-09 13:48:36 +01:00
Urban Rotnik eca0c84bbd Fix tests 2019-12-06 14:20:37 +01:00
Urban Rotnik e934e08c17 Implement STI for DateTimeValue types 2019-12-06 12:50:19 +01:00
Oleksii Kriuchykhin 7a89cae56f Fix TinyMCE images and avatars for export all [SCI-4107] 2019-12-05 13:27:17 +01:00
Oleksii Kriuchykhin 03667f619f Merge branch 'release-1-17-7' into develop 2019-12-05 13:03:39 +01:00
aignatov-bio 43ff9f6f26 Fix experiment copy 2019-12-02 15:34:42 +01:00
Alex Kriuchykhin fbf1a5b6e2
Merge pull request #2239 from okriuchykhin/ok_SCI_4098 
Refactor Azure configuration  and connected accounts [SCI-4098]
 2019-11-29 11:30:33 +01:00
Urban Rotnik 5f2407e3fb Add view renders for DateTime column types 2019-11-29 10:50:14 +01:00
Urban Rotnik cb0fe049f0 Remove range method from model 2019-11-29 10:19:55 +01:00
Urban Rotnik 5ae29d549e Add manage modal for DateTime values 2019-11-29 10:19:55 +01:00
Urban Rotnik f39af1916f Split DateTime and DateTimeRange column types, rename DateType table 2019-11-29 10:19:16 +01:00
Urban Rotnik f30664a7b3 Add inverse_of option 2019-11-29 10:19:15 +01:00
Urban Rotnik aee806edaa Add methods for repository_date_time_value 2019-11-29 10:19:14 +01:00
Urban Rotnik 2a20ad68a3 Add range column to RepositoryColumn 2019-11-29 10:19:14 +01:00
Urban Rotnik b591346a3f Add DateTime type column 2019-11-29 10:19:13 +01:00
Urban Rotnik 1e8261ac2a Update InventoryColumns API for new Status Type 2019-11-29 10:19:07 +01:00
Oleksii Kriuchykhin 73be1181ac Fix failing tests for repository states [SCI-4070] 2019-11-29 10:19:05 +01:00
Oleksii Kriuchykhin e8fdfe7111 Implement datatables renderer for status data type [SCI-4032] 2019-11-29 10:19:04 +01:00
Urban Rotnik 1720623665 Refactor RepositoryListColumn controller 2019-11-29 10:17:50 +01:00
Urban Rotnik 14b43d516e Add UpdateStatusColumnService service 2019-11-29 10:16:45 +01:00
Urban Rotnik bbb8c46fe2 Add CreateStatusColumnService service 2019-11-29 10:16:44 +01:00
Urban Rotnik c00a837105 Add models for RepositoryStatus column type 2019-11-29 10:16:43 +01:00
Oleksii Kriuchykhin 6b20a10473 Refactor Azure configuration [SCI-4098] 2019-11-26 15:09:40 +01:00
Miha Mencin b968de96c7
Merge pull request #2232 from biosistemika/SCI-4109-export-with-assigned-item-bugfix 
SCI-4109 fix the file copying
 2019-11-25 17:32:34 +01:00
Miha Mencin 48fc7708f8 SCI-4109 fix the file copying 2019-11-25 13:38:16 +01:00
Urban Rotnik 0dc1daa7c6 Add gem Down, File size validation before and during download 2019-11-18 14:28:19 +01:00
Oleksii Kriuchykhin b2862b6c9e Remove Paperclip DB columns and fix experiment templates [SCI-3988] 2019-11-18 14:16:28 +01:00
Anton Ignatov 7117b767f4 Fix commnets to PR 2019-11-18 13:59:54 +01:00
Anton Ignatov fc70ce24f8 Refactor side filters for global activities 2019-11-18 13:59:54 +01:00
Anton Ignatov 7b855f54ac Finish main part of selectors 2019-11-18 13:59:54 +01:00
aignatov-bio b1f9e7f1ca Fix global activities jsonb field [SCI-3830] (#2030) 
* Fix global activities jsonb field

* Fix tests
 2019-11-18 13:59:54 +01:00
Urban Rotnik dcfca76602 Update method 'update_canvas' to work with new DB constraint 2019-11-18 11:11:41 +01:00
Urban Rotnik b8bf7bbd9b Rename validation 2019-11-18 11:11:40 +01:00
Urban Rotnik 43e3763ec8 Update x, y, experiment unqiue validation 
[SCI-3887]
 2019-11-18 11:11:40 +01:00
Urban Rotnik 060125a1c4 Add file size validation 2019-11-18 11:11:38 +01:00
Urban Rotnik 24033bec7a Add API endpoint for Task creation 2019-11-18 11:11:37 +01:00
Urban Rotnik 7802d5ee8b Add uniq validation for x and y position scoped to experiment 2019-11-18 11:11:36 +01:00
aignatov-bio 3eb6f5695b
Merge pull request #2207 from aignatov-bio/mlorb-ml-sci-4004 
Add auto-save feature to text fields [SCI-4004]
 2019-11-18 09:11:10 +01:00
aignatov-bio b979435b35
Merge pull request #2199 from aignatov-bio/ai-sci-4055-fix-eln-export-for-files-without-extension 
Fix eln export for file without extension [SCI-4055]
 2019-11-15 14:16:07 +01:00
aignatov-bio a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
aignatov-bio 0c5ce90895 Fix eln export for file without extension 2019-11-06 09:53:44 +01:00
Oleksii Kriuchykhin b2eda231a0 Fix TinyMCE images in protocol clonning [SCI-4053] 2019-11-05 18:13:44 +01:00
aignatov-bio 717b70f75b
Merge pull request #2171 from aignatov-bio/ai-sci-3995-fix-avatar-comments-and-activties 
Fix avatars in comments and activities [SCI-3995]
 2019-10-29 14:11:39 +01:00
Urban Rotnik 169a381629
Merge pull request #2170 from urbanrotnik/ur-sci-4008-rte-image-download 
Fix for downloading image [SCI-4008]
 2019-10-22 15:12:11 +02:00
Urban Rotnik a7d351dc38 Add file size check 2019-10-22 14:13:22 +02:00
Alex Kriuchykhin 5524598d53
Merge pull request #2172 from biosistemika/release_1_17_3 
Merge release 1.17.3 to master
 2019-10-22 12:45:02 +02:00
aignatov-bio 9950a23188 Replace base64 avatars with url 2019-10-22 12:27:13 +02:00
Urban Rotnik 0119533e75 Fix for file generation 2019-10-22 11:02:59 +02:00
Oleksii Kriuchykhin 53402c9ce1 Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993] 2019-10-17 13:30:14 +02:00
Oleksii Kriuchykhin 8f52b362d6 Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934] 2019-10-11 11:46:51 +02:00