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
Alex Kriuchykhin a8991356b5
Merge pull request #3033 from okriuchykhin/ok_SCI_5341 
Fix restore action for experiments and tasks [SCI-5341]
 2021-01-05 10:09:39 +01:00
Alex Kriuchykhin d94d344c22
Merge pull request #3046 from okriuchykhin/ok_SCI_5361 
Add default sorting to ProjectsOverviewService [SCI-5361]
 2021-01-05 10:04:53 +01:00
aignatov-bio f795d5180d
Fix file previews bugs [SCI-5284] (#3026) 2021-01-05 09:11:22 +01:00
aignatov-bio 2fe55250b9
Update settings navigation [SCI-5316] (#3028) 2021-01-05 09:11:05 +01:00
Oleksii Kriuchykhin 1c27b99ba5 Add default sorting to ProjectsOverviewService [SCI-5361] 2021-01-04 22:37:25 +01:00
Oleksii Kriuchykhin 58cce0f153 Improve task restoring and refactor flash messages [SCI-5341] 2021-01-04 17:00:23 +01:00
Urban Rotnik cd43973952 Add tooltips for users on project cards 2021-01-04 16:44:31 +01:00
Alex Kriuchykhin 163a2d1e60
Merge pull request #3042 from okriuchykhin/ok_SCI_5340 
Make active projects view default [SCI-5340]
 2021-01-04 11:56:22 +01:00
Alex Kriuchykhin e0e796c5e7
Merge pull request #3040 from okriuchykhin/ok_SCI_5328 
Fix project card menu visibility [SCI-5328]
 2021-01-04 11:55:54 +01:00
Urban Rotnik a53bfbdd33
Merge pull request #3014 from urbanrotnik/ur-sci-5283-smart-annotation-archived-link 
Add 'archived' to smart annotation for repository item [SCI-5283]
 2021-01-04 11:53:47 +01:00
Urban Rotnik 216db90e4a
Merge pull request #3013 from urbanrotnik/ur-sci-5084-smart-annotation-missing-icon 
Fix cursor on SmartAnnotation [SCI-5084]
 2021-01-04 11:18:13 +01:00
Urban Rotnik d08f17d5b5
Merge pull request #3022 from urbanrotnik/ur-sci-5288-remove-name-uniqueness 
Remove uniqueness validation on Experiment name [SCI-5288]
 2021-01-04 10:56:51 +01:00
Alex Kriuchykhin 4638e74e1e
Merge pull request #3041 from okriuchykhin/ok_SCI_5327 
Fix links in sidebar navigation [SCI-5327]
 2021-01-04 10:53:38 +01:00
Alex Kriuchykhin 15a8524a99
Merge pull request #3039 from okriuchykhin/ok_SCI_5339 
Disable comment adding for archived objects [SCI-5339]
 2021-01-04 10:53:13 +01:00
Alex Kriuchykhin 794ba8ac0a
Merge pull request #3019 from okriuchykhin/ok_SCI_4973 
Fix redirects after 2FA sign in [SCI-4973]
 2021-01-04 10:52:16 +01:00
mlorb 7b48869557
Merge pull request #3024 from mlorb/ml-sci-5293 
[SCI-5293] Remove Archived results tab on archived Task
 2021-01-04 10:25:18 +01:00
mlorb dafe8a072a
Merge pull request #3035 from mlorb/ml-sci-5095 
[SCI-5095] Change color of sidebar icons and labels
 2021-01-04 10:23:52 +01:00
mlorb aa7ddb7fbe
Merge pull request #3036 from mlorb/ml-sci-5059 
[SCI-5059] Change font size for manage columns list
 2021-01-04 10:23:22 +01:00
Oleksii Kriuchykhin ffd9132b52 Make active projects view default [SCI-5340] 2020-12-31 16:00:26 +01:00
Oleksii Kriuchykhin 8f0a3fb61c Fix links in sidebar navigation [SCI-5327] 2020-12-30 22:49:02 +01:00
Oleksii Kriuchykhin 49dc56caf2 Fix project card menu visibility [SCI-5328] 2020-12-30 22:17:04 +01:00
Oleksii Kriuchykhin 738f668ba9 Disable comment adding for archived objects [SCI-5339] 2020-12-30 11:46:56 +01:00
Mojca Lorber bd49e277cc [SCI-5059] Change font size for manage columns list 2020-12-29 11:27:52 +01:00
Mojca Lorber 80b472aba0 [SCI-5095] Change color of sidebar icons and labels 2020-12-29 11:15:22 +01:00
Oleksii Kriuchykhin f76eb170a1 Fix restore action for experiments and tasks [SCI-5341] 2020-12-28 22:21:38 +01:00
Oleksii Kriuchykhin 0cb221609a Fix global activities page [SCI-5324] 2020-12-27 22:05:15 +01:00
Mojca Lorber 62af5cc723 [SCI-5287] Show step collapse/expand on task 2020-12-22 15:50:27 +01:00
Mojca Lorber 21c0ea4f8d [SCI-5293] Remove Archived results tab on archived Task 2020-12-21 11:56:33 +01:00
Urban Rotnik 4ff1770d50 Remove uniqueness validation on Experiment name 
SCI-5288
 2020-12-18 16:48:50 +01:00
Oleksii Kriuchykhin 67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
mlorb a999fb0c80
Change the layout of the archived projects cards and the list view [SCI-5267] (#3021) 
* change the layout of the archived projects cards and the list view

* change order in css
 2020-12-18 13:05:23 +01:00
Urban Rotnik d3e38c89f8 Update BE sorting for archived fodlers&projects 
SCI-5306
 2020-12-18 11:27:17 +01:00
Urban Rotnik 7c0ad021de Update sorting dropdown 2020-12-18 11:08:38 +01:00
Urban Rotnik 7c967d32f1 Reset invalid state 
SCI-5306
 2020-12-18 09:46:05 +01:00
Urban Rotnik 63a41b123d Fix dropdown JS bug, fix folders_search, apply all new filters to search 
SCI-5306
 2020-12-18 09:43:11 +01:00
Urban Rotnik 87ca79717c Add separate sorting for active/archived view 
[SCI-5306]
 2020-12-18 08:41:51 +01:00
Urban Rotnik 4f657ab343 Fix CSS 
SCI-5306
 2020-12-18 08:37:57 +01:00
mlorb f6f7211d77
Update styling for projects filters and fix some js bugs [SCI-5210] (#3012) 
* Update styling for projects filters and fix some js bugs

* Fix hound
 2020-12-17 23:13:45 +01:00
Oleksii Kriuchykhin 069704cb78 Fix redirects after 2FA sign in [SCI-4973] 2020-12-17 19:32:15 +01:00
Urban Rotnik ad4ee65f6b
Merge pull request #3007 from urbanrotnik/ur-sci-5300 
Connect manage users modal with new projects cards [SCI-5300]
 2020-12-17 13:48:10 +01:00
Miha Mencin f284ef1592
Merge pull request #3009 from okriuchykhin/ok_SCI_5276 
Archiving: update archived TASK screen layout [SCI-5276]
 2020-12-17 13:46:35 +01:00
Oleksii Kriuchykhin 7bb334e737 Archiving: update archived TASK screen layout [SCI-5276] 2020-12-17 13:26:44 +01:00
Urban Rotnik 3eb667b6ba
Merge pull request #3005 from urbanrotnik/ur-sci-5274-archived-task-cards 
Archived tasks cards [SCI-5274] [SCI-5275]
 2020-12-17 13:17:11 +01:00
Miha Mencin 6dc4fae45b
Merge pull request #3003 from okriuchykhin/ok_SCI_5268 
Archiving: add 'archived' flag on folder [SCI-5268]
 2020-12-17 13:13:26 +01:00
Urban Rotnik d4c84a38e5 Fix css 
[SCI-5274]
 2020-12-17 13:11:30 +01:00
Urban Rotnik 19f16555c6 Add checkbox and restore button 
[SCI-5275]
 2020-12-17 13:11:20 +01:00
Urban Rotnik cd7b94b434 Fix users/comments tab showing 
[SCI-5274]
 2020-12-17 13:08:58 +01:00
Urban Rotnik 9a7ffb0645 Add Tags modal to archived tags screen 
[SCI-5274]
 2020-12-17 13:08:57 +01:00
Urban Rotnik 2ae075e893 Use canvas task card for archived task card 
[SCI-5274]
 2020-12-17 13:08:53 +01:00
aignatov-bio 2ca7b81cea
Update archived view for experiments [SCI-5270][[SCI-5271][SCI-5277] (#3011) 
* Change experiment archived card [SCI-5270]
 2020-12-17 13:07:30 +01:00
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