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

348 commits

Author SHA1 Message Date
Anton ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +02:00
Anton 1177eaae5b Add general notifiacitons flyout [SCI-8017] 2023-03-25 17:34:26 +01:00
Anton 854fc1764b Refactor left/top navigation [SCI-8055] 2023-03-22 14:08:21 +01:00
artoscinote 3b074a4af6
Merge pull request #5044 from artoscinote/ma_SCI_7974 
Replace highlight.js with prism.js [SCI-7974]
 2023-03-01 12:52:57 +01:00
Martin Artnik 165e012d23 Replace highlight.js with prism.js [SCI-7974] 2023-02-28 16:22:35 +01:00
sboursen-scinote 4ab8768024 Focus on newly added step element [sb_SCI-7938] 2023-02-24 10:49:18 +01:00
sboursen-scinote d42cd85533 Focus on newly added Attachment [sb_SCI-7938] 2023-02-24 10:48:47 +01:00
G-Chubinidze dac150f75f
Revert "Add office file to task step - reload file option shows plain html page [SCI-7673]" 2023-02-22 13:29:39 +04:00
artoscinote 3ca007981b
Merge pull request #4993 from G-Chubinidze/gc_SCI_7673 
Add office file to task step - reload file option shows plain html page [SCI-7673]
 2023-02-20 10:37:03 +01:00
Giga Chubinidze 0ea7d6b75e changed axios to jquery, removed page refresh after file creation 2023-02-20 13:27:17 +04:00
Giga Chubinidze 14592ebea6 Add office file to task step - reload file option shows plain html page [SCI-7673] 2023-02-17 22:51:10 +04:00
Martin Artnik 3961d1d6af Add delete confirmation modal to checklist items [SCI-7952] 2023-02-17 15:59:37 +01:00
artoscinote e58f0fc1f2
Merge pull request #4912 from G-Chubinidze/gc_SCI_7195 
Text block on step without title in rearrange modal [SCI-7195]
 2023-02-15 10:43:44 +01:00
ajugo 29a7113cc1
Fix loading task steps and step timestamps [SCI-7902] (#4941) 2023-02-06 16:47:11 +01:00
aignatov-bio bfb035d339
Merge pull request #4936 from aignatov-bio/ai-sci-7834-save-handson-table-metadata 
Save handson table metadata [SCI-7834]
 2023-02-06 14:24:51 +01:00
Anton 3849b1a7a1 Save handson table metadata [SCI-7834] 2023-02-06 14:21:55 +01:00
artoscinote 3331c5fa3f
Merge pull request #4928 from G-Chubinidze/gc_SCI_7837 
Step timestamp display [SCI-7837]
 2023-02-06 12:03:02 +01:00
artoscinote 6d455d6b7b
Merge pull request #4889 from sboursen-scinote/sb_SCI-7585 
FIX: Clear/Close filter change - Inventory/Items filter [SCI-7585]
 2023-02-06 11:17:43 +01:00
Alex Kriuchykhin 958f9784b0
Add minimum length validation to label template name [SCI-7319] (#4930) 2023-02-03 15:36:32 +01:00
Giga Chubinidze ed4363484a Step timestamp display [SCI-7837] 2023-02-03 11:12:33 +04:00
Giga Chubinidze e412f40948 simple logic update 2023-01-31 17:08:34 +04:00
Anton 68f2db7996 Fix label template logo dimenstion calculation [SCI-7822] 2023-01-30 12:59:51 +01:00
sboursen-scinote 95b339f759 Fix Hound related issue [SCI-7585] 2023-01-26 09:12:31 +01:00
sboursen-scinote 15da0f2f33 Remove commented code and change the name of the hide filters method [SCI-7585] 2023-01-26 08:47:55 +01:00
sboursen-scinote adcb0e84f8 Add close button [SCI-7585] 2023-01-26 08:41:33 +01:00
sboursen-scinote ef7395b0cd Adjust the size of the clear button on small screens [SCI-7585] 2023-01-26 08:26:34 +01:00
sboursen-scinote ceb193deee Make the applyFilters button work again [SCI-7585] 2023-01-25 13:49:40 +01:00
sboursen-scinote e2521e501c Change the position of the clear button [SCI-7585] 2023-01-25 11:28:39 +01:00
sboursen-scinote 2c8c008e49 Extract the filters_list component and reset it on clear [SCI-7585] 2023-01-25 09:34:01 +01:00
artoscinote 87fa3bc9a7
Merge pull request #4710 from G-Chubinidze/gc_SCI_7195 
Text block on step without title in rearrange modal [SCI-7195]
 2023-01-24 09:40:33 +01:00
Giga Chubinidze 01f6f4d5ea changed logic for item naming 2023-01-21 01:08:17 +04:00
Anton a39058ffe5 Fix table overflow for TinyMCE [SCI-7782] 2023-01-19 12:56:15 +01:00
ajugo 1e01d1f2b7
Fix missing translation for field codes [SCI-7765] (#4826) 2023-01-16 10:21:10 +01:00
Martin Artnik 14c6c67a1a Fix merging tables in TinyMCE [SCI-7697] 2023-01-13 15:29:16 +01:00
artoscinote 80eb1639bc
Merge pull request #4823 from scinote-eln/features/tiny_mce_6 
Features/tiny mce 6
 2023-01-13 13:53:03 +01:00
Alex Kriuchykhin d4b0f0da9d
Merge pull request #4819 from scinote-eln/features/label-template-logo 
Features/label template logo
 2023-01-13 11:58:01 +01:00
Martin Artnik 4e779e70a4 Merge branch 'develop' into features/tiny_mce_6 2023-01-04 14:21:02 +01:00
ajugo ae55935002
Add missing microinteractions on step editing [SCI-7575] (#4711) 2023-01-03 12:25:22 +01:00
ajugo b549938f13
Fix print modal css [SCI-7437] (#4648) 2022-12-22 11:09:20 +01:00
Martin Artnik 2010ff091c Styling fixes and cleanup [SCI-7574] 2022-12-22 10:37:47 +01:00
Giga Chubinidze ae8efa8e1a changed if else logic, added back placeholders 2022-12-16 17:22:06 +04:00
Martin Artnik 3ea059529d Fix table scroll wrapping [SCI-7569] 2022-12-14 14:32:23 +01:00
Giga Chubinidze 556431a0da changed code for develop branch 2022-12-12 19:17:57 +04:00
Anton c5d91b061b Add logo to label templates 2022-12-09 13:33:10 +01:00
Martin Artnik de9f06a1fc Upgrade TinyMCE to 6.3, fix issues [SCI-7574] 2022-12-09 12:52:18 +01:00
Martin Artnik c828d02b99 Merge branch 'develop' into features/tiny_mce_6 2022-12-07 14:07:43 +01:00
Martin Artnik 13cf136ca4 Make overflowing tables in TinyMCE scrollable [SCI-7238] 2022-12-01 15:20:23 +01:00
Anton eddd5b7476 Fix options dropdown position on step [SCI-7387] 2022-10-27 12:42:54 +02:00
Martin Artnik 31b075ea8c Fix label preview double refresh and unit issues [SCI-7396] 2022-10-25 15:54:05 +02:00
Anton ac0fe4389d Fix label preview in print modal [SCI-7367] 2022-10-20 10:57:40 +02:00