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

257 commits

Author SHA1 Message Date
Mojca Lorber 2a8c98b7ec Implement ESC button to exit full-screen modals 2020-11-24 23:20:53 +01:00
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
Oleksii Kriuchykhin 40ab03c38d Fix cucumber tests for table results [SCI-5047] 2020-11-04 16:46:18 +01:00
Mojca Lorber 8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
aignatov-bio c56f7912ef Update file preview 2020-10-29 14:23:32 +01:00
Mojca Lorber ec41bdd414 Move open mobile app button to main navigation 2020-10-26 09:28:44 +01:00
Mojca Lorber 6d7b55301f Fix pwa url and change when banner is displayed 2020-10-21 14:56:20 +02:00
Mojca Lorber 23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +02:00
Mojca Lorber 94fea75fda Fix at long inventory name snapshot in title is not visible 2020-09-24 17:19:41 +02:00
aignatov-bio ff33cb45e0 Improve smart annotation in TinyMCE fields 2020-09-24 13:29:20 +02:00
aignatov-bio 2d667acdd1 Prevent tinymce edit mode when link click 2020-09-22 10:56:40 +02:00
Urban Rotnik 0ae39678d4
Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state 
Add error message for locked task, update some permission checks[SCI-4982]
 2020-09-09 14:04:08 +02:00
Urban Rotnik aa88b6bdb4 Move redirect to controller 2020-09-09 11:26:43 +02:00
Urban Rotnik d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
Mojca Lorber 9dac4079f8 Replace old arrow with new one and remove redundant javascript for arrow collapsing 2020-09-04 14:43:30 +02:00
Urban Rotnik 5923a4c014 Merge branch 'develop' into features/task-flows 2020-08-25 15:30:22 +02:00
Urban Rotnik b6495becdb Set stateDuration to 0 2020-08-24 15:51:35 +02:00
Urban Rotnik 7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
Urban Rotnik cce76f6f0f
Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults 
Add ordering for result page [SCI-4895]
 2020-08-04 11:17:43 +02:00
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 68fc6ec58a Add sorting my module statuses 2020-07-27 16:36:21 +02:00
aignatov-bio 6bd12e0397 Add modal for status flow 2020-07-27 13:48:21 +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
Mojca Lorber 39ae1ed25e Fix search status 2020-07-10 12:52:07 +02:00
Mojca Lorber 21f0d431b0 Remove search state load from repositories table 2020-07-10 11:05:22 +02:00
Miha Mencin 2cb3720602
Merge pull request #2720 from aignatov-bio/ai-sci-4842-snapshot-archived-label-wrong-position 
Add archived label to correct column [SCI-4842]
 2020-07-09 14:49:54 +02:00
aignatov-bio c240474f76 Add archived label to correct column 2020-07-09 13:39:26 +02:00
Urban Rotnik d16a2ed9c9 Fix Datatable header adjustments on repositories index 2020-07-07 09:49:05 +02:00
Oleksii Kriuchykhin 7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +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 868c1c1fa0 Improve row state passing 2020-06-15 13:42:16 +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
Mojca Lorber c0c93772ff Fix protocol duplication at saving protocol from task to repository 2020-06-09 11:45:03 +02:00
aignatov-bio 368ee8a689 Show selected snapshot in sidebar 2020-05-28 15:18:26 +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 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
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 cbc578f84b Fix snapshot name column id 2020-05-22 15:10:21 +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 40b266ee0d Clear full view repository modal before open 2020-05-19 16:44:47 +02:00
Urban Rotnik ea0e97d046 Hide sidebar on modal close 2020-05-19 09:46:38 +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
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
Oleksii Kriuchykhin 8b968f6f67 Fix selection of the default snapshot on tasks [SCI-4637] 2020-05-18 11:06:42 +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
aignatov-bio 69abccbbd6 Add title for full view assign modal 2020-05-15 14:22:20 +02:00
aignatov-bio c9a9cd2e75 Remove search from state load in task repository 2020-05-14 21:49:01 +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 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
Miha Mencin 26caeed04f
increase pooling interval to 10s 2020-05-14 12:39:13 +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
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
Urban Rotnik 334da7c3ec Fix for assign view 2020-05-12 19:38:45 +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
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
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 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 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 a29db548f8 Update CSS for full view assigned rows modal 2020-05-05 18:17:14 +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 1b57040c37 Fix deepscan issues 2020-05-05 09:44:38 +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
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
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 ad705a740c Add new protocol template dropdown 2020-04-24 15:48:40 +02:00
aignatov-bio f65b50c6ff Fix rebase conflicts 2020-04-23 16:36:22 +02:00
aignatov-bio d48997464d Fix markup 2020-04-23 15:25:28 +02:00
aignatov-bio 34d6e903a4 Add assign items modal and update modal for task inventories 2020-04-23 15:24:40 +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
aignatov-bio 338f3a0192 Fix css 2020-04-14 13:08:07 +02:00
aignatov-bio c1cac01b28 Add repositories dropdown list 2020-04-14 12:10:16 +02:00
aignatov-bio fe718349da Add recent protocol tab to load protocal from repository 2020-04-09 17:29:39 +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
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 b188b0511b Refactor TinyMCE autosave check 2020-03-19 15:45:14 +01:00
Oleksii Kriuchykhin 49e1e67231 Fix JS condition [SCI-4321] 2020-02-07 15:54:57 +01:00
Oleksii Kriuchykhin 5470bb9b9b Fix file result only name update [SCI-4321] 2020-02-07 15:21:50 +01:00