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

11202 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Kriuchykhin e23475fbbe
Merge pull request #4183 from okriuchykhin/ok_SCI_6917 
Convert team_repository to polymorphic relation [SCI-6917]
 2022-08-31 16:43:35 +02:00
Oleksii Kriuchykhin f586c73dc8 Convert team_repository to polymorphic relation [SCI-6917] 2022-08-31 16:42:08 +02:00
Oleksii Kriuchykhin eb04bc974d Update tests with new team user assignments [SCI-6843] 2022-08-31 16:37:00 +02:00
Anton 312f2a1357 Fix rte toolbar position [SCI-7136] 2022-08-31 13:15:08 +02:00
Anton d555227652 Add acitvities and flash messages for component duplication [SCI-7108] 2022-08-31 11:09:38 +02:00
aignatov-bio 57282069e9
Merge pull request #4361 from aignatov-bio/ai-sci-7084-add-sorting-by-default-template 
Add sorting by default label template [SCI-7084]
 2022-08-31 10:36:02 +02:00
Anton bcc681b14d Add labels template to team import/export [SCI-7089] 2022-08-31 10:28:29 +02:00
aignatov-bio 91f1310338
Merge pull request #4364 from aignatov-bio/ai-sci-7060-update-promo-text 
Update label template promo text [SCI-7060]
 2022-08-31 10:13:42 +02:00
aignatov-bio 17d69131f3
Merge pull request #4383 from aignatov-bio/ai-sci-7124-fix-old-tinymce-big-tables 
Fix overflow issue on step text [SCI-7124]
 2022-08-31 10:13:27 +02:00
aignatov-bio 042e0330a7
Merge pull request #4386 from aignatov-bio/ai-sci-7117-fix-project-scroll-issue 
Fix project/experiment scroll issue [SCI-7117]
 2022-08-31 10:13:10 +02:00
artoscinote ceb3d95e0f
Merge pull request #4394 from artoscinote/ma_SCI_7135 
Fix smart annotations for locked tasks [SCI-7135]
 2022-08-31 09:58:48 +02:00
Martin Artnik d3665a940e Fix smart annotations for locked tasks [SCI-7135] 2022-08-31 09:49:47 +02:00
artoscinote 04245c8244
Merge pull request #4393 from artoscinote/ma_SCI_7118 
Fix sorting of results by newest/oldest (by updated_at) [SCI-7118]
 2022-08-31 09:10:26 +02:00
artoscinote 80072f6bbf
Merge pull request #4391 from artoscinote/ma_SCI_7111 
Fix import issues with date formatting [SCI-7111]
 2022-08-31 09:08:50 +02:00
Martin Artnik 6b25759715 Fix import issues with date formatting [SCI-7111] 2022-08-31 09:06:16 +02:00
dependabot[bot] df1b0148ff
Bump moment-timezone from 0.5.25 to 0.5.35 
Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.25 to 0.5.35.
- [Release notes](https://github.com/moment/moment-timezone/releases)
- [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md)
- [Commits](https://github.com/moment/moment-timezone/compare/0.5.25...0.5.35)

---
updated-dependencies:
- dependency-name: moment-timezone
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-30 22:41:10 +00:00
Alex Kriuchykhin c713a993d3
Merge pull request #4178 from okriuchykhin/ok_SCI_6916 
Migrate TeamRepository to new permissions [SCI-6916]
 2022-08-30 16:46:44 +02:00
Alex Kriuchykhin 34c8960097
Merge pull request #4170 from okriuchykhin/ok_SCI_6915 
Add team reference to user assignments model [SCI-6915]
 2022-08-30 16:46:02 +02:00
artoscinote e11ae6b5c1
Merge pull request #4395 from artoscinote/ma_SCI_7129 
Add default measurments to label templates [SCI-7129]
 2022-08-30 16:22:26 +02:00
Martin Artnik bd1e30d19b Add default measurments to label templates [SCI-7129] 2022-08-30 16:16:02 +02:00
Martin Artnik 194963a94e Fix sorting of results by newest/oldest (by updated_at) [SCI-7118] 2022-08-30 11:48:09 +02:00
Anton 0862221345 Invite user modal fixes [SCI-7100] 2022-08-29 14:01:31 +02:00
Anton d2639d4633 Fix bell flyout in assigned repository [SCI-7113] 2022-08-29 11:30:39 +02:00
artoscinote 13b085bc9d
Bump version to 1.26.0.3 2022-08-29 10:06:53 +02:00
Oleksii Kriuchykhin b2b059b7e1 Add syncing service and schedule for Fluics templates sync [SCI-7047] 2022-08-29 09:59:13 +02:00
Anton a1117fbc0e Fix project/experiment scroll issue [SCI-7117] 2022-08-26 16:29:53 +02:00
aignatov-bio a5e52069af
Merge pull request #4384 from aignatov-bio/ai-sci-7138-fix-tinymce-memory-leak 
Fix tinymce memory leak [SCI-7138]
 2022-08-26 10:55:48 +02:00
ajugo 185bf0b197
Add label template dropdown to print dialog [SCI-7051] (#4369) 2022-08-26 10:53:55 +02:00
Anton 81dd259c25 Fix tinymce memory leak [SCI-7138] 2022-08-26 10:52:55 +02:00
Anton 0747a495c9 Fix overflow issue on step text [SCI-7124] 2022-08-25 15:32:03 +02:00
aignatov-bio 6706e886e3
Merge pull request #4382 from aignatov-bio/ai-sci-7085-update-css-for-view-screen 
Fix css for label template view screen [SCI-7085]
 2022-08-25 14:33:57 +02:00
Alex Kriuchykhin dac492cfd4
Merge pull request #4353 from okriuchykhin/ok_SCI_7045 
Add list label templates method to Fluics API client [SCI-7045]
 2022-08-25 13:40:40 +02:00
Anton 9daa3f6d69 Fix css for label view page [SCI-7085] 2022-08-25 13:25:34 +02:00
Anton 771c40d4f0 CSS fixes for label template screen [SCI-7085] 2022-08-24 17:57:34 +02:00
aignatov-bio 34abe2aa7b
Merge pull request #4354 from aignatov-bio/ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor 
Add column dropdown to label template editor [SCI-7054][SCI-7055]
 2022-08-24 17:48:55 +02:00
aignatov-bio 6d8908c1f5
Merge branch 'features/label-templates' into ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor 2022-08-24 17:48:48 +02:00
Oleksii Kriuchykhin 55461a4e36 Bump version to 1.26.0.2 2022-08-24 15:03:24 +02:00
aignatov-bio 9066d9ab04
Merge pull request #4380 from artoscinote/ma_SCI_7053 
Add missing route [SCI-7053]
 2022-08-24 14:13:57 +02:00
Martin Artnik 0aa4ff11d4 Add missing route [SCI-7053] 2022-08-24 14:10:51 +02:00
artoscinote 7a7df03396
Implement label preview component [SCI-7050] (#4370) 2022-08-24 13:55:54 +02:00
Anton e22af8830a Add activties to step duplication [SCI-7109] 2022-08-24 13:45:39 +02:00
artoscinote 766d2bb3e0
Fix checkboxes for technicians [SCI-7122] (#4378) 2022-08-23 18:10:28 +02:00
aignatov-bio 3f10aa979b
Merge pull request #4379 from aignatov-bio/ai-sci-7123-fix-drag-n-drop-on-step 
Fix step drag/drop file [SCI-7123]
 2022-08-23 18:08:56 +02:00
Anton 3e539adbde Fix step drag/drop file [SCI-7123] 2022-08-23 17:59:28 +02:00
Anton bc112dd6af Add step duplication [SCI-7109] 2022-08-23 17:54:33 +02:00
Alex Kriuchykhin 8744286d98
Merge pull request #4377 from okriuchykhin/ok_SCI_7126 
Fix export of protocols with empty step text fields [SCI-7126]
 2022-08-23 15:11:09 +02:00
Oleksii Kriuchykhin 3d00249644 Fix export of protocols with empty step text fields [SCI-7126] 2022-08-23 14:30:30 +02:00
artoscinote 74b9101e6f
Enable table scroll for locked tasks [SCI-7125] (#4375) 2022-08-23 14:23:21 +02:00
aignatov-bio 62a66f3431
Merge pull request #4376 from aignatov-bio/ai-sci-7123-fix-drag-n-drop-for-locked-tasks 
Fix drag n drop for locked tasks [SCI-7123]
 2022-08-23 14:22:01 +02:00
Anton d8bcdb09e4 Fix drag n drop for locked tasks [SCI-7123 2022-08-23 14:20:24 +02:00