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

7109 commits

Author SHA1 Message Date
Urban Rotnik 4cd2bce83f Fix Move button on Experiment card 2021-02-11 18:38:23 +01:00
Mojca Lorber 52cbc036fc Fix hound 2021-02-11 18:29:03 +01:00
Mojca Lorber 7071f4a6c5 Send selected folders param to modal 2021-02-11 18:27:16 +01:00
aignatov-bio bcc9d6c85c Fix sort for experiments page [SCI-5479] 2021-02-11 15:38:10 +01:00
aignatov-bio 1eff3494fb Fix archived experiments page routes and clean old archive page [SCI-5479] 2021-02-11 14:21:15 +01:00
aignatov-bio 1a3c715d72
Merge pull request #3149 from aignatov-bio/ai-sci-5468-connect-details-modal-to-more-button 
Add action to more button [SCI-5468]
 2021-02-11 13:56:54 +01:00
aignatov-bio f6422a50ac Add action to more button 2021-02-11 12:41:22 +01:00
Mojca Lorber ce451f86a8 Fix projects breadcrumbs style [SCI-5349] 2021-02-10 23:33:16 +01:00
Mojca Lorber 19733ba7d9 Refactor deleting of empty folders 2021-02-10 22:11:42 +01:00
aignatov-bio 2fad6f5f8e
Merge pull request #3146 from aignatov-bio/ai-sci-5477-fix-archived-project-routes 
Fix archived project routes and experiment archived date [SCI-5477]
 2021-02-10 18:38:13 +01:00
aignatov-bio 8adbd11197 Fix archived project routes and experiment archived date [SCI-5477] 2021-02-10 15:05:53 +01:00
aignatov-bio 486dae7559 Add task counter to experiment card [SCI-5467] 2021-02-10 14:50:42 +01:00
aignatov-bio 8853d297ed
Merge pull request #3143 from urbanrotnik/ur-sci-5455-search-results-breadcrumbs 
Add breadcrumbs to GlobalSearch results [SCI-5455]
 2021-02-09 21:44:54 +01:00
aignatov-bio 9d3d1f8eac Connect toolbar actions to buttons [SCI-5465] 2021-02-09 15:47:15 +01:00
Urban Rotnik 367ade2e32 Add breadcrumbs to GlobalSearch results 2021-02-09 13:07:40 +01:00
mlorb 45da42b924
Merge branch 'develop' into ml-sci-5311 2021-02-07 19:20:09 +01:00
Mojca Lorber 0d9b38a843 Add archived experiments card style 2021-02-07 19:04:30 +01:00
aignatov-bio a339d821bd
Merge pull request #3105 from aignatov-bio/ai-sci-5255-update-marvin-js-model-styling 
Update marvinJS modal CSS [SCI-5255]
 2021-02-05 15:36:14 +01:00
aignatov-bio 554c0b964a Remove commented value [SCI-5255] 2021-02-05 15:26:01 +01:00
aignatov-bio 2972fac96e
Merge pull request #3140 from aignatov-bio/ai-sci-5407-add-folders-link-to-search 
Add folder links to global search [SCI-5407]
 2021-02-05 15:24:23 +01:00
mlorb 480893c8c7
Merge pull request #3138 from mlorb/ml-sci-5456 
Change the title Projects to folder/subfolder title [SCI-5456]
 2021-02-05 13:50:13 +01:00
aignatov-bio 7c99eaed8f Add folder links to global search [SCI-5407] 2021-02-05 12:39:26 +01:00
aignatov-bio f3c1d123d4 Fix duplicate code 2021-02-05 11:28:38 +01:00
Mojca Lorber ad61e59593 Change the title Projects to folder/subfolder title [SCI-5456] 2021-02-05 11:04:58 +01:00
Miha Mencin 107b7a0427
Merge pull request #3114 from urbanrotnik/ur-sci-5417-folders-name-uniquness-scope 
Add Archived to ProjectFolder name uniqueness scope [SCI-5417]
 2021-02-05 09:59:40 +01:00
Miha Mencin be6796c95a
Merge pull request #3137 from aignatov-bio/ai-sci-5365-add-experiments-list-view 
Add list view for experiments [SCI-5365]
 2021-02-05 09:58:52 +01:00
Miha Mencin b35e15fdd5
Merge pull request #3101 from aignatov-bio/ai-sci-5263-add-new-file-icons-to-report 
Add new asset icons to report [SCI-5263]
 2021-02-05 08:21:05 +01:00
Miha Mencin 0e9b714c9f
Applying Alex's suggestion 
Co-authored-by: Alex Kriuchykhin <okriuchykhin@biosistemika.com>
 2021-02-05 08:19:42 +01:00
aignatov-bio a843aac769 Add list view for experiments [SCI-5365] 2021-02-04 16:45:31 +01:00
Oleksii Kriuchykhin c5b286c764 Fix corrupted SCSS file 2021-02-04 16:40:05 +01:00
Oleksii Kriuchykhin c62c464902 Implement editing options and modals for experiment card [SCI-5367] 2021-02-04 12:06:51 +01:00
Alex Kriuchykhin 1466ae114f
Merge pull request #3027 from okriuchykhin/ok_SCI_5246 
Remove Demo project and Samples inventory [SCI-5246][SCI-5248]
 2021-02-04 11:28:09 +01:00
Alex Kriuchykhin cca3c57bf2
Merge pull request #3134 from okriuchykhin/ok_SCI_5463 
Fix module normalisation in canvas update [SCI-5463]
 2021-02-04 11:27:47 +01:00
Alex Kriuchykhin dd9d75a643
Merge pull request #3130 from okriuchykhin/ok_SCI_5458 
Improve visibility of experiment workflow image [SCI-5458]
 2021-02-04 11:27:27 +01:00
Oleksii Kriuchykhin 8a0a0cbacc Add view only project users modal for project card [SCI-5337] 2021-02-04 11:25:35 +01:00
aignatov-bio b4a6644f13
Merge pull request #3133 from aignatov-bio/ai-sci-5457-update-experiments-view-screen 
Connect front-end with back-end for experiments page [SCI-5457]
 2021-02-04 11:00:17 +01:00
Mojca Lorber d897e20426 Implement new experiment card layout 2021-02-04 09:02:23 +01:00
Oleksii Kriuchykhin bba8e0326d Fix module normalization in canvas update [SCI-5463] 2021-02-03 14:58:04 +01:00
aignatov-bio a7a948abaf Add archive/restore toolbar buttons and backend [SCI-5457] 2021-02-03 14:29:50 +01:00
aignatov-bio 7726eae4da Add experiments page load logic and connect filters [SCI-5457] 2021-02-03 14:29:50 +01:00
Miha Mencin 259d7d5e7c
Merge pull request #3132 from biosistemika/release/1.21.1 
Release/1.21.1
 2021-02-03 11:49:04 +01:00
Oleksii Kriuchykhin 58ddfe80e4 Improve visibility of experiment workflow image [SCI-5458] 2021-02-02 22:23:11 +01:00
aignatov-bio e206892864 Add p element to docx list allowed elements [SCI-5461] 2021-02-02 11:26:54 +01:00
Oleksii Kriuchykhin 6b2a94f045 Add empty repositories index page [SCI-5248] 2021-02-01 15:02:08 +01:00
Oleksii Kriuchykhin 324c268594 Remove Demo project and Samples repository [SCI-5246][SCI-5248] 2021-02-01 15:02:06 +01:00
Oleksii Kriuchykhin 8b593bc3aa Add new experiment template from demo project [SCI-5246] 2021-02-01 14:59:10 +01:00
Oleksii Kriuchykhin 1ba13c8c5e Clean up and fix mistakes in demo project [SCI-5246] 2021-02-01 14:59:10 +01:00
Mojca Lorber 9ca89ce9d9 Fix rendering error 2021-02-01 13:16:21 +01:00
aignatov-bio 8be9d3b14c
Merge pull request #3126 from biosistemika/features/new-experiments-page 
Features/new experiments page
 2021-01-29 13:28:11 +01:00
aignatov-bio 29cf9be1f6
Add filters to experiments pages [SCI-5366] (#3119) 
* Move filters to shared folder [SCI-5366]
 2021-01-29 13:24:02 +01:00
Alex Kriuchykhin 8bd0dc2e4b
Merge pull request #3115 from urbanrotnik/ur-sci-5410-archive-task-checkbox 
Hide checkbox on task card if task is in experiment archived branch [SCI-5410]
 2021-01-29 11:06:36 +01:00
aignatov-bio 9a86cd9184
Update dashboard widgets height [SCI-5206][SCI-5249] (#3123) 2021-01-29 11:01:49 +01:00
Mojca Lorber 1080c22b30 Update Experiments page layout and the toolbar row 2021-01-28 22:47:08 +01:00
Alex Kriuchykhin 24d3ce3606
Merge pull request #3118 from okriuchykhin/ok_SCI_5369 
Add breadcrumbs to project experiments page [SCI-5369]
 2021-01-28 14:50:21 +01:00
Oleksii Kriuchykhin 75da67b937 Update Rails to 6.1.1, ruby to 2.7.2 [SCI-5459] 2021-01-28 14:43:45 +01:00
Alex Kriuchykhin f1124f9ea0
Add experiments overview service [SCI-5430] (#3116) 2021-01-28 12:57:04 +01:00
Oleksii Kriuchykhin b872c6fd14 Add breadrumbs to project experiments page [SCI-5369] 2021-01-25 16:06:48 +01:00
aignatov-bio 8396c086f5
Add sticky toolbar for projects page [SCI-5401] (#3108) 
* Add sticky toolbar for projects page [SCI-5401]
 2021-01-25 15:36:23 +01:00
aignatov-bio cea61a6bd2
Add hover effect to project table [SCI-5372] (#3111) 
* Add hover effect to projects table [SCI-5372]

* Fix markup [SCI-5372]
 2021-01-25 10:26:10 +01:00
Urban Rotnik d54090fe0d Fix missing asset in report 
Use 40px asset in override so it will be properly compiled SCI-5446
 2021-01-25 07:49:19 +01:00
Urban Rotnik ebbbfa657c
Fix folders activities [SCI-5402] [SCI-5403] (#3112) 
* Fix activities and make folders clickable

* Remove archive project activity and action

* Save nil value for root folder

* Add empty values to hash
 2021-01-22 11:24:08 +01:00
Urban Rotnik 7232983d59 Hide checkbox on task card if task is in experiment archived branch 
SCI-5410
 2021-01-22 09:47:00 +01:00
Urban Rotnik 68ac663370 Add Archived to ProjectFolder name uniqueness scope 
SCI-5417
 2021-01-22 08:56:43 +01:00
Mojca Lorber c58d5734ad Implement the option of deleting empty folders [SCI-5311] 2021-01-21 19:42:25 +01:00
Urban Rotnik e3388b880c
Merge pull request #3109 from aignatov-bio/ai-sci-5438-fix-empty-search-state-for-tables 
Fix css for no results on projects page [SCI-5438]
 2021-01-21 15:45:34 +01:00
Urban Rotnik b3e646fcea Clean up css 2021-01-21 15:40:53 +01:00
aignatov-bio cfc8383004 Fix css for no results on projects page [SCI-5438] 2021-01-21 15:29:37 +01:00
Alex Kriuchykhin adb9442677
Small bugfixes [SCI-5432] (#3107) 2021-01-21 11:24:25 +01:00
Urban Rotnik 4e0d4f4280 Remove flash message, keep only form errors 
SCI-5406
 2021-01-20 16:12:41 +01:00
aignatov-bio 908678fcff Update marvinJS modal css [SCI-5255] 2021-01-20 12:37:41 +01:00
Urban Rotnik 33b68b8aa7 Fix permissions for result deletion 2021-01-20 09:00:45 +01:00
Urban Rotnik 7cbea1facd
Fix card Restore/Archive actions (#3103) 2021-01-19 17:21:22 +01:00
Alex Kriuchykhin 8ab7b94443
Fix error message at login with false credential [SCI-5412] (#3102) 2021-01-19 17:19:40 +01:00
aignatov-bio 07831c0294 Add new asset icons to report [SCI-5263] 2021-01-19 12:53:49 +01:00
Alex Kriuchykhin f15d984d47
Fix navigation between archived and active projects [SCI-5419] (#3100) 
* Fix navigation between archived and active projects [SCI-5419]
 2021-01-19 11:28:59 +01:00
aignatov-bio bba1165c7b
Fix edit button for folder in archive mode [SCI-5418] (#3096) 
* Fix edit button for folder in archive mode [SCI-5418]

* Remove archive folder from routes [SCI-5418]
 2021-01-19 11:22:53 +01:00
Urban Rotnik 0a1abf83c6
Merge pull request #3099 from urbanrotnik/ur-sci-5351 
Fix folders exports, add error message [SCI-5351]
 2021-01-19 11:01:08 +01:00
Urban Rotnik eae3a7fc16 Scope exported projects to visible_to user 2021-01-19 10:57:30 +01:00
Urban Rotnik 4c4b315864
Merge pull request #3097 from urbanrotnik/ur-sci-5422-valdiation-for-moving-folder 
Add parent_folder validation [SCI-5422]
 2021-01-19 10:46:50 +01:00
Urban Rotnik 92d8199381 Add parent_folder validation 
SCI-5422
 2021-01-19 10:40:29 +01:00
Urban Rotnik 706ca4b118
Merge pull request #3093 from urbanrotnik/ur-sci-5388 
Set height on wholerow-clicked element [SCI-5388]
 2021-01-19 10:24:39 +01:00
aignatov-bio f594a44cdb
Add initialization for select all checkbox in projects table [SCI-5409] (#3098) 
* Add initialization for select all checkbox in projects table [SCI-5409]
 2021-01-19 09:53:56 +01:00
Urban Rotnik ddbc22b274 Fix folders exports, add error message 
SCI-5351
 2021-01-19 09:47:42 +01:00
mlorb f7fd59d295
Merge pull request #3095 from mlorb/ml-sci-5420 
Fix red dot icon for projects filters [SCI-5420]
 2021-01-19 09:35:51 +01:00
Urban Rotnik dbdfe4177d
Merge pull request #3092 from urbanrotnik/ur-sci-5406-error-at-saving-project 
Fix error message for name in EditProject modal [SCI-5406]
 2021-01-18 16:38:06 +01:00
Mojca Lorber 0837c73794 Fix red dot icon for projects filters 2021-01-18 14:02:28 +01:00
Urban Rotnik 5ada4da370 Fix permissions check for cards 
SCI-5415
 2021-01-18 14:02:16 +01:00
Urban Rotnik 3cf6047dbd Set height on wholerow-clicked element 2021-01-18 12:56:26 +01:00
Alex Kriuchykhin 64c0875b09
Merge pull request #3091 from aignatov-bio/ai-sci-5392-fixed-archived-experiment-dropdown-options_2 
Fix archived experiment dropdown and archived view for projects page [SCI-5392]
 2021-01-18 10:32:27 +01:00
Urban Rotnik 02592178f3 Fix error message for name in EditProject modal 
[SCI-5406]
 2021-01-18 09:46:53 +01:00
Urban Rotnik 496c106497
Merge pull request #3088 from urbanrotnik/ur-sci-5395-breadcrumbs-order 2021-01-15 17:04:31 +01:00
aignatov-bio d355b4806b
Fix new project modal initialization [SCI-5381] (#3068) 2021-01-15 15:29:12 +01:00
aignatov-bio 6011bb36b6 Fix archived experiment dropdown and archived view for projects page [SCI-5392] 2021-01-15 15:08:27 +01:00
Urban Rotnik dca0e5f188
Merge pull request #3090 from urbanrotnik/ur-sci-5405-missing-move-button 
Add data attribute for moveable permissions [SCI-5405]
 2021-01-15 14:23:27 +01:00
Urban Rotnik 97371f8216 Reorder ProjectFolder inner foldres 2021-01-15 14:22:48 +01:00
Urban Rotnik 998d66b8b9 Add data attribute for moveable permissions 
SCI-5405
 2021-01-15 13:54:18 +01:00
Urban Rotnik 05bcb7c502
Merge pull request #3086 from urbanrotnik/ur-sci-5394-missing-archived-results 
Fix missing results of archived task [SCI-5394]
 2021-01-15 13:53:13 +01:00
Urban Rotnik 2fa54d7898
Merge pull request #3087 from urbanrotnik/ur-sci-5397-folder-link-in-activities 
Fix folder's activities links [SCI-5397]
 2021-01-15 13:52:55 +01:00
Urban Rotnik c9bbc64751 Fix missing results of archived task 
[SCI-5394]
 2021-01-15 11:40:25 +01:00
Alex Kriuchykhin 902a47490d
Merge pull request #3082 from okriuchykhin/ok_SCI_5383_v2 
Show folder creation button on archived page [SCI-5383]
 2021-01-15 11:38:58 +01:00