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

12138 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Soufiane d801677392
Merge branch 'develop' into sb_SCI-7562 2023-03-07 12:52:05 +01:00
artoscinote 5e385a2bc0
Merge pull request #5087 from G-Chubinidze/gc_SCI_7913 
Fix automated tests [SCI-7913]
 2023-03-07 09:43:42 +01:00
Giga Chubinidze a087fd0958 Fix automated tests [SCI-7913] 2023-03-06 23:17:45 +04:00
sboursen-scinote 678e54bdc4 Add hover effect on datatable head [SCI-7562] 2023-03-03 16:27:54 +01:00
sboursen-scinote f6ce634d1c Use ordinary cursor [SCI-7562] 2023-03-03 16:17:23 +01:00
artoscinote 093c3d63f1
Merge pull request #5059 from G-Chubinidze/gc_SCI_7844 
Add the action Move to archived task & experiments view [SCI-7844]
 2023-03-02 09:01:21 +01:00
Giga Chubinidze 780781e57b Add the action Move to archived task & experiments view [SCI-7844] 2023-03-02 11:35:22 +04:00
Alex Kriuchykhin 420b07440d
Fix inventory copying for shared inventories [SCI-7998] (#5025) 2023-03-01 17:22:53 +01:00
artoscinote 7db979a069
Merge pull request #5054 from artoscinote/ma_SCI_7974 
Fix asset initializer [SCI-7974]
 2023-03-01 15:44:48 +01:00
Martin Artnik ac0e0ba853 Fix asset initializer [SCI-7974] 2023-03-01 15:31:22 +01:00
artoscinote 3898aaa587
Merge pull request #5052 from artoscinote/ma_SCI_7974 
Add missing prism.js includes to layout [SCI-7974]
 2023-03-01 15:23:06 +01:00
Martin Artnik d71c14e2eb Add missing prism.js includes to layout [SCI-7974] 2023-03-01 15:21:01 +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
artoscinote 434403c80c
Merge pull request #5029 from G-Chubinidze/gc_SCI_7763 
Search by team does not work [SCI-7763]
 2023-03-01 12:49:11 +01:00
artoscinote 4a65a9e55e
Merge pull request #4949 from sboursen-scinote/sb_SCI-7237 
Improve the print functionality for protocol [SCI-7237]
 2023-03-01 12:48:39 +01:00
artoscinote 54de76342e
Merge pull request #5036 from sboursen-scinote/sb_SCI-7981 
Fix TOC style [SCI-7981]
 2023-03-01 09:47:56 +01:00
artoscinote 2829e46eae
Merge pull request #5024 from sboursen-scinote/sb_SCI-7938 
Position of newly added text/file/table to step [SCI-7938]
 2023-03-01 09:46:39 +01:00
aignatov-bio 922beecd74
Merge pull request #4959 from sboursen-scinote/sb_SCI-7772 
CSS:Uneven spacing around the check button [SCI-7772]
 2023-03-01 09:42:09 +01:00
Martin Artnik 165e012d23 Replace highlight.js with prism.js [SCI-7974] 2023-02-28 16:22:35 +01:00
sboursen-scinote 7d857fbc08 Fix TOC style [SCI-7981] 2023-02-27 21:54:57 +01:00
Giga Chubinidze 4d30e28112 Search by team does not work [SCI-7763] 2023-02-27 03:32:06 +04:00
ajugo 58fdcc785f
Make supporting material variable [SCI-6593] (#5014) 2023-02-24 17:57:10 +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
artoscinote c0d282a08f
Bump version to 1.26.6 2023-02-22 11:32:10 +01:00
artoscinote 22ddf0e927
Merge pull request #5011 from scinote-eln/revert-4993-gc_SCI_7673 
Revert "Add office file to task step - reload file option shows plain html page [SCI-7673]"
 2023-02-22 10:30:41 +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
Alex Kriuchykhin e020b4a416
Improve tags sanitization in smart annotations (#5008) 2023-02-21 16:53:04 +01:00
artoscinote 77e511745d
Merge pull request #5006 from artoscinote/ma_SCI_7937 
Fix for scroll-to elements being hidden behind sticky navigation [SCI-7937]
 2023-02-21 15:07:57 +01:00
Martin Artnik 13ba7c1ea5 Fix for scoll-to elements being hidden behind sticky navigation [SCI-7937] 2023-02-21 15:04:58 +01:00
Soufiane c88e2df19c
Fix filter_date action when only one date is present [SCI-7942] (#5005) 
Fix filter_date action when only one date is present [SCI-7942]
 2023-02-21 14:36:24 +01:00
artoscinote f21e5edf55
Merge pull request #5004 from artoscinote/ma_SCI_7965 
Add back basic TinyMCE html editor [SCI-7965]
 2023-02-21 11:25:30 +01:00
Martin Artnik 238354a314 Add back basic TinyMCE html editor [SCI-7965] 2023-02-21 11:23:52 +01:00
Alex Kriuchykhin 67ad52152a
Update New Relic agent to 8.16.0 (#5000) 2023-02-21 09:23:59 +01:00
artoscinote 8f8865c73c
Fix MarvinJS image toolbar issues [SCI-7934] (#4998) 2023-02-21 09:12:59 +01:00
ajugo f26efe98a1
Fix grey navigator comment [SCI-7950] (#4997) 2023-02-20 16:24:39 +01:00
ajugo c1f55e99a7
Fix protocol import for empty metadata [SCI-7915] (#4996) 2023-02-20 13:21:01 +01:00
Alex Kriuchykhin 94b5b4a425
Add rake task for resseting user assignments on inventories (#4931) 2023-02-20 13:00:13 +01:00
Soufiane 77d4a33829
Fix the undefined method issue for activity subjects [SCI-7942] (#4994) 2023-02-20 11:49:27 +01: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
ajugo 029f61e695
Disable gray canvas navigator [SCI-7950] (#4991) 2023-02-20 10:15:08 +01:00
ajugo 4515ab0a65
Fix expire_in method for unauthenticated user [SCI-7943] (#4983) 2023-02-20 10:14:46 +01:00
ajugo 461d06dad9
Fix import protocol [SCI-7915] (#4980) 2023-02-20 10:14:32 +01:00
aignatov-bio c92faeb48c
Merge pull request #4987 from aignatov-bio/ai-sci-7948-fix-cell-allignment-step-tables 
Add step table metadata during import/export and copy [SCI-7948]
 2023-02-18 08:44:37 +01: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
artoscinote 63eff83ae6
Merge pull request #4990 from artoscinote/ma_SCI_7952 
Add delete confirmation modal to checklist items [SCI-7952]
 2023-02-17 16:49:31 +01:00
Martin Artnik 3961d1d6af Add delete confirmation modal to checklist items [SCI-7952] 2023-02-17 15:59:37 +01:00
artoscinote 5d276c803c
Merge pull request #4989 from artoscinote/ma_SCI_7934 
Fix MarvinJS image toolbar [SCI-7934]
 2023-02-17 15:53:27 +01:00
Martin Artnik fbf7e69100 Fix MarvinJS image toolbar [SCI-7934] 2023-02-17 15:43:57 +01:00