Commit graph

505 commits

Author SHA1 Message Date
Urban Rotnik cce76f6f0f
Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults
Add ordering for result page [SCI-4895]
2020-08-04 11:17:43 +02:00
Urban Rotnik ac3c06d882
Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items
Add export for assigned items [SCI-4748]
2020-08-03 11:30:31 +02:00
aignatov-bio 15b5f9bb68 Add ordering for result page 2020-07-28 15:39:29 +02:00
aignatov-bio 1d3055011f Merge branch 'features/tinymce-tables' into develop 2020-07-22 13:41:43 +02:00
aignatov-bio e69e3ea8d3 Add export for assigned items 2020-07-17 15:17:09 +02:00
Mojca Lorber 9464d2753d Fix naming of filter field for repositories tables 2020-07-15 10:52:47 +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 630bef1adf Add special characters to smart annotation 2020-06-29 14:47:35 +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
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
Urban Rotnik 193375818e Disable checkboxes for shared inventories 2020-06-24 13:41:00 +02:00
aignatov-bio 6f2d5b359e Add action buttons to repository index 2020-06-19 15:54:45 +02:00
aignatov-bio 7f9af06f78 Fix dropdown position for full screen modals 2020-06-18 13:29:28 +02:00
aignatov-bio 2b9062ac92 Add checkbox selector to datatable 2020-06-09 13:16:50 +02:00
aignatov-bio 15de84ff2f Not include marvinJS library, if marvinJS disabled 2020-06-08 09:59:26 +02:00
Urban Rotnik 9d96baf008 Escape special chars for FE and BE 2020-06-02 15:16:01 +02:00
Urban Rotnik 4fc37e12a0 Fix dropdown render for columns manage modal 2020-06-01 18:41:58 +02:00
aignatov-bio f7a215c953 Fix escape issue in dropdowns 2020-05-28 10:55:36 +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 8161bbb31c Fix new comment field 2020-05-22 16:51:11 +02:00
aignatov-bio 3287070df7 Improve search through assigned tasks 2020-05-22 14:36:28 +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 820514789d Update tinymce gem version 2020-05-17 17:36:26 +02:00
Urban Rotnik a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +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 cbaaa7413c Fix smart annotation position for horizontal scroll 2020-05-13 12:45:22 +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 dad5ac7a27 Fix snapshot button place 2020-05-07 19:36:30 +02:00
Urban Rotnik 276351bbed Remove Tooltips JS code 2020-04-28 12:51:59 +02:00
aignatov-bio b9c5089c2b Add search to assigned tasks dropdown 2020-04-28 12:41:59 +02:00
aignatov-bio 087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +02:00
aignatov-bio 37304df878 Fix markup 2020-03-19 15:48:45 +01:00
aignatov-bio b188b0511b Refactor TinyMCE autosave check 2020-03-19 15:45:14 +01:00
aignatov-bio 1d02ba5ebf Open unsaved TinyMce editor 2020-03-18 16:03:36 +01:00
Alex Kriuchykhin 2a2e479cd3
Merge pull request #2470 from okriuchykhin/ok_SCI_4408
Enable time fraction for task due date [SCI-4408]
2020-03-16 18:55:10 +01:00
Oleksii Kriuchykhin a518bfe023 Enable time fraction for task due date [SCI-4408] 2020-03-16 17:55:35 +01:00
aignatov-bio b9a0fb47de Add total size validation check to result files 2020-03-12 11:50:31 +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
Miha Mencin 26b687f2e6
Merge pull request #2460 from biosistemika/features/dashboard
Features/dashboard
2020-03-10 18:06:23 +01:00
Miha Mencin 9836a8b5a2
Merge pull request #2434 from aignatov-bio/ai-sci-4352-inventory-item-is-not-saved-in-case-of-empty-dropdown
Prevent create empty dropdown in inventories [SCI-4352]
2020-03-10 12:35:00 +01:00
Alex Kriuchykhin 769ba76afa
Merge pull request #2445 from okriuchykhin/ok_SCI_4379
Improve file upload checks [SCI-4382]
2020-03-10 09:47:23 +01:00
Miha Mencin 62b934f012 Merge branch 'develop' into features/dashboard 2020-03-09 09:56:32 +01:00
aignatov-bio e729aa043e Add recent work widget 2020-03-06 13:51:18 +01:00
aignatov-bio 7d7cdce91a Add file size limitation to tinyMCE 2020-03-03 15:55:17 +01:00
Oleksii Kriuchykhin 11a5536af5 Improve file upload checks [SCI-4382] 2020-03-03 15:26:40 +01:00