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
9045 commits 70 branches 179 tags 165 MiB
Commit graph

9045 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zmagoD f1ced42ae6 add filtering logic 2021-04-30 15:25:08 +02:00
zmagoD 11e5662c47 add fe logic for disable/enable fields 2021-04-30 13:26:06 +02:00
zmagoD 8a74546cdf fix the logic for addin/editing new project members 2021-04-28 18:02:18 +02:00
zmagoD c136d953d0 create form object for role assigment, create helper object for project member, added new user_projects modal 2021-04-24 18:43:28 +02:00
zmagoD 04ef7a4478 add show and edit permissions modal 2021-04-18 17:19:16 +02:00
zmagoD 3333241c9a add CTA for project members modal SCI-5645 2021-04-18 12:23:29 +02:00
zmagoD 37f3f41d06 Merge branch 'features/new_permissions' of https://github.com/biosistemika/scinote-web into new_perimssions-managing-project-ui 2021-04-18 11:10:58 +02:00
Miha Mencin 840651a7d6
Merge pull request #3192 from okriuchykhin/ok_SCI_5478 
Add migration for new user assignments to projects [SCI-5478]
 2021-04-18 11:10:08 +02:00
zmagoD 2876bae052 update minimagic gem 2021-04-18 10:49:22 +02:00
aignatov-bio e4375c9ca7
Merge pull request #3208 from aignatov-bio/ai-sci-fix-typo-in-stylesheet 
Fix typo in experiments stylesheet
 2021-03-09 13:20:13 +01:00
aignatov-bio 9a88e9d030 Fix typo in experiments stylesheet 2021-03-09 13:15:01 +01:00
Oleksii Kriuchykhin d8cffe53c7 Add migration for new user assignments to projects [SCI-5478] 2021-03-01 14:28:21 +01:00
Oleksii Kriuchykhin 49194d1a45 Prepare initial user roles in the database [SCI-5435] 2021-02-22 11:58:40 +01:00
Alex Kriuchykhin a9c4249e92
Merge pull request #3142 from okriuchykhin/ok_SCI_5436 
Add new permission checking logic [SCI-5436]
 2021-02-22 11:56:51 +01:00
Oleksii Kriuchykhin 3b90225c5a Add new permission checking logic [SCI-5436] 2021-02-22 11:55:48 +01:00
Alex Kriuchykhin 325e8813fc
Merge pull request #3136 from okriuchykhin/ok_SCI_5434 
Add models for new permissions objects [SCI-5434]
 2021-02-18 09:41:46 +01:00
Oleksii Kriuchykhin 1e3e701788 Add models for new permissions objects [SCI-5434] 2021-02-04 14:08:20 +01:00
Alex Kriuchykhin aa3944fea8
Merge pull request #3122 from okriuchykhin/ok_SCI_5367 
Implement editing options and modals for experiment card [SCI-5367]
 2021-02-04 12:09:43 +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
Alex Kriuchykhin d94a82b37b
Merge pull request #3069 from okriuchykhin/ok_SCI_5337 
Add view only project users modal for project card [SCI-5337]
 2021-02-04 11:26:42 +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
mlorb 8696d91c3b
Merge pull request #3135 from mlorb/ml-sci-5404 
Implement new experiment card layout [SCI-5404]
 2021-02-04 10:44:01 +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
Miha Mencin 8f63945041
Bump version to 1.21.1 2021-02-03 11:45:38 +01:00
Oleksii Kriuchykhin 58ddfe80e4 Improve visibility of experiment workflow image [SCI-5458] 2021-02-02 22:23:11 +01:00
Alex Kriuchykhin b41aea91f5
Merge pull request #3129 from aignatov-bio/ai-sci-5461-add-p-element-to-list-allowed-elements 
Add p element to docx list allowed elements [SCI-5461]
 2021-02-02 20:41:28 +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
mlorb 815e309e41
Merge pull request #3128 from mlorb/ml-sci-fix-html-render-error 
Fix rendering error
 2021-02-01 13:29:54 +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
mlorb d931ed01f2
Merge pull request #3125 from mlorb/ml-sci-5364 
Update Experiments page layout and the toolbar row [SCI-5364]
 2021-01-29 11:50:57 +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
Alex Kriuchykhin bf8e834819
Merge pull request #3124 from okriuchykhin/ok_SCI_5459 
Update Rails to 6.1.1, ruby to 2.7.2 [SCI-5459]
 2021-01-29 09:53:57 +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