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

6598 commits

Author SHA1 Message Date
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
Oleksii Kriuchykhin 405d5b31bb Remove spinner in repository table after error caused by provisioning snapshot [SCI-4665] 2020-06-29 10:04:31 +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
Miha Mencin 76c2e032dc
Merge pull request #2666 from aignatov-bio/ai-sci-4747-fix-long-inventory-name 
Fix long inventory name issue on task page  [SCI-4747]
 2020-06-29 09:44:21 +02:00
Miha Mencin 6db1401759
Merge pull request #2670 from aignatov-bio/ai-sci-4745-fix-manage-column-dropdown-position 
Fix dropdown position for full-screen modals [SCI-4745]
 2020-06-29 09:43:13 +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
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
Urban Rotnik 88f54b16d7 Add 2fa fields to user 2020-06-24 17:58:58 +02:00
Oleksii Kriuchykhin 64b66f0d73 Remove obsolete attribute in repository_datatable.js after feature branch merge 2020-06-24 16:25:42 +02:00
aignatov-bio 6a41290d9d Add tables to TinyMce and small table improvments 2020-06-24 15:51:59 +02:00
aignatov-bio 4f8a612106 add new line 2020-06-24 15:25:34 +02:00
aignatov-bio a3ea0927c9 Revert helper JS to es5 2020-06-24 15:12:13 +02:00
aignatov-bio 80970b6448 Remove hashes from datatable helper 2020-06-24 14:39:33 +02:00
Oleksii Kriuchykhin 7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Alex Kriuchykhin 4793843977
Merge pull request #2684 from urbanrotnik/ur-sci-4678-disable-checkbox 
Disable checkbox for shared inventories [SCI-4781]
 2020-06-24 13:57:27 +02:00
Alex Kriuchykhin 2125c8bf83
Merge pull request #2683 from mlorb/ml-sci-4742 
Hide archived and not assigned items … [SCI-4742]
 2020-06-24 13:47:22 +02:00
Urban Rotnik 193375818e Disable checkboxes for shared inventories 2020-06-24 13:41:00 +02:00
Mojca Lorber 7e645eade4 Add active scope to repository_rows in assigning servise 2020-06-24 13:22:09 +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
Mojca Lorber bdf959db1f Hide archived and not assigned items from the assigning screen on the task 2020-06-24 12:06:53 +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
Urban Rotnik 8dc48e9f95 Remove archiving rows from RepositoryArchiveService 2020-06-24 10:35:24 +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 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 efbc05e00e
Merge pull request #2675 from urbanrotnik/ur-sci-4782 
Include archived columns to inventories export [SCI-4782]
 2020-06-23 16:51:50 +02:00
Urban Rotnik c565cbe579 Filter out non active repositories and rows 2020-06-23 10:23:22 +02:00
aignatov-bio 414429afcd
Merge pull request #2674 from aignatov-bio/ai-sci-4784-update-manage-columns-for-archived-repository 
Add archived_by and archived_on column to columns manage modal [SCI-4784]
 2020-06-23 09:10:28 +02:00
Urban Rotnik e89bf58e1c Refactory restore inventory service 2020-06-23 08:24:52 +02:00
Urban Rotnik d874b6f732 Refactory archive inventory service 2020-06-22 22:45:34 +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 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 d1b1b5f268 Include archived columns to inventories export 2020-06-22 14:28:49 +02:00
aignatov-bio dc50e7f1fd Add archived_by and archived_on column to columns manage modal 2020-06-22 14:00:44 +02:00
aignatov-bio b64b6ed326 Remove hack for activities 2020-06-22 10:24:58 +02:00
Urban Rotnik 07ca1de737 Fix valdiation for snapshot selection 2020-06-22 07:30:49 +02:00
aignatov-bio 6f2d5b359e Add action buttons to repository index 2020-06-19 15:54:45 +02:00
Mojca Lorber 8d43603789 Fix acivities and error handeling 2020-06-19 09:04:42 +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
aignatov-bio e9830ebfee Add view switcher 2020-06-18 14:08:24 +02:00
aignatov-bio 8b10d49118 Clean up CSS 2020-06-18 14:08:24 +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 06fab7d01c Update smart anotation preview for archived items 2020-06-18 13:45:08 +02:00
aignatov-bio 7f9af06f78 Fix dropdown position for full screen modals 2020-06-18 13:29:28 +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
aignatov-bio e8ea8b5b3f Fix long inventory name issue on task page 2020-06-17 15:08:07 +02:00
aignatov-bio d0f0baf6b2
Merge pull request #2664 from urbanrotnik/ur-sci-4762-v2 
Canvas fix [SCI-4762] -v2
 2020-06-17 13:01:40 +02:00
Urban Rotnik 41c1230db1 Remove position check from contorller 2020-06-17 11:55:43 +02:00
Oleksii Kriuchykhin 8280d2a41e Allow HTML in inline editor, needed for handling smart annotations [SCI-4707] 2020-06-16 13:55:27 +02:00
Urban Rotnik c0a2d4709c
Merge pull request #2662 from urbanrotnik/ai-sci-4770 
Fix MarvinJS modal header [SCI-4770] - HotFix
 2020-06-16 11:44:04 +02:00
aignatov-bio 95ae8215a7 Fix MarvinJS modal header 2020-06-16 10:28: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
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 868c1c1fa0 Improve row state passing 2020-06-15 13:42:16 +02:00
Urban Rotnik 481516260f
Merge pull request #2658 from urbanrotnik/ur-sci-4762-canvas-errors 
Fix update_canvas [SCI-4762]
 2020-06-15 11:59:26 +02:00
Urban Rotnik 15342cd8f2 Fix update_canvas 2020-06-15 10:52:35 +02:00
Urban Rotnik ec14cf9fef
Merge pull request #2657 from urbanrotnik/ai-sci-4765-v2 
Fix smart annotation in inventory on edit [SCI-4765] (HotFix branch)
 2020-06-12 11:41:02 +02:00
Urban Rotnik 800465f9a9
Merge pull request #2648 from aignatov-bio/ai-sci-4733-disable-marvinjs-if-not-using 
Not include marvinJS library, if marvinJS disabled [SCI-4733]
 2020-06-12 11:40:41 +02:00
aignatov-bio 97f5a7e9fc Fix smart annotation in inventory on edit 2020-06-12 11:17:50 +02:00
mlorb 0a7c9aeb1a
Merge pull request #2651 from urbanrotnik/ur-sci-4706-archiving-restoring-rows 
Archiving & restoring rows [SCI-4706]
 2020-06-11 16:41:53 +02:00
Urban Rotnik 39eb8145c2 Rename params method 2020-06-11 16:11:23 +02:00
Mojca Lorber cfeb4b4d3d Fix protocol duplication at saving protocol from task to repository 2020-06-11 13:19:21 +02:00
aignatov-bio db35da0cee Add archiving column to datatable helper 2020-06-11 12:48:31 +02:00
Urban Rotnik 9bac0fb867 Add archived tags to assigned repository rows 2020-06-10 14:48:03 +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
Urban Rotnik ebbce8d09e Add restore columns to migrations 2020-06-09 18:43:22 +02:00
aignatov-bio 9dd5996122
Merge pull request #2650 from aignatov-bio/ai-sci-4739-checkbox-component-for-datatable 
Add checkbox selector to DataTable [SCI-4739]
 2020-06-09 14:39:33 +02:00
aignatov-bio 2b9062ac92 Add checkbox selector to datatable 2020-06-09 13:16:50 +02:00
Mojca Lorber c0c93772ff Fix protocol duplication at saving protocol from task to repository 2020-06-09 11:45:03 +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
aignatov-bio 15de84ff2f Not include marvinJS library, if marvinJS disabled 2020-06-08 09:59:26 +02:00
Alex Kriuchykhin f521531fd5
Merge pull request #2638 from okriuchykhin/ok_SCI_4571 
Clear the obsolete code for assigning inventory items to the task [SCI-4571]
 2020-06-08 09:47:56 +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
Oleksii Kriuchykhin 85ce72e5ff Remove obsolete JS functions from repositories datatable [SCI-4571] 2020-06-05 11:15:58 +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
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
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
Miha Mencin 38877aad26
Merge pull request #2639 from urbanrotnik/ur-sci-4728 
Scope snapshots to project [SCI-4728]
 2020-06-03 23:40:14 +02:00
Urban Rotnik a93e2a5d6f Remove select 2020-06-03 23:18:22 +02:00
Urban Rotnik 69d086ba32 Scope snapshots to project 2020-06-03 22:58:22 +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
aignatov-bio 4886d95ad5 Fix variable naming 2020-06-03 17:07:11 +02:00
aignatov-bio 503d19fb90 Add snapshots to team export/import 2020-06-03 17:02:33 +02:00
Urban Rotnik 50bc313853 Fix for default snapshot in report 2020-06-03 10:49:45 +02:00
Urban Rotnik 21e048c52e
Merge pull request #2633 from urbanrotnik/ur-sci-fix-manage-column-dropdown 
Fix dropdown render for columns manage modal [SCI-4720]
 2020-06-02 15:44:25 +02:00
Urban Rotnik 9d96baf008 Escape special chars for FE and BE 2020-06-02 15:16:01 +02:00
aignatov-bio f986a0ed56 Fix owner team for snapshots 2020-06-02 11:40:30 +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
Urban Rotnik 9b0f215187 Fix status dropdown rendering 2020-06-02 06:15:34 +02:00
Urban Rotnik 4fc37e12a0 Fix dropdown render for columns manage modal 2020-06-01 18:41:58 +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
aignatov-bio 3294840611 Fix sidebar event 2020-06-01 14:45:03 +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 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 7c8460dcf5
Merge pull request #2628 from aignatov-bio/ai-sci-4699-change-line-thikness 
Change selected line thickness [SCI-4699]
 2020-06-01 10:43:46 +02:00
aignatov-bio 222e89ea8d Change selected line thickness 2020-06-01 10:30:06 +02:00
aignatov-bio 8f3c7fa9aa
Merge pull request #2627 from aignatov-bio/ai-sci-4549-fix-shared-inventory-icon 
Fix shared inventory icon [SCI-4549]
 2020-06-01 10:28:07 +02:00
aignatov-bio e67f345602
Merge pull request #2624 from aignatov-bio/ai-sci-4701-small-css-fixes 
Small css fixes [SCI-4701]
 2020-06-01 10:27:54 +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 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
Oleksii Kriuchykhin d774a82762 Fix handling of snapshots of deleted repositories in reports [SCI-4698] 2020-05-29 16:30:27 +02:00
aignatov-bio 1430ca5ae9 Fix shared inventory icon 2020-05-29 13:17:07 +02:00
Oleksii Kriuchykhin 7a95355e81 Add extra check for repository presence in report [SCI-4698] 2020-05-29 11:39:07 +02:00
Alex Kriuchykhin be8c7e01e2
Merge pull request #2622 from aignatov-bio/ai-sci-4699-show-selected-snapshot-in-sidebar 
Show selected snapshot in sidebar [SCI-4699]
 2020-05-29 11:14:52 +02:00
Alex Kriuchykhin 4c50f75aa2
Merge pull request #2621 from aignatov-bio/ai-sci-4710-fix-escape-issue-in-dropdowns 
Fix escape issue in dropdowns [SCI-4710]
 2020-05-29 09:52:36 +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 7f0d43209e Small css fixes 2020-05-28 16:04:21 +02:00
aignatov-bio 116747f261 Filter private assigned tasks 2020-05-28 15:35:19 +02:00
aignatov-bio 368ee8a689 Show selected snapshot in sidebar 2020-05-28 15:18:26 +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
Alex Kriuchykhin 5ce1311591
Merge pull request #2620 from okriuchykhin/ok_SCI_4673 
Fix file download from MS Office online [SCI-4673]
 2020-05-28 13:09:14 +02:00
Mojca Lorber 285280827a Refactor repository column base controller 2020-05-28 12:18:46 +02:00
aignatov-bio f7a215c953 Fix escape issue in dropdowns 2020-05-28 10:55:36 +02:00
Mojca Lorber c673e27109 Merge branch 'develop' into ml-sci-4261 2020-05-28 08:18:24 +02:00
aignatov-bio 2950f4fe51
Merge pull request #2615 from aignatov-bio/ai-sci-4633-check-duplicate-protocol-name-during-import 
Check duplicate protocol name during import [SCI-4633]
 2020-05-27 17:15:44 +02:00
Oleksii Kriuchykhin 0465dba2cf Fix file dowload from MS Office online [SCI-4673] 2020-05-27 16:59:28 +02:00
aignatov-bio 8f998ceee9 Fix counter 2020-05-27 16:11:10 +02:00
aignatov-bio aaff5eb67f Add name order for porject/experiment/task sidebar 2020-05-27 13:31:00 +02:00
aignatov-bio 32c1f4af84 Fix forgot password link margin 2020-05-27 12:55:15 +02:00
Oleksii Kriuchykhin b430d507cf Fix handling of deleted repositories in reports [SCI-4698] 2020-05-27 12:15:19 +02:00
aignatov-bio 40ad9fbf00 Check duplicate protocol name during import 2020-05-27 12:10:48 +02:00
Alex Kriuchykhin 8ed8f148a3 Revert "Fix handling of deleted repositories in reports [SCI-4698]" 2020-05-27 10:39:44 +02:00
aignatov-bio 7b36392a19
Merge pull request #2606 from aignatov-bio/ai-sci-4621-resize-simple-table-header-size-on-sidebar-colapse 
Resize simple table header on sidebar collapse [SCI-4621]
 2020-05-27 09:35:40 +02:00
Oleksii Kriuchykhin 6424bd23da Fix handling of deleted repositories in reports [SCI-4698] 2020-05-27 08:21:55 +02:00
aignatov-bio 457b0a8137
Merge pull request #2610 from aignatov-bio/ai-sci-4697-fix-snapshot-date-creation 
Fix snapshot date creation [SCI-4697]
 2020-05-26 16:28:13 +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
aignatov-bio 73c7ff47a5 Fix z-index for full view modal 2020-05-26 12:41:07 +02:00
Miha Mencin 4b7b3a8622
Merge pull request #2607 from biosistemika/SCI-4674-tehnician-snapshots-permissions 
[SCI-4674] Fix a typo
 2020-05-25 17:30:19 +02:00
Miha Mencin 55aac63fba Fix a typo 2020-05-25 17:28:36 +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 26f4f24cc6 SCI-4674 fix stupid 2020-05-25 16:30:22 +02:00
Miha Mencin 77e1feda97 SCI-4674 name permissions more properly 2020-05-25 16:29:00 +02:00
aignatov-bio f86b71144d Resize simple table header on sidebar collapse 2020-05-25 16:21:28 +02:00
Miha Mencin 5f195b3622 SCI-4674 check if experiment and projects are active during snapshot creation 2020-05-25 15:56:39 +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
Urban Rotnik c7361332ab
Merge pull request #2567 from urbanrotnik/ur-sci-4622-snapshot-in-report 
Show snapshot in report [SCI-4622]
 2020-05-25 14:21:49 +02:00
Urban Rotnik b264b86cba Prepand callback 2020-05-25 14:00:41 +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
aignatov-bio 3a1280fead
Merge pull request #2602 from aignatov-bio/ai-sci-4675-fix-ordering-of-columns-to-snapshots 
Fix snapshot column ordering by parent_id [SCI-4675]
 2020-05-25 13:39:16 +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 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 f0bdae8b67 Fix snapshot column ordering by parent_id 2020-05-25 11:19:43 +02:00
Mojca Lorber 94dc314c73 Hide hamburger menu on login screen 2020-05-25 10:39:35 +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 9973151278
Merge pull request #2598 from aignatov-bio/ai-sci-4662-fix-new-comment-field 
Fix new comment field [SCI-4662]
 2020-05-25 09:09:33 +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 230ec487ba Make snapshots versions buttons full size clickable 2020-05-22 17:16:20 +02:00
aignatov-bio ce53235cb9
Merge pull request #2592 from aignatov-bio/ai-sci-4621-fix-order-icon-position-in-simple-view 
Fix ordering in simple table view [SCI-4621]
 2020-05-22 16:52:45 +02:00
aignatov-bio 8161bbb31c Fix new comment field 2020-05-22 16:51:11 +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
Urban Rotnik a754e5765d
Merge pull request #2595 from urbanrotnik/ur-sci-4670-missing-button 
New step missing button [SCI-4670]
 2020-05-22 15:33:58 +02:00
aignatov-bio cbc578f84b Fix snapshot name column id 2020-05-22 15:10:21 +02:00
aignatov-bio 3287070df7 Improve search through assigned tasks 2020-05-22 14:36:28 +02:00
Urban Rotnik 9d3874e343 Add margin to keywords container 2020-05-22 14:23:03 +02:00
Miha Mencin a4cd014682
Merge pull request #2591 from okriuchykhin/ok_SCI_4656 
Make a snapshot name synced with the inventory name if changed [SCI-4656]
 2020-05-22 12:57:08 +02:00
Urban Rotnik 55f77cfe00
Merge pull request #2594 from urbanrotnik/4663-fix-button-visibility 
Fix button visibility [SCI-4663]
 2020-05-22 12:55:16 +02:00
Urban Rotnik 1c2883414b Bring newStep top button back 2020-05-22 12:29:14 +02:00
Urban Rotnik a1fa0b4e05 Add check for button visibility 2020-05-22 12:02:38 +02:00
Urban Rotnik a9bed41ff5 Remove obsolete html message 2020-05-22 10:33:13 +02:00
Mojca Lorber 92861fdd32 Expand assigned inventory after updating assigned items on task 2020-05-21 22:36:09 +02:00
aignatov-bio 0aa1c32813 Fix ordering in simple table view 2020-05-21 16:51:07 +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 388f52a064 Make a snapshot name synced with the inventory name if changed [SCI-4656] 2020-05-21 11:51:37 +02:00
Alex Kriuchykhin bc70ceb120
Merge pull request #2590 from biosistemika/SCI-4628-schedule-snapshots-for-locked-tasks 
[SCI-4628] moving snapshot provisioning logic into repository model, ma…
 2020-05-21 09:53:04 +02:00
Mojca Lorber 12982260b7 Fix css hover effects 2020-05-21 08:37:40 +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
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
Urban Rotnik a5b1f1cfd5
Merge pull request #2587 from urbanrotnik/ur-sci-4634-v2 
Inventory import fix [SCI-4634] v2
 2020-05-20 14:45:57 +02:00
Mojca Lorber e2959fec32 Merge branch 'develop' into ml-sci-4582 2020-05-20 10:37:33 +02:00
Urban Rotnik 32df6f2568 Skip cell import if value is nil 2020-05-20 09:56:08 +02:00
mlorb 29370cf82e
Merge pull request #2586 from mlorb/ml-sci-4615 
Fix missing creator in task details [SCI-4615]
 2020-05-20 09:47:08 +02:00
aignatov-bio 51d9f054ee
Merge pull request #2584 from aignatov-bio/ai-sci-4654-clear-fullview-modal-before-open 
Clear full view repository modal before open [SCI-4654]
 2020-05-20 09:45:26 +02:00
aignatov-bio 4e7a26bdd0
Merge pull request #2583 from aignatov-bio/ai-sci-4651-fix-repository-ordering 
Fix repositories order in dropdown [SCI-4651]
 2020-05-20 09:45:13 +02:00
Urban Rotnik 2283491629 Conver to string if not importing into Number column 2020-05-20 09:09:14 +02:00
Mojca Lorber 40a3ee82d5 Add creator to task 2020-05-20 08:59:07 +02:00
aignatov-bio 40b266ee0d Clear full view repository modal before open 2020-05-19 16:44:47 +02:00
aignatov-bio d714b4b7bf
Merge pull request #2579 from aignatov-bio/ai-sci-4635-fix-checklist-appearance-in-fullview 
Fix checklist render in full view [SCI-4635]
 2020-05-19 16:18:45 +02:00
aignatov-bio f8b246eb2a Fix repositories order in dropdown 2020-05-19 16:18:01 +02:00
Urban Rotnik 431bd0c53b
Merge pull request #2582 from urbanrotnik/ur-sci-4650-font-size-fix 
Fonts size update [SCI-4650]
 2020-05-19 14:55:22 +02:00
mlorb 7cbbcff86a
Merge pull request #2576 from mlorb/ml-sci-4619 
Fix manage permissions on views [SCI-4619]
 2020-05-19 14:29:11 +02:00
Urban Rotnik ac4532eea3 Update fonts 2020-05-19 14:14:58 +02:00
aignatov-bio 2dcada4bc5
Merge pull request #2580 from aignatov-bio/ai-sci-4647-add-custom-tinymce-plugins-to-asset-pipeline 
Add custom tinymce plugins to assets pipeline [SCI-4647]
 2020-05-19 10:31:51 +02:00
aignatov-bio c00b96ff7e
Merge pull request #2577 from aignatov-bio/ai-sci-4646-fix-task-sections-collapse-animation 
Fix collapse animation for task sections [SCI-4646]
 2020-05-19 10:31:36 +02:00
Urban Rotnik 1dc0e2b40b
Merge pull request #2581 from urbanrotnik/ur-sci-4640-wrong-snapshot-displayed 
Hide sidebar Versions by default [SCI-4640]
 2020-05-19 10:27:57 +02:00
Alex Kriuchykhin 49a35f43c5
Merge pull request #2578 from okriuchykhin/ok_SCI_4645 
Fix error message for file upload limit on steps [SCI-4645]
 2020-05-19 10:27:12 +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
Urban Rotnik ea0e97d046 Hide sidebar on modal close 2020-05-19 09:46:38 +02:00
aignatov-bio 3047af759f Add custom tinymce plugins to assets pipeline 2020-05-18 18:06:52 +02:00
aignatov-bio 9db19603dc Fix checklist render in fullview 2020-05-18 16:32:27 +02:00
Oleksii Kriuchykhin bc1ee1bd8d Fix error message for file upload limit on steps [SCI-4645] 2020-05-18 16:16:39 +02:00
aignatov-bio 9f4457642d Fix collapse animation for task sections 2020-05-18 16:01:26 +02:00
Mojca Lorber 6b6fba591e Fix manage permissions on views 2020-05-18 15:54:32 +02:00
Urban Rotnik 7e009ab8ee
Merge pull request #2574 from urbanrotnik/ur-sci-4634 
Fix excel header parsing [SCI-4634]
 2020-05-18 14:56:22 +02:00
Alex Kriuchykhin e9a05d2e3d
Merge pull request #2575 from okriuchykhin/ok_SCI_4637 
Fix selection of the default snapshot on tasks [SCI-4637]
 2020-05-18 14:25:26 +02:00
Oleksii Kriuchykhin d77930af61 Fix failing tests for repository rows controller [SCI-4629] 2020-05-18 14:12:06 +02:00
Urban Rotnik 3b08241b0b Fix excel header parsing 2020-05-18 11:39:19 +02:00
aignatov-bio 1f24adddf9
Merge pull request #2562 from aignatov-bio/ai-sci-4627-remove-search-word-from-task-table-state 
Remove search from state load in task repository [SCI-4627]
 2020-05-18 11:16:27 +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 343356cab7
Merge pull request #2571 from aignatov-bio/ai-sci-4639-select-correct-button-for-assign-modal 
Select correct button name for assign modal [SCI-4639]
 2020-05-18 11:16:07 +02:00
aignatov-bio f2d81cb199
Merge pull request #2570 from aignatov-bio/ai-sci-4617-make-snapshot-creation-text-switchable 
Make snapshot creation info text switchable [SCI-4617]
 2020-05-18 11:15:46 +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 8b968f6f67 Fix selection of the default snapshot on tasks [SCI-4637] 2020-05-18 11:06:42 +02:00
aignatov-bio 820514789d Update tinymce gem version 2020-05-17 17:36:26 +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
aignatov-bio f921ac75d8 Select correct button name for assign modal 2020-05-15 15:37:48 +02:00
aignatov-bio bc81a48b00 Make snapshot creation info text switchable 2020-05-15 14:44:26 +02:00
Urban Rotnik a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
aignatov-bio 69abccbbd6 Add title for full view assign modal 2020-05-15 14:22:20 +02:00
aignatov-bio dc2caca4f3 Small css fixes and test fix 2020-05-15 11:04:17 +02:00
mlorb dbd03a09ef
Merge pull request #2565 from mlorb/ml-sci-4511 
Add New Task layout Collapsed/Expanded States saving [SCI-4511]
 2020-05-15 09:23:05 +02:00
Urban Rotnik e290f555f4
Merge pull request #2561 from urbanrotnik/ur-sci-4625-import-fix 
Fix for empty status cell [SCI-4625]
 2020-05-15 08:44:30 +02:00
Mojca Lorber 4c15c89cf5 Add New Task layout Collapsed/Expanded States saving 2020-05-15 00:49:23 +02:00
aignatov-bio 51e3c70a4d
Merge pull request #2563 from aignatov-bio/ai-sci-4638-fix-step-content-aligment 
Fix align for step content [SCI-4638]
 2020-05-14 22:10:50 +02:00
aignatov-bio bac98bdbdc Remove inventory tab from task and routes to inventory page 2020-05-14 22:10:13 +02:00
aignatov-bio 443c301ca1 Fix align for step content 2020-05-14 21:53:00 +02:00
aignatov-bio c9a9cd2e75 Remove search from state load in task repository 2020-05-14 21:49:01 +02:00
Urban Rotnik ba68eef044 Fix for empty status cell 2020-05-14 17:59:25 +02:00
mlorb 1e0fed75d1
Merge pull request #2551 from mlorb/ml-sci-4620 
Fix missing corner on opened task inventory [SCI-4620]
 2020-05-14 17:25:39 +02:00
aignatov-bio e49d2dfbae
Merge pull request #2546 from aignatov-bio/ai-sci-4605-some-inventories-task-corrections 
Small task inventories corrections [SCI-4605]
 2020-05-14 16:45:45 +02:00
aignatov-bio ce1540aaa9 Small task inventories corrections 2020-05-14 16:41:02 +02:00
aignatov-bio af4ac7c53b Add const to dropdown library 2020-05-14 16:29:50 +02:00
aignatov-bio 309f8c1a3d Small snapshots CSS corrections 2020-05-14 16:29:50 +02:00
aignatov-bio 78b4067c50
Merge pull request #2549 from aignatov-bio/ai-sci-4604-small-snapshot-corrections 
Small snapshot css corrections [SCI-4604]
 2020-05-14 15:18:13 +02:00
aignatov-bio 8f946c45c3
Merge pull request #2553 from aignatov-bio/ai-sci-4518-optimize-task-mobile-view 
Small CSS improvments for mobile [SCI-4518]
 2020-05-14 14:20:40 +02:00
aignatov-bio 9b685fdaa6
Merge pull request #2554 from aignatov-bio/ai-sci-4613-add-icon-to-cancel-button 
Add icon to cancel button [SCI-4613]
 2020-05-14 13:19:20 +02:00
aignatov-bio 445f55acc7
Merge pull request #2555 from aignatov-bio/ai-sci-4598-change-task-details-to-onclick 
Replace bootstrap popover with bootstrap dropdown [SCI-4598]
 2020-05-14 13:19:08 +02:00
aignatov-bio 99e1affa73
Merge pull request #2556 from aignatov-bio/ai-sci-4515-fix-smart-annotation-position 
Fix smart annotation position for horizontal scroll [SCI-4515]
 2020-05-14 13:18:57 +02:00
aignatov-bio 5bdf1ff586
Merge pull request #2558 from aignatov-bio/ai-sci-4608-fix-pdf-report-time-position 
Prevent time to go newline in reports [SCI-4608]
 2020-05-14 13:18:31 +02:00
Alex Kriuchykhin 384b107c6c
Merge pull request #2560 from biosistemika/SCI-4601-fix-snapshot-bugs 
SCI-4601 fix the associations, renaming variable
 2020-05-14 13:09:10 +02:00
Miha Mencin 15508a5065 codestyle fix 2020-05-14 12:57:16 +02:00
Miha Mencin 26caeed04f
increase pooling interval to 10s 2020-05-14 12:39:13 +02:00
Mojca Lorber 009dce110b Css fix 2020-05-14 12:18:45 +02:00
Miha Mencin 0e5ce1054e decrease pooling time for snapshots 2020-05-14 12:03:07 +02:00
Miha Mencin 2e4655f9ee
Merge pull request #2548 from urbanrotnik/ur-sci-4609-task-card-due-date 
Task card due date fix [SCI-4609]
 2020-05-14 11:52:44 +02:00
Miha Mencin 76232f0298 SCI-4601 fix the associations, minor styling changes 2020-05-14 11:47:19 +02:00
Alex Kriuchykhin f089e4abc8
Merge pull request #2559 from okriuchykhin/ok_SCI_4596 
Restore deleted method after rebase [SCI-4596]
 2020-05-14 11:20:08 +02:00
Oleksii Kriuchykhin ea740eb2a4 Restore deleted method after rebase [SCI-4596] 2020-05-14 10:57:43 +02:00
Alex Kriuchykhin a341bd533b
Merge pull request #2557 from okriuchykhin/ok_SCI_4596 
Make snapshots selectable [SCI-4596]
 2020-05-14 10:15:44 +02:00
Urban Rotnik fbd44a4e23
Merge pull request #2547 from urbanrotnik/ur-sci-4557-update-permissions 
Update permissions and automatic snapshots [SCI-4557] [SCI-4624]
 2020-05-14 10:04:56 +02:00
aignatov-bio 9076fab12f Prevent time to go newline in reports 2020-05-13 18:46:58 +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 cbaaa7413c Fix smart annotation position for horizontal scroll 2020-05-13 12:45:22 +02:00
aignatov-bio 8447a13afd Replace bootstrap popover with bootstrap dropdown 2020-05-13 12:20:25 +02:00
aignatov-bio f6b239c144 Add icon to cancel button 2020-05-13 11:09:19 +02:00
aignatov-bio bd742d388d Small CSS improvments for mobile 2020-05-13 10:58:40 +02:00
Urban Rotnik 334da7c3ec Fix for assign view 2020-05-12 19:38:45 +02:00
Mojca Lorber 9c4d07f0dd Fix missing corner on opened task inventory 2020-05-11 13:04:31 +02:00
Urban Rotnik a96d19d5ea Add table name attribute to export schema 2020-05-11 11:25:41 +02:00
aignatov-bio f94ea51ecb Small snapshot css corrections 2020-05-10 13:08:19 +02:00
Urban Rotnik 8174d63734 Include BoostrapFormHelper in FormBuilder 2020-05-08 20:36:45 +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 e9c54f10fb Fix markup 2020-05-08 11:58:40 +02:00
aignatov-bio 2728df5bac Move helper method to my_module_helper 2020-05-08 11:56:29 +02:00
Oleksii Kriuchykhin 17cd991868 Update Canaid and Rails [SCI-4597] 2020-05-08 10:58:36 +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 dad5ac7a27 Fix snapshot button place 2020-05-07 19:36:30 +02:00
Mojca Lorber b3bce933e5 Task details description corrections and some changes of locales 2020-05-07 16:11:22 +02:00
aignatov-bio fe658a9b23
Merge pull request #2534 from aignatov-bio/ai-sci-4594-refactor-css-for-full-view-repository-view 
Update CSS for full view assigned rows modal [SCI-4594]
 2020-05-07 15:22:06 +02:00
aignatov-bio c3ca0156fb Fix error handling 2020-05-07 13:58:25 +02:00
aignatov-bio 30ce49b731
Merge pull request #2538 from aignatov-bio/ai-sci-4574-result-office-button-position 
Fix office button position [SCI-4574]
 2020-05-07 13:55:15 +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 912b01d34b
Merge pull request #2539 from aignatov-bio/ai-sci-4573-small-css-fixes-for-protocols 
Fix css for comments and fix modal title size [SCI-4573]
 2020-05-07 12:59:56 +02:00
aignatov-bio 8076d8f464 Create helper for partial 2020-05-07 12:51:18 +02:00
aignatov-bio 8b5872347a
Merge pull request #2514 from aignatov-bio/ai-sci-4538-new-protocol-template-dropdown 
Add new protocol template dropdown [SCI-4538]
 2020-05-07 08:32:54 +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 a6ab14de99
Merge pull request #2536 from urbanrotnik/ur-sci-4586-hide-icon-if-there-is-no-users-for-assign 
Hide icon [SCI-4586]
 2020-05-06 14:19:18 +02:00
Urban Rotnik 715d6ab8fa
Merge pull request #2537 from urbanrotnik/ur-sci-4587-activities-start-date-fix 
Fix activity message for start date [SCI-4587]
 2020-05-06 14:18:52 +02:00
aignatov-bio 5972c3fdf6 Fix css for comments and fix modal title size 2020-05-06 13:54:39 +02:00
aignatov-bio b74b717d03 Fix office button position 2020-05-06 13:42:30 +02:00
Urban Rotnik 8ff7c33431 Fix start date activity message 2020-05-06 12:34:45 +02:00
aignatov-bio 4e5ebd01b5 Fix I18n 2020-05-06 12:20:20 +02:00
Urban Rotnik 4c4d0a2403 Hide icon if there is no users 2020-05-06 09:47:39 +02:00
aignatov-bio a29db548f8 Update CSS for full view assigned rows modal 2020-05-05 18:17:14 +02:00
Mojca Lorber 8b4110c0af Css fixes for avatars for assigned users on tasks 2020-05-05 16:11:11 +02:00
Alex Kriuchykhin 7e9054e6d2
Merge pull request #2519 from aignatov-bio/ai-sci-4523-add-assign-items-to-task 
Add assign items modal and update modal for task inventories [SCI-4523][SCI-4524]
 2020-05-05 13:20:01 +02:00
aignatov-bio 85dae268fe
Merge pull request #2498 from aignatov-bio/ai-sci-4481-fix-notification-when-search-field-active 
Fix notification when search field active [SCI-4481]
 2020-05-05 12:59:32 +02:00
aignatov-bio c556fd2478
Merge pull request #2530 from aignatov-bio/ai-sci-4574-fix-css-for-results-page 
Fix CSS for results [SCI-4574]
 2020-05-05 12:58:35 +02:00
aignatov-bio f3046c8515
Merge pull request #2529 from aignatov-bio/ai-sci-4584-fix-handsone-table 
Fix Handson table for collapsed protocol section [SCI-4584]
 2020-05-05 12:58:04 +02:00
aignatov-bio cf2508c5d0
Merge pull request #2522 from aignatov-bio/ai-sci-4508-small-protocol-layout-fixes 
Small layout changes for protocol [SCI-4508]
 2020-05-05 12:57:40 +02:00
Urban Rotnik 429519e930
Merge pull request #2521 from urbanrotnik/ur-sci-4513-counter-fix 
Fix items count validation [SCI-4513]
 2020-05-05 12:31:00 +02:00
Urban Rotnik 4947255015
Merge pull request #2528 from urbanrotnik/ur-sci-4542-user-filter 
Fix for user filter in task activity page [SCI-4542]
 2020-05-05 10:25:26 +02:00
aignatov-bio 1b57040c37 Fix deepscan issues 2020-05-05 09:44:38 +02:00
aignatov-bio 8c57ed3109 Fix css for results 2020-05-02 22:37:02 +02:00
aignatov-bio 9d006aac9e Fix handson table for colapsed protocol section 2020-05-02 22:15:38 +02:00
aignatov-bio 1ed62c4a49 Fix I18n and save to repository button 2020-05-01 20:45:09 +02:00
Urban Rotnik 760c2fba8f
Merge pull request #2523 from urbanrotnik/ur-sci-4549-sidebar-fix 
Fix icon position and hover effect in repositories sidebar [SCI-4549]
 2020-04-30 09:32:20 +02:00
Urban Rotnik 1fe1b782f1 Fix for user filter in task activity page 2020-04-30 09:20:29 +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 046c9662d1 Fix markup 2020-04-28 19:16:04 +02:00
aignatov-bio 61bbca6bcf Fix path names and markup 2020-04-28 19:12:17 +02:00
Urban Rotnik 276351bbed Remove Tooltips JS code 2020-04-28 12:51:59 +02:00
aignatov-bio be8ef5a310 Add I18n 2020-04-28 12:49:19 +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
Urban Rotnik 8fa024ed10 Remove all tooltips from HTML 2020-04-28 12:30:43 +02:00
Oleksii Kriuchykhin e6ad5047e0 Implement background processing of repository snapshots [SCI-4552] 2020-04-28 12:09:36 +02:00
Urban Rotnik 9c3fb063c0 Fix counter and error showing for CheckList column type 2020-04-24 16:09:54 +02:00
aignatov-bio 0a87bd3dcf Fix markup 2020-04-24 15:48:40 +02:00
aignatov-bio ad705a740c Add new protocol template dropdown 2020-04-24 15:48:40 +02:00
aignatov-bio 0604815c00 Add assigned task dropdown to repository 2020-04-24 15:43:10 +02:00
Mojca Lorber 008ab8ab86 Remove redundant data-hook from protocol options dropdown 2020-04-24 15:10:42 +02:00
Urban Rotnik 73e5168db6 Fix icon position and hover efect in repositories sidebar 2020-04-24 14:51:32 +02:00
aignatov-bio 4f941610b2 Small layout changes for protocol 2020-04-24 11:50:03 +02:00
Urban Rotnik 6c5be802ba Fix items count validation 2020-04-24 08:45:34 +02:00
mlorb 1cea6116b5
Merge pull request #2515 from mlorb/ml-sci-4493 
Add protocol options dropdown [SCI-4493]
 2020-04-23 17:21:26 +02:00
Mojca Lorber c1138f1d26 fix font 2020-04-23 16:56:09 +02:00
Mojca Lorber ac709be364 Small fixes 2020-04-23 16:50:16 +02:00
aignatov-bio 2f7adffcb0 Fix markup 2020-04-23 16:40:14 +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
aignatov-bio c2e456aa27 Fix activities and specs 2020-04-23 15:25:28 +02:00
aignatov-bio d48997464d Fix markup 2020-04-23 15:25:28 +02:00
aignatov-bio 5b375168c0 Add I18n 2020-04-23 15:24:40 +02:00
aignatov-bio 34d6e903a4 Add assign items modal and update modal for task inventories 2020-04-23 15:24:40 +02:00
aignatov-bio 10fdd0c1c7 Merge branch 'develop' into features/new-task-layout 2020-04-23 14:07:40 +02:00
Alex Kriuchykhin 027e6d3db0
Merge pull request #2518 from okriuchykhin/ok_SCI_4544_v2 
Fix Azure AD user creation on sign in [SCI-4544]
 2020-04-23 13:18:36 +02:00
Alex Kriuchykhin 1802d7cb59
Merge pull request #2516 from okriuchykhin/ok_SCI_4525 
Add versions sidebar to assigned repository rows full view modal [SCI-4525]
 2020-04-23 13:18:23 +02:00
Urban Rotnik 38c198705c Change current_team to target team, add id param to link 2020-04-23 12:40:43 +02:00
Oleksii Kriuchykhin 06b6907d13 Handle situation when task creator or modifier is not present [SCI-4503] 2020-04-23 12:40:27 +02:00
Urban Rotnik 89b848d21d Fix value rounding for General excel type 2020-04-23 07:19:24 +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 e0d397ba77 Improve code style in repository_datatable_helper.rb [SCI-4525] 2020-04-22 15:21:04 +02:00
Oleksii Kriuchykhin 608ee23ec4 Add task details popover [SCI-4503] 2020-04-21 15:11:57 +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
Mojca Lorber 6fecee8c0c Add protocol options dropdown 2020-04-21 10:03:53 +02:00
aignatov-bio be47efce74
Merge pull request #2509 from aignatov-bio/ai-sci-4506-add-repositories-dropdown-list 
Add repositories dropdown list [SCI-4506]
 2020-04-16 14:17:17 +02:00
mlorb 9584b11d45
Merge pull request #2507 from mlorb/ml-sci-4505 
Add the user management section of to the Details section of task layout [SCI-4505]
 2020-04-16 13:47:31 +02:00
Alex Kriuchykhin 436f0bf63d
Merge pull request #2506 from okriuchykhin/ok_SCI_4516 
Add repository snapshots with service, refactor item assigning [SCI-4516]
 2020-04-15 17:32:25 +02:00
Oleksii Kriuchykhin b85c192b68 Remove duplicate method from repository [SCI-4516] 2020-04-15 14:48:26 +02:00
aignatov-bio 0d1dd74f02 Fix typo 2020-04-14 18:17:54 +02:00
Mojca Lorber e9959747d6 small refactor 2020-04-14 17:25:36 +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 f00561cc22 Fix markup 2020-04-14 13:10:13 +02:00
aignatov-bio 338f3a0192 Fix css 2020-04-14 13:08:07 +02:00
aignatov-bio 15b291347b Fix I18n 2020-04-14 12:10:17 +02:00
aignatov-bio c1cac01b28 Add repositories dropdown list 2020-04-14 12:10:16 +02:00
aignatov-bio b53ad2850a Remove old code 2020-04-09 17:31:28 +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
Mojca Lorber f22f076e6c Add the user management secion of to the Details section of task layout 2020-04-08 16:24:59 +02:00
aignatov-bio c9b59f96a8 Hide checkbox column for full view 2020-04-08 15:58:22 +02:00
aignatov-bio e4b65aaf6f Finish full view repository 2020-04-08 15:13:21 +02:00
aignatov-bio 087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +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 9dfc652580 Fix markup 2020-04-07 12:50:58 +02:00
aignatov-bio 845e8c3d6d Fix loading process 2020-04-07 12:36:01 +02:00
aignatov-bio 7fdc169ba2 Add simple view to repository table 2020-04-06 19:52:41 +02:00
aignatov-bio 2f0fd438a6
Merge pull request #2504 from aignatov-bio/ai-sci-4519-add-dashboard-mobile-view 
Add mobile view for dashboard [SCI-4519]
 2020-04-06 15:36:11 +02:00
Alex Kriuchykhin 80bf5123ec
Merge pull request #2497 from aignatov-bio/ai-sci-4472-change-due-date-wording-on-dashboard 
Change i18n for due date on current task widget [SCI-4472]
 2020-04-06 10:27:21 +02:00
Alex Kriuchykhin f92d68d192
Merge pull request #2496 from aignatov-bio/ai-sci-4471-assign-user-after-task-create 
Assign user after task created [SCI-4471]
 2020-04-06 10:25:19 +02:00
Alex Kriuchykhin 967c072dbd
Merge pull request #2500 from aignatov-bio/ai-sci-4517-fix-sidebar-when-caching 
Fix caching issue for sidebar [SCI-4517]
 2020-04-06 10:21:59 +02:00
aignatov-bio fc810b5524
Merge pull request #2503 from aignatov-bio/ai-sci-4507-add-assigned-repositories-list 
Add assigned repositories list [SCI-4507]
 2020-04-03 13:59:26 +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
Alex Kriuchykhin 3e20efcc8e
Merge pull request #2501 from aignatov-bio/ai-sci-4474-add-decimals-to-repository-api 
Add decimals to repository column API [SCI-4474]
 2020-04-03 11:45:55 +02:00
aignatov-bio f313b6ff01
Merge pull request #2492 from aignatov-bio/ai-sci-4339-refactor-login-screen 
Update css for login screen [SCI-4339]
 2020-04-02 15:47:17 +02:00
aignatov-bio 158966cc01 Add mobile view for dashboard 2020-04-02 14:58:10 +02:00
aignatov-bio 9678372dd5 Add assigned repositories list 2020-04-02 12:05:07 +02:00
aignatov-bio af02201b43 Add decimals to repository column API 2020-04-01 13:29:21 +02:00
Mojca Lorber cb554e815a Add new task layout details section 2020-04-01 13:05:35 +02:00
Oleksii Kriuchykhin 3c8a149cf4 Fix task start date placement on report element [SCI-4504] 2020-04-01 11:06:27 +02:00
aignatov-bio 5705bd8497 Fix caching issue for sidebar 2020-03-31 22:12:38 +02:00
Oleksii Kriuchykhin 15a793a343 Fix start date interpolation in reports [SCI-4504] 2020-03-31 18:44:43 +02:00
Oleksii Kriuchykhin 3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
Mojca Lorber bd177f4f2f Renaming fixes 2020-03-31 11:22:53 +02:00
aignatov-bio 5eebf3b46b Fix notification when search field active 2020-03-30 15:46:35 +02:00
aignatov-bio 230099ac82 Change i18n for due date on current task widget 2020-03-30 15:30:52 +02:00
aignatov-bio 4c33abff05 Assign user after task created 2020-03-30 15:16:14 +02:00
mlorb ea6eb0cace
Merge branch 'features/new-task-layout' into ml-sci-4483-sci-4486 2020-03-30 14:27:35 +02:00
aignatov-bio 10bd1d425d Fix placeholder for tinymce description fields 2020-03-30 13:22:34 +02:00
Mojca Lorber 7006036626 Add new task general layout and add notes section 2020-03-30 12:51:35 +02:00
aignatov-bio d48e8dfeac Fix markup 2020-03-30 12:05:30 +02:00
Alex Kriuchykhin 92279d07ad
Merge pull request #2437 from aignatov-bio/ai-sci-4380-saving-navigation-state 
Refactor sidebar [SCI-4380]
 2020-03-30 09:56:51 +02:00
Alex Kriuchykhin 4fe3d9f3a7
Merge pull request #2414 from aignatov-bio/ai-sci-4134-auto-open-tiny-mce-if-unsaved-data 
Open unsaved TinyMce editor [SCI-4134]
 2020-03-30 09:50:32 +02:00
aignatov-bio 1551197c06 Move constants to separate file 2020-03-27 11:12:38 +01:00
aignatov-bio b9e81f208d Fix i18n 2020-03-27 10:34:06 +01:00
aignatov-bio 8ff4b540e2 Update css for login screen 2020-03-27 09:43:49 +01:00
aignatov-bio ab6001c068 Fix scroll 2020-03-25 12:56:01 +01:00
aignatov-bio a7e4083ef1 Fix team dropdown 2020-03-25 12:31:47 +01:00
aignatov-bio 948034e3d4
Merge pull request #2488 from aignatov-bio/ai-sci-4494-fix-calendar-safari-issue 
Calendar CSS safari fix [SCI-4494]
 2020-03-24 21:55:40 +01:00
Miha Mencin be8e18110d
Merge pull request #2481 from mlorb/ml-sci-4344 
Fix tooltips appear wrongly [SCI-4344]
 2020-03-24 19:43:34 +01:00
Miha Mencin 89e4a73fbb
Merge pull request #2487 from aignatov-bio/ai-sci-4464-fix-timezone-when-import-datetime 
Fix timezone when import datetime [SCI-4464]
 2020-03-24 19:42:48 +01:00
Alex Kriuchykhin 08b53e7735
Merge pull request #2484 from biosistemika/ai-sci-4424-teams-dropdown-appears-everytime 
Teams dropdown appears every time [SCI-4424]
 2020-03-24 19:19:15 +01:00
aignatov-bio 4052ec1c67 Calendar CSS safari fix 2020-03-24 18:44:09 +01:00
aignatov-bio 6bdd45e7b7 Fix timezone when import datetime 2020-03-24 17:45:09 +01:00
aignatov-bio d62ec81472
Merge pull request #2478 from aignatov-bio/ai-sci-4449-fix-new-protocol-report-dashboard 
Fix protocol and report create modals after dashboard redirect [SCI-4449]
 2020-03-24 16:38:08 +01:00
Alex Kriuchykhin bdb57fd803
Merge pull request #2486 from okriuchykhin/ok_SCI_4487 
Fix due dates on task cards in the canvas [SCI-4487]
 2020-03-24 11:39:29 +01:00
Alex Kriuchykhin 54097a26ae
Merge pull request #2479 from mlorb/ml-sci-4473 
Fix new task modal css error [SCI-4473]
 2020-03-24 10:40:36 +01:00
Oleksii Kriuchykhin f9a7d58157 Fix due dates on task cards in the canvas [SCI-4487] 2020-03-24 10:30:29 +01:00
aignatov-bio 39be0d5109
Merge pull request #2480 from aignatov-bio/ai-sci-4457-fix-padding-dashboard-current-list 
Fix padding for current tasks widget [SCI-4457]
 2020-03-24 09:52:58 +01:00
Alex Kriuchykhin 1ae2e93a85
Merge pull request #2485 from mlorb/ml-sci-4478 
Disable selecting range at update column [SCI-4478]
 2020-03-24 09:28:45 +01:00
Mojca Lorber 3a58bd3cd6 Disable selecting range at update column 2020-03-23 20:02:57 +01:00
aignatov-bio 5004270c22 Teams dropdown apears everytime 2020-03-23 19:42:36 +01:00
Oleksii Kriuchykhin c5dd572e8e Fix annotation notifications for inventory rows [SCI-4469] 2020-03-23 18:45:36 +01:00
Oleksii Kriuchykhin 4db810c18f Fix taken space display for teams [SCI-4479] 2020-03-23 16:32:05 +01:00
Mojca Lorber 9045d1a8de Fix tooltips appear wrongly 2020-03-22 17:47:13 +01:00