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

12782 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sboursen-scinote 6d34ea41d2 Style the new breadcrumbs [SCI-8087] 2023-04-02 18:42:21 +02:00
sboursen-scinote 8ae354b180 Merge branch 'features/navigation-refactor' into sb_SCI-8087 2023-04-02 17:33:23 +02:00
Anton 0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
aignatov-bio cc47853687
Merge pull request #5209 from aignatov-bio/ai-sci-7926-add-tailwind-and-new-buttons-design 
Replace webpacker with jsbundling-rails
 2023-03-31 20:23:55 +02:00
sboursen-scinote 852108df0b Change flash messages for protocol access permission [SCI-8231] 2023-03-31 18:45:32 +02:00
Alex Kriuchykhin b14f27d951
Merge pull request #5235 from sboursen-scinote/sb_SCI-8227 
Duplicated task with linked protocol loses template loaded... [SCI-8227]
 2023-03-31 17:49:47 +02:00
sboursen-scinote a1c1b6e5a7 Refactor the solution [SCI-8227] 
Co-Author okriuchykhin <oleksii@scinote.net>
 2023-03-31 17:39:17 +02:00
sboursen-scinote aa75782766 Fix hound [SCI-8227] 2023-03-31 16:56:12 +02:00
sboursen-scinote 021913d6a8 Fix hound [SCI-8227] 2023-03-31 16:54:52 +02:00
sboursen-scinote 9b8db8befd FIX: Duplicated task with linked protocol loses template loaded timestamp [SCI-8227] 2023-03-31 16:49:40 +02:00
Giga Chubinidze 3fc2afde3c Label '(Draft)' in front of the protocol template name [SCI-8211] 2023-03-31 18:30:26 +04:00
ajugo a2e6dc7444
Fix missing protocol template name in activity for create [SCI-8242] (#5233) 
* Fix missing protocol template name in acitvity for create [SCI-8242]

* Rename @new variable into @new_protocol [SCI-8242]
 2023-03-31 14:48:23 +02:00
Anton 81a7e03615 Removed unused packages and recreated yarn.lock 2023-03-31 14:41:09 +02:00
Anton ec96fb134f Merge branch 'ai-sci-7926-add-tailwind-and-new-buttons-design' of github.com:aignatov-bio/scinote-web into ai-sci-7926-add-tailwind-and-new-buttons-design 2023-03-31 14:09:01 +02:00
ajugo 562577e960
Add flash message for removing all users [SCI-8238] (#5232) 2023-03-31 12:14:26 +02:00
Anton dc116329b6 Revert node to 12 and remove foreman 2023-03-31 12:11:57 +02:00
artoscinote 6b408c355d
Merge pull request #5230 from G-Chubinidze/gc_SCI_8102 
CSS: flickering issues on Protocol templates [SCI-8102]
 2023-03-31 11:46:47 +02:00
Giga Chubinidze 4a31b27852 added minimum z index on protocols table 2023-03-31 13:42:42 +04:00
ajugo f535bc1fa0
Fix protocol counter on my statistics [SCI-8240] (#5228) 2023-03-31 10:01:58 +02:00
artoscinote 11e7667b13
Merge pull request #5229 from G-Chubinidze/gc_SCI_8232 
Change title for publishing draft [SCI-8232]
 2023-03-31 09:48:29 +02:00
sboursen-scinote 501279372c Style the breadcrumbs [SCI-8087] 2023-03-30 21:56:38 +02:00
sboursen-scinote 31b979cde9 Add prefix for archived elements [SCI-8087] 2023-03-30 21:22:33 +02:00
sboursen-scinote 42687547cf Refactor the implementation in projects and experiements [SCI-8087] 2023-03-30 19:13:15 +02:00
Giga Chubinidze 890b113de5 CSS: flickering issues on Protocol templates [SCI-8102] 2023-03-30 21:11:28 +04:00
sboursen-scinote b43d14f549 Implement layout breadcrumbs for Protocols and Label templates [SCI-8087] 2023-03-30 19:07:18 +02:00
sboursen-scinote 95797ab8dd Implement layout breadcrumbs for Inventories [SCI-8087] 2023-03-30 18:42:27 +02:00
Giga Chubinidze 57d951a690 Change title for publishing draft [SCI-8232] 2023-03-30 20:30:49 +04:00
sboursen-scinote eda4f140ee Implement layout breadcrumbs for Experiments and Tasks [SCI-8087] 2023-03-30 17:01:47 +02:00
sboursen-scinote 6cf3782339 Implement layout breadcrumbs for Projects and project folders [SCI-8087] 2023-03-30 16:29:21 +02:00
ajugo e1cf9775fd
Add new activites for all team members [SCI-8224] (#5227) 2023-03-30 16:04:57 +02:00
Anton 07f4156f9b Add addons support to webpack [SCI-7926] 2023-03-30 14:22:42 +02:00
Anton ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +02:00
artoscinote 03ff08763b
Merge pull request #5226 from artoscinote/ma_SCI_8225 
Fix migration for archived protocols [SCI-8225]
 2023-03-30 13:29:01 +02:00
Martin Artnik 6163ac984a Fix migration for archived protocols [SCI-8225] 2023-03-30 13:22:25 +02:00
artoscinote e108740055
Merge pull request #5225 from artoscinote/ma_SCI_8228 
Handle deleted protocol activities [SCI-8228]
 2023-03-29 16:25:23 +02:00
Martin Artnik d86a93919b Handle deleted protocol activities [SCI-8228] 2023-03-29 16:20:53 +02:00
Oleksii Kriuchykhin 89a45d2b14 Merge branch 'hotfix/1.26.6.4' into develop 2023-03-29 10:39:51 +02:00
Oleksii Kriuchykhin 281489fa34 Bump version to 1.26.6.4 2023-03-29 10:37:46 +02:00
artoscinote be4f008f09
Merge pull request #5224 from sboursen-scinote/sb_SCI-7607-fix2 
Fix clear button style in dashboard filter [SCI-7607]
 2023-03-29 10:37:10 +02:00
sboursen-scinote 226a89e8bf Fix clear button style in dashboard filter [SCI-7607] 2023-03-29 10:34:13 +02:00
artoscinote 3173b9f96e
Merge pull request #5216 from artoscinote/ma_SCI_8202 
Fix print for linked protocols [SCI-8202]
 2023-03-29 09:58:49 +02:00
artoscinote edcc84788e
Merge pull request #5220 from artoscinote/ma_SCI_8217 
Fix new protocol default role, fix reload of protocol access modal [SCI-8217]
 2023-03-29 09:11:07 +02:00
sboursen-scinote 2dfcb56748 Fix dropdown direction in modals [SCI-8134] 2023-03-28 17:19:37 +02:00
Martin Artnik 6412a65d7e Fix new protocol default role, fix reload of protocol access modal [SCI-8217] 2023-03-28 16:22:38 +02:00
Alex Kriuchykhin 887ff00dab
Merge pull request #5219 from okriuchykhin/ok_SCI_8216 
Fix step table renaming [SCI-8216]
 2023-03-28 16:06:08 +02:00
Oleksii Kriuchykhin ee7abc2912 Fix step table renaming [SCI-8216] 2023-03-28 16:03:45 +02:00
aignatov-bio 6c3afee428
Merge pull request #5218 from aignatov-bio/ai-sci-8214-small-css-fixes-for-task-protocol 
Fix css for task protocol [SCI-8214]
 2023-03-28 15:24:01 +02:00
Anton 4a5e0de54f Fix css for task protocol [SCI-8214] 2023-03-28 14:53:47 +02:00
Anton babb46baa7 Update webpacker to version 5.4.4 [SCI-7926] 2023-03-28 14:00:28 +02:00
Alex Kriuchykhin 43cdcd7aa2
Merge pull request #5217 from okriuchykhin/ok_SCI_8216 
Fix saving of big tables on steps [SCI-8216]
 2023-03-28 13:34:41 +02:00