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

2657 commits

Author SHA1 Message Date
Urban Rotnik 193375818e Disable checkboxes for shared inventories 2020-06-24 13:41:00 +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
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 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
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 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 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 6e8062179c Implement archiving and restoring of whole inventories 2020-06-18 18:07:23 +02:00
aignatov-bio 323929b270 Add restore/delete buttons 2020-06-18 14:09:29 +02:00
aignatov-bio 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 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
aignatov-bio 7f9af06f78 Fix dropdown position for full screen modals 2020-06-18 13:29:28 +02:00
aignatov-bio e8ea8b5b3f Fix long inventory name issue on task page 2020-06-17 15:08:07 +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
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 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
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
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
aignatov-bio 15de84ff2f Not include marvinJS library, if marvinJS disabled 2020-06-08 09:59:26 +02:00
Oleksii Kriuchykhin 85ce72e5ff Remove obsolete JS functions from repositories datatable [SCI-4571] 2020-06-05 11:15:58 +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
aignatov-bio 012b7b3d23 Add switch for active/archive repository view 2020-06-04 18:41:45 +02:00
Oleksii Kriuchykhin 48865c8cea Clear the obsolete code for assiging inventory items to the task [SCI-4571] 2020-06-03 22:54:45 +02:00
Urban Rotnik 9d96baf008 Escape special chars for FE and BE 2020-06-02 15:16:01 +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
aignatov-bio 3294840611 Fix sidebar event 2020-06-01 14:45:03 +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
aignatov-bio 1430ca5ae9 Fix shared inventory icon 2020-05-29 13:17: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
aignatov-bio 7f0d43209e Small css fixes 2020-05-28 16:04:21 +02:00
aignatov-bio 368ee8a689 Show selected snapshot in sidebar 2020-05-28 15:18:26 +02:00
aignatov-bio f7a215c953 Fix escape issue in dropdowns 2020-05-28 10:55:36 +02:00
aignatov-bio 32c1f4af84 Fix forgot password link margin 2020-05-27 12:55:15 +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
aignatov-bio 73c7ff47a5 Fix z-index for full view modal 2020-05-26 12:41:07 +02:00
aignatov-bio f86b71144d Resize simple table header on sidebar collapse 2020-05-25 16:21:28 +02:00
Mojca Lorber 76a1f73989 Change order of snapshots versions 2020-05-25 12:15:24 +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
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
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
Mojca Lorber 12982260b7 Fix css hover effects 2020-05-21 08:37:40 +02:00
Oleksii Kriuchykhin f2043f111b Change display of the live version for a deleted inventory [SCI-4659] 2020-05-20 21:50:39 +02:00
aignatov-bio d16930e987 Add private tasks to assigned task list 2020-05-20 17:23:48 +02:00
Mojca Lorber e2959fec32 Merge branch 'develop' into ml-sci-4582 2020-05-20 10:37:33 +02:00
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
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
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
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
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 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
Mojca Lorber 4c15c89cf5 Add New Task layout Collapsed/Expanded States saving 2020-05-15 00:49:23 +02:00
aignatov-bio c9a9cd2e75 Remove search from state load in task repository 2020-05-14 21:49:01 +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 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
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
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 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 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
aignatov-bio f94ea51ecb Small snapshot css corrections 2020-05-10 13:08:19 +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 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 e9c54f10fb Fix markup 2020-05-08 11:58:40 +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 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 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 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
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
aignatov-bio 4e5ebd01b5 Fix I18n 2020-05-06 12:20:20 +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