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

6991 commits

Author SHA1 Message Date
Oleksii Kriuchykhin f150a11c4f Archiving: add 'archived' flag on folder [SCI-5268] 2020-12-17 12:47:23 +01:00
Oleksii Kriuchykhin 0c65f3f7c2 Implement sorting on the project screen (when filterin/searching) [SCI-5281] 2020-12-17 12:43:09 +01:00
Miha Mencin ba3db65437
Merge pull request #3008 from okriuchykhin/ok_SCI_5273 
Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]
 2020-12-17 09:44:40 +01:00
Miha Mencin ea9f3dcada
Merge pull request #2996 from okriuchykhin/ok_SCI_5253 
Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253]
 2020-12-17 09:17:44 +01:00
Urban Rotnik 2d4b0fdbdc
Merge pull request #3010 from urbanrotnik/ur-sci-5294-remove-editing-options-of-archived-results 
Refactor result permissions [SCI-5294]
 2020-12-17 06:17:18 +01:00
aignatov-bio 329a5bff0b
Fix repository text field rendering [SCI-5304] (#3015) 2020-12-15 12:23:19 +01:00
Urban Rotnik a4fd69c292 Add 'archived' to smart annotation for repository item 2020-12-15 07:36:49 +01:00
Urban Rotnik c7c6e2d0f2 Fix cursor on SmartAnnotation 2020-12-14 17:29:30 +01:00
aignatov-bio 30cfe78805
Add edit modal for project folders [SCI-5265] (#3002) 
Add edit modal for project folders [SCI-5265]
 2020-12-14 15:54:18 +01:00
Urban Rotnik ad8cf8a1fa Refactor result permissions 2020-12-14 12:50:54 +01:00
Oleksii Kriuchykhin 94b6c96e48 Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273] 2020-12-12 22:46:30 +01:00
Urban Rotnik 398978c69a Connect users modal to projects index page 2020-12-11 13:07:45 +01:00
Mojca Lorber 5cdab422df Update layout of the navigation for experiments, tasks list and task page 2020-12-10 15:15:36 +01:00
Urban Rotnik 207659a2c1 Fix markup [SCI-5266] 2020-12-10 13:36:38 +01:00
Urban Rotnik 152990b4d6 Add archived mode for Projects 
[SCI-5266]
 2020-12-09 08:51:55 +01:00
aignatov-bio 6a44e23697
Add projects sidebar [SCI-5178] (#2995) 
* Add projects sidebar navigation [SCI-5178]
 2020-12-08 16:07:26 +01:00
aignatov-bio a32a2f28d3 Fix permission for assets in results 2020-12-08 15:31:57 +01:00
aignatov-bio 188013dd56 Change permission for sorting in steps and asset view [SCI-5289] 2020-12-08 10:45:43 +01:00
Oleksii Kriuchykhin 62374bee0a Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253] 2020-12-07 11:04:33 +01:00
Urban Rotnik 1332ad2fcd Fix project creation activity [SCI-5181] 2020-12-04 14:13:43 +01:00
Urban Rotnik 342eb34925
Merge pull request #2994 from aignatov-bio/ai-sci-5285-fix-protocol-revert-from-repository 
Fix protocol revert from repository [SCI-5285]
 2020-12-04 12:25:36 +01:00
aignatov-bio 568fcb20df Fix protocol revert from repository [SCI-5285] 2020-12-04 12:07:25 +01:00
Urban Rotnik 7773afbcdb Add activities for Project Folders [SCI-5181] 2020-12-04 12:03:49 +01:00
aignatov-bio 6bd021d88a
Add gallery view after image update [SCI-5286] (#2993) 
* Add gallery view after image update [SCI-5286]
 2020-12-04 11:47:24 +01:00
Alex Kriuchykhin 7a4f60f25e
Merge pull request #2989 from mlorb/ml-sci-5240 
[SCI-5240] Implement Create new folder function
 2020-12-04 09:57:05 +01:00
mlorb 9693f84bbd
Implement actions dropdown on project card [SCI-5132] [SCI-5179] (#2968) 
* Implement actions dropdown on project card
* make comments counter to work
 2020-12-04 09:38:34 +01:00
aignatov-bio edd774b045
Merge pull request #2992 from aignatov-bio/ai-sci-fix-asset-link-partial-in-item-card 
Fix asset link partial in item card
 2020-12-03 13:19:30 +01:00
Mojca Lorber bdc8cfc5d5 Fix merging 2020-12-03 13:04:55 +01:00
aignatov-bio e6e9c84a7c Fix asset link partial in item card 2020-12-03 12:58:54 +01:00
Mojca Lorber d9fdb20a99 Fix hound 2020-12-03 12:57:45 +01:00
Mojca Lorber 9253cf5ade Change javascript for modal handeling and some other small fixes 2020-12-03 12:53:19 +01:00
mlorb 74f0f0474a
Merge branch 'features/folders' into ml-sci-5240 2020-12-03 12:50:19 +01:00
Urban Rotnik 478d43f9ce
Merge pull request #2987 from urbanrotnik/ur-sci-5208 
Projects cards and list view with filters  [SCI-5208]
 2020-12-03 12:30:37 +01:00
Urban Rotnik 3700faa04a Update proejcts grid, include breadcrumbs, fix JS 
[SCI-5208]
 2020-12-03 12:29:28 +01:00
aignatov-bio c43851a2f4 Fix download links in reports [SCI-5279] 2020-12-03 12:16:48 +01:00
Oleksii Kriuchykhin dc15accc86 Update sidebar usages in partials [SCI-5177] 2020-12-03 10:21:53 +01:00
Oleksii Kriuchykhin 9546b8f71d Prepare backend for the improved navigation [SCI-5177] 2020-12-03 10:19:11 +01:00
Alex Kriuchykhin 92d579ab8e
Merge pull request #2935 from okriuchykhin/ok_SCI_5135 
Generate backend for moving the projects and folders [SCI-5135]
 2020-12-02 14:59:01 +01:00
Urban Rotnik 87b5552b27 Add equals team validations for project and folder 2020-12-02 14:53:46 +01:00
Urban Rotnik df2b8ab3df Remove jsonapi_parameters gem, accept rails params in controller 2020-12-02 13:15:49 +01:00
Urban Rotnik 7c1a0a9044 Add projects to project_folder serializer 2020-12-02 13:15:49 +01:00
Urban Rotnik 97733498d9 Include project_folders at Projects API endpoints 2020-12-02 13:15:48 +01:00
Urban Rotnik a4fc01d595 Add jsonapi_parameters gem, use relationships for parent_folder relation 2020-12-02 13:15:48 +01:00
Urban Rotnik 088fa79874 Add Project Folders API endpoints 2020-12-02 13:15:48 +01:00
Oleksii Kriuchykhin dfce57d481 Generate backend for moving the projects and folders [SCI-5135] 2020-12-02 12:11:01 +01:00
aignatov-bio a27c78e445
Merge pull request #2988 from aignatov-bio/ai-sci-5260-add-direction-condition-for-status-consequences 
Add direction condition for status consequences [SCI-5260]
 2020-12-01 16:14:31 +01:00
aignatov-bio d1af011c0c [SCI-5260] Fix markup 2020-12-01 15:10:28 +01:00
aignatov-bio 04624692d3 [SCI-5260] Add afterward and backward actions to consequence 2020-12-01 15:07:01 +01:00
Urban Rotnik 13d157d1c7
Merge pull request #2983 from urbanrotnik/ur-sci-5252-technician-can-not-complete-step 
Remove manage permissions check from step toggle [SCI-5252]
 2020-12-01 13:37:40 +01:00
Mojca Lorber d7e3b57d0d [SCI-5240] Implement Create new folder function 2020-12-01 09:59:08 +01:00
Alex Kriuchykhin 7b17d9d54d
Merge pull request #2971 from okriuchykhin/ok_SCI_5238 
Improve limit check for repository list and checklist items [SCI-5238]
 2020-11-30 19:59:46 +01:00
aignatov-bio ad960d801d [SCI-5260] Fix markup 2020-11-30 15:20:02 +01:00
aignatov-bio 99ad705d82 [SCI-5260] Fix markup 2020-11-30 15:18:46 +01:00
aignatov-bio 0620da99de [SCI-5260] Add direction condition for status consequences 2020-11-30 12:28:29 +01:00
aignatov-bio 48184df312
Merge pull request #2985 from aignatov-bio/ai-sci-5250-add-preview-to-export-all 
Add preview files to export all [SCI-5250]
 2020-11-30 12:21:43 +01:00
aignatov-bio f92f65b74b
Merge pull request #2986 from aignatov-bio/ai-sci-5256-add-h6-render-to-docx-report 
Add h6 render to docx report [SCI-5256]
 2020-11-30 10:22:49 +01:00
Oleksii Kriuchykhin 8ee1580ae4 Fix tests for repository list and checklist items [SCI-5238] 2020-11-27 14:59:17 +01:00
Oleksii Kriuchykhin 78e050ccc0 Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171] 2020-11-27 14:27:24 +01:00
aignatov-bio 8245f18076 Add h6 render to docx report 2020-11-27 13:33:44 +01:00
Urban Rotnik fcb82fd0d2
Merge pull request #2984 from okriuchykhin/ok_SCI_5204 
Project filters: add text field to the filters [SCI-5204]
 2020-11-27 12:04:46 +01:00
Urban Rotnik dc9fae6af0 Remove manage permissions check from step toggle 2020-11-27 11:37:39 +01:00
aignatov-bio 8cdf09f244 Add preview files to export all 2020-11-27 11:07:37 +01:00
Alex Kriuchykhin 80a53e14c2
Merge pull request #2966 from okriuchykhin/ok_SCI_5235 
Fix permission check for archived tasks [SCI-5235]
 2020-11-27 10:46:25 +01:00
Oleksii Kriuchykhin 1553d32c6e Project filters: add text field to the filters [SCI-5204] 2020-11-26 21:29:45 +01:00
aignatov-bio d162fb6d35
Merge pull request #2980 from aignatov-bio/ai-sci-5241-add-confirmation-for-file-delete 
Add delete asset confirmation modal [SCI-5241]
 2020-11-26 15:35:40 +01:00
aignatov-bio c6f4d23a78 Fix protocol preview file background 2020-11-26 15:35:06 +01:00
aignatov-bio fbc7822bfe Add ability to close modal by esc 2020-11-26 14:51:10 +01:00
aignatov-bio 60359b595c Add button disabling 2020-11-26 14:37:12 +01:00
aignatov-bio b0ebdceb08 Fix typo 2020-11-26 14:04:26 +01:00
Urban Rotnik 85b22cd486 Fix syntax 2020-11-26 12:31:45 +01:00
Urban Rotnik efd4f8abde Add members dropdown on project filters flyout 2020-11-26 12:29:43 +01:00
aignatov-bio 26cbe2105f
Merge pull request #2981 from aignatov-bio/ai-sci-5242-small-css-file-preview-issues 
Small file preview css fixes  [SCI-5242]
 2020-11-26 11:50:25 +01:00
aignatov-bio d13ff053b5
Merge pull request #2960 from aignatov-bio/ai-sci-5228-fix-sorting-of-assets-in-reports 
Fix assets sorting in report [SCI-5228]
 2020-11-26 11:46:50 +01:00
Alex Kriuchykhin 5a1f169846
Merge pull request #2978 from urbanrotnik/ur-sci-5244-folders-projects-sorting 
Project and folders sorting [SCI-5244]
 2020-11-26 11:42:29 +01:00
Urban Rotnik 34fbcb8f56 Add clear functionallity to projects filters 2020-11-26 09:23:22 +01:00
Urban Rotnik be49216e71 Fix teams tests 2020-11-25 20:02:45 +01:00
Urban Rotnik e3f9087600 Fix search 2020-11-25 19:33:12 +01:00
Urban Rotnik 5717e37f2b Remove obsolete code, fix tests 2020-11-25 18:34:46 +01:00
Urban Rotnik afc6d12b49 Project and folders sorting 2020-11-25 18:34:39 +01:00
aignatov-bio 3078e60867 Small css fixes 2020-11-25 16:25:17 +01:00
aignatov-bio c212d514d5 Fix delete asset in protocol repository 2020-11-25 13:13:06 +01:00
aignatov-bio 1979883004 Add delete asset confirmation modal 2020-11-25 12:50:34 +01:00
Oleksii Kriuchykhin 0de237cece Implement project search with grouping by folder [SCI-5207] 2020-11-25 11:59:02 +01:00
Mojca Lorber 81798a96ad Add new SciNote avatars 2020-11-25 10:43:59 +01:00
mlorb e4001dd406
Merge pull request #2977 from mlorb/ml-sci-5048 
Implement ESC button to exit full-screen modals [SCI-5048]
 2020-11-25 09:55:16 +01:00
Mojca Lorber 2a8c98b7ec Implement ESC button to exit full-screen modals 2020-11-24 23:20:53 +01:00
aignatov-bio f2ca55dbf8 Add new icons for assets 2020-11-24 15:37:45 +01:00
aignatov-bio dc62e2780a
Merge pull request #2963 from aignatov-bio/ai-sci-5186-add-new-comments-layout 
Add comments sidebar layout [SCI-5186][SCI-5188][SCI-5189]
 2020-11-24 11:25:36 +01:00
aignatov-bio 966bb7c9ed
Merge pull request #2972 from aignatov-bio/ai-sci-5229-replce-loading-spinner-with-new 
Replace loading spinner [SCI-5229]
 2020-11-23 16:32:49 +01:00
aignatov-bio ba39d8d31b Fix markup 2020-11-23 15:02:50 +01:00
aignatov-bio 624e9b1f82 Small fixes on current task dashboard 2020-11-23 14:29:04 +01:00
aignatov-bio 84d681ecce Replace loading spinner 2020-11-23 14:14:54 +01:00
Alex Kriuchykhin 1380d5873d
Merge pull request #2946 from okriuchykhin/ok_SCI_5136 
Implement search endpoint for Projects & folders search [SCI-5136]
 2020-11-23 13:09:33 +01:00
Oleksii Kriuchykhin 1a38b34b94 Improve limit check for repository list and checklist items [SCI-5238] 2020-11-23 12:54:29 +01:00
aignatov-bio 833c327e3a Fix empty state during loading 2020-11-23 12:44:23 +01:00
Mojca Lorber c57da3380f Remove complete step button from protocol step and fix step number in Firefox 2020-11-23 10:18:27 +01:00
aignatov-bio 2449f2b500 Fix smart annotation for comments 2020-11-21 12:34:36 +01:00
aignatov-bio 77b7b1b231 Add errors handling and i18n 2020-11-21 12:31:49 +01:00
aignatov-bio 60ce51149d Add CRUD to comments 2020-11-20 20:25:28 +01:00
Oleksii Kriuchykhin eafc4cf367 Fix permission check for archived tasks [SCI-5235] 2020-11-20 14:39:17 +01:00
aignatov-bio da4b8aaf2f Add comments list 2020-11-20 12:29:40 +01:00
Oleksii Kriuchykhin 86e5078622 Add project folders to global search [SCI-5180] 2020-11-20 11:10:03 +01:00
Alex Kriuchykhin f5860397f5
Merge pull request #2953 from okriuchykhin/ok_SCI_5183 
Make folders selectable for 'Export all' functionality [SCI-5183]
 2020-11-20 09:54:53 +01:00
Oleksii Kriuchykhin 4dc3473c5e Fix showing/hiding export button on folder selection [SCI-5183] 2020-11-19 15:50:43 +01:00
aignatov-bio bc5221d4a7
Merge pull request #2959 from aignatov-bio/ai-sci-5225-fix-links-in-report 
Add scinote link to PDF reports [SCI-5225]
 2020-11-19 12:20:32 +01:00
aignatov-bio 96bf3dcea2
Merge pull request #2958 from aignatov-bio/ai-sci-5224-update-title-font-color-for-asset-dropdown 
Update title font color for asset dropdown [SCI-5224]
 2020-11-19 12:20:20 +01:00
aignatov-bio e4e5fc8474
Merge pull request #2944 from aignatov-bio/ai-sci-5058-fix-smart-annotation-for-archived-projects 
Fix smart annotation for archived experiments [SCI-5058]
 2020-11-19 11:18:26 +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
mlorb cd4252e254
Merge pull request #2956 from mlorb/ml-sci-5041 
Fix tooltip display when editing inventory row [SCI-5041]
 2020-11-19 11:01:23 +01:00
Urban Rotnik aba0034854 Convert some values to ems 2020-11-19 09:25:26 +01:00
Urban Rotnik e893d40eea Add filters flyout for projects 2020-11-19 09:23:35 +01:00
aignatov-bio 2294d396f9 Add comments sidebar layout 2020-11-18 16:26:01 +01:00
aignatov-bio 6bb4af1d95
Merge pull request #2961 from aignatov-bio/ai-sci-5231-fix-protocol-import-from-protocol-io 
Fix protocol import from protocol.io [SCI-5231]
 2020-11-18 10:06:06 +01:00
aignatov-bio 3a2b36369a Fix protocol import from protocol.io 2020-11-18 09:57:50 +01:00
aignatov-bio fcdad51222 Fix assets sorting in report 2020-11-17 15:33:25 +01:00
aignatov-bio 2947426b44 Add scinote link to pdf reports 2020-11-17 13:54:13 +01:00
aignatov-bio 14ccb5c6a6 Update title font color for asset dropdown 2020-11-17 12:47:45 +01:00
Mojca Lorber ceb0923ce6 Fix tooltip display when editing inventory row 2020-11-16 16:16:47 +01:00
miha ef880d8373 SCI-5223 return the missing method into controller 2020-11-16 15:49:26 +01:00
Oleksii Kriuchykhin 6dfeae2283 Make folders selectable for 'Export all' functionality [SCI-5183] 2020-11-13 14:39:10 +01:00
aignatov-bio 80d6e5e87c Add project folders to team import/export 2020-11-13 14:13:26 +01:00
aignatov-bio b5999e27de
Merge pull request #2951 from biosistemika/ai-sci-5214-fix-office-online-authorization-issue 
Fix wopi authorization issues [SCI-5214]
 2020-11-13 11:31:33 +01:00
aignatov-bio 45efc9a43a Remove skip asset permission check for wopi creation 2020-11-12 14:13:30 +01:00
aignatov-bio 6c305011ca Update dashboard placeholders 2020-11-12 12:49:00 +01:00
aignatov-bio 7fd7c2de6a Add download link to reports 2020-11-11 15:48:00 +01:00
Mojca Lorber aadbff94ae Fix double init 2020-11-11 11:07:43 +01:00
Mojca Lorber 1618d79144 Merge branch 'develop' into ml-sci-5152 2020-11-11 10:47:43 +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
Miha Mencin 1cfb205df7
Merge pull request #2939 from aignatov-bio/ai-sci-5122-fix-navigation-on-small-screens 
Fix navigation on small screens [SCI-5122]
 2020-11-11 10:22:12 +01:00
Oleksii Kriuchykhin 038cd8d5d7 Fix repository state columns handling [SCI-5190] 2020-11-10 17:24:04 +01:00
aignatov-bio 71ddf680b2 Add highlight to report table 2020-11-10 15:15:18 +01:00
mlorb a71e8ef9cf
Merge pull request #2940 from mlorb/ml-sci-5034 
Expose the new step button on task [SCI-5034]
 2020-11-10 13:10:55 +01:00
Oleksii Kriuchykhin ee1bcd7aac Implement search endpoint for Projects & folders search [SCI-5136] 2020-11-09 16:16:09 +01:00
Urban Rotnik 0f5bf45cf6 Rebase, add toolbar, minor fixes css and JS 2020-11-06 13:56:21 +01:00
Urban Rotnik 9f12c5f343 New cards and list layout 2020-11-06 13:01:52 +01:00
Urban Rotnik a06f421c88
Merge pull request #2941 from urbanrotnik/ur-sci-5124 
Fix teams query [SCI-5124]
 2020-11-06 12:08:54 +01:00
aignatov-bio f3dd749c1d Fix smart annotation for archived experiments 2020-11-06 11:47:18 +01:00
Oleksii Kriuchykhin f2f08a31d5 Add check for zero page size in repository states [SCI-5190] 2020-11-06 11:42:33 +01:00
Urban Rotnik 8ac59fd699 Fix acessiable_by_team scope 2020-11-06 10:43:18 +01:00
Mojca Lorber 9893e8d5c8 Add 403 error handling to current tasks dashboard widget 2020-11-06 10:39:04 +01:00
Urban Rotnik d6eef4699b
Merge pull request #2938 from aignatov-bio/ai-sci-5153-fix-dashboard-widget-overlap 
Fix dashboard small screen overlap [SCI-5153]
 2020-11-06 09:59:52 +01:00
Alex Kriuchykhin b51e92d5be
Merge pull request #2933 from okriuchykhin/ok_SCI_5047 
Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047]
 2020-11-06 09:06:37 +01:00
Mojca Lorber 8ee8f7b4d2 Expose the new step button on task 2020-11-05 16:14:40 +01:00
aignatov-bio 2c64481cda Fix navigation on small screens 2020-11-05 15:20:34 +01:00
aignatov-bio 5b22f7d301 Fix dashboard small screen overlap 2020-11-05 14:47:19 +01:00
Urban Rotnik 2c347af7bf Add data attribute to change status dropdown 2020-11-05 13:19:45 +01:00
aignatov-bio d29a62dad1 Improve markup 2020-11-05 10:41:06 +01:00
aignatov-bio e8592d911d Fix markup 2020-11-05 10:04:27 +01:00
aignatov-bio 8145a292fd Clear code and add missed I18n translation 2020-11-05 10:03:15 +01:00
aignatov-bio 99b52e5d80 Fix markup 2020-11-05 08:44:48 +01:00
Oleksii Kriuchykhin 40ab03c38d Fix cucumber tests for table results [SCI-5047] 2020-11-04 16:46:18 +01:00
Oleksii Kriuchykhin 327baafcd7 Improve CSS structure for project toolbar [SCI-5129] 2020-11-04 16:10:40 +01:00
aignatov-bio 5d0ab1f2e9 Fix markup 2020-11-04 13:32:34 +01:00
aignatov-bio 12fdea8d89 Add context menu to attahcments 2020-11-04 13:08:40 +01:00
aignatov-bio e8e9244d96 Fix I18n and double loading 2020-11-03 09:07:49 +01:00
Oleksii Kriuchykhin 8eec4e4b59 Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047] 2020-11-02 22:19:33 +01:00
aignatov-bio 0f80786433 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into ai-sci-5101-add-attachments-dropdown-to-step 2020-11-02 18:52:46 +01:00
aignatov-bio 84a7d49023 Fix markup 2020-11-02 18:51:21 +01:00
aignatov-bio f85a3493cd
Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports 
Add filer previews to reports [SCI-5110]
 2020-11-02 18:48:45 +01:00
aignatov-bio eca39a00b5 Add attachments dropdown to step 2020-11-02 18:47:08 +01:00
Mojca Lorber 8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
Oleksii Kriuchykhin 258c57870f Implement the toolbar on the Team Projects page [SCI-5129] 2020-11-02 13:28:37 +01:00
Alex Kriuchykhin 8566d56b68
Merge pull request #2928 from okriuchykhin/ok_SCI_5126 
Create database structure for project folders [SCI-5126]
 2020-11-02 11:46:15 +01:00
Urban Rotnik 2549d9deeb
Merge pull request #2929 from urbanrotnik/ur-sci-5147-generate-word-with-included-smart 
Fix SA in protocol description [SCI-5147]
 2020-11-02 09:55:40 +01:00
Mojca Lorber 04e3b67968 Change the way buttons are toggled 2020-10-30 18:47:01 +01:00
Urban Rotnik 042231469c Fix syntax 2020-10-30 13:37:59 +01:00
Urban Rotnik 1295299370 Fix SA in protocol description 2020-10-30 12:55:30 +01:00
Mojca Lorber a52315fc79 Merge branch 'develop' into ml-sci-5033 2020-10-29 18:28:25 +01:00
aignatov-bio 6193f91192 Update view mode switcher logic 2020-10-29 16:42:05 +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
aignatov-bio f51416d83a Update permission markup 2020-10-29 14:59:14 +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
aignatov-bio b0fe68553a Fix tests 2020-10-29 14:30:26 +01:00
aignatov-bio 21f584a2c4 Fix markup 2020-10-29 14:30:26 +01:00
aignatov-bio 131d487e69 Add file preview to list view 2020-10-29 14:30:26 +01:00
aignatov-bio d99e279ecc Add gallery to file preview 2020-10-29 14:30:26 +01:00
aignatov-bio c56f7912ef Update file preview 2020-10-29 14:23:32 +01:00
Urban Rotnik bb5c703696
Merge pull request #2878 from urbanrotnik/ur-sci-5040 
Support multiple file upload in TinyMCE fields [SCI-5040]
 2020-10-29 14:14:38 +01:00
Urban Rotnik f5118e5461
Merge pull request #2901 from okriuchykhin/ok_SCI_5063 
Refactor experiment workflow image generation [SCI-5063]
 2020-10-29 13:55:23 +01:00
Urban Rotnik c6a891bcea
Merge pull request #2912 from urbanrotnik/ur-sci-5091 
Add current team to smart annotations permission check [SCI-5091]
 2020-10-29 13:32:29 +01:00
Oleksii Kriuchykhin 13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +01:00
Urban Rotnik 25d050cec4 Add current team to smar annotations permission check 2020-10-29 12:17:40 +01:00
aignatov-bio 23f9fb212d
Merge pull request #2915 from aignatov-bio/ai-sci-5105-update-image-edit-modal 
Update image edit modal [SCI-5105]
 2020-10-29 09:15:32 +01:00
Urban Rotnik bf4062b7cb Refactor rescue block 2020-10-29 09:12:12 +01:00
Urban Rotnik 54f38c8ded Move validation before request 2020-10-29 08:45:55 +01:00
aignatov-bio 16249201f3 Fix markup 2020-10-28 16:44:28 +01:00
aignatov-bio 2f1217688c Add filer previews to reports 2020-10-28 16:32:22 +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
Alex Kriuchykhin 8ef5bafc1a
Revert "Init user session for devise controllers after token auth [SCI-5123]" 2020-10-27 13:20:14 +01:00
aignatov-bio bb983af42f
Merge pull request #2911 from aignatov-bio/ai-sci-4579-update-checkbox-style 
Update checkbox style at repository and protocol datatable [SCI-4579]
 2020-10-27 10:22:56 +01:00
Urban Rotnik cb9db57645
Merge pull request #2909 from urbanrotnik/ur-sci-5006 
Add lock icon to current task section on dashboard [SCI-5006]
 2020-10-27 08:20:55 +01:00
Alex Kriuchykhin 792edb62d6
Merge pull request #2919 from okriuchykhin/ok_SCI_5123 
Init user session for devise controllers after token auth [SCI-5123]
 2020-10-26 17:21:56 +01:00
Oleksii Kriuchykhin 00a2f5f41b Init user session for devise controllers after token auth [SCI-5123] 2020-10-26 16:35:49 +01:00
Urban Rotnik b94a3a6cb8 Clean up controller 2020-10-26 16:17:39 +01:00
aignatov-bio 6edcf4b099 Add size label 2020-10-26 15:10:06 +01:00
Miha Mencin 840b84aa9a
Merge pull request #2916 from okriuchykhin/ok_SCI_5139 
Add activities for step completion and checklist toggling through API [SCI-5139]
 2020-10-26 14:19:31 +01:00
mlorb b941c8c9d4
Merge pull request #2917 from mlorb/ml-sci-5119 
Move open mobile app button to main navigation [SCI-5119]
 2020-10-26 14:02:57 +01:00
Alex Kriuchykhin 050e1e0973
Merge pull request #2913 from okriuchykhin/ok_SCI_5123 
Add token authentication to Active Storage controllers [SCI-5123]
 2020-10-26 13:46:03 +01:00
Urban Rotnik 1ffc3449bf Clean up index view 2020-10-26 13:42:32 +01:00