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

11938 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Giga Chubinidze ac4b090560 slight style refactor 2023-02-03 13:38:03 +04:00
Giga Chubinidze ed4363484a Step timestamp display [SCI-7837] 2023-02-03 11:12:33 +04:00
Alex Kriuchykhin 00d99ee296
Fix user assigning to teams with existing team sharing records [SCI-7720] (#4879) 2023-01-24 15:47:53 +01:00
artoscinote 3fdbed382e
Merge pull request #4878 from artoscinote/ma_SCI_7803 
Fix pasting same image multiple times [SCI-7803]
 2023-01-24 12:35:18 +01:00
Martin Artnik 0a768fbfa3 Fix pasting same image multiple times [SCI-7803] 2023-01-24 11:52:20 +01:00
artoscinote 07f2b83f81
Merge pull request #4828 from sboursen-scinote/sb_SCI-7745 
Fix: Edit task from experiment table view - Enter causes error [SCI-7745]
 2023-01-24 10:21:20 +01:00
artoscinote d319f9bf89
Fix copying multiple TinyMCE images [SCI-7803] (#4875) 2023-01-24 10:11:52 +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
Alex Kriuchykhin b3267d7934
Fix multiple inventory reminders issues [SCI-7805][SCI-7808][SCI-7809] (#4876) 2023-01-24 09:36:13 +01:00
Giga Chubinidze 01f6f4d5ea changed logic for item naming 2023-01-21 01:08:17 +04:00
G-Chubinidze 913cd26e70
Update of sharing options to all teams is not saved [SCI-7421] (#4852) 
* Update of sharing options to all teams is not saved
 2023-01-20 14:14:34 +01:00
sboursen-scinote 874b026c33 Clear table sci-checkbox after rename[SCI-7745] 2023-01-20 14:14:18 +01:00
sboursen-scinote 87ca1fcb77 Revert changes to clearRowTaskSelection [SCI-7745] 2023-01-20 13:54:41 +01:00
artoscinote 599ef71c90
Merge pull request #4863 from artoscinote/ma_SCI_7788 
Add tinymce image permission checks [SCI-7788]
 2023-01-20 11:44:51 +01:00
Martin Artnik fb4cbad4e8 Add tinymce image permission checks [SCI-7788] 2023-01-20 10:45:56 +01:00
Alex Kriuchykhin 5238a858bd
Fix tags modal in table view for archived tasks [SCI-7743] (#4867) 2023-01-20 10:21:52 +01:00
Alex Kriuchykhin 9050785bb1
Update Rails to 6.1.7.1 (#4868) 2023-01-20 10:20:43 +01:00
ajugo d178235dec
Fix the experiment table view checkbox toggling [SCI-7792] (#4866) 2023-01-19 17:59:41 +01:00
ajugo 0973659f52
Fix duplicated tasks in the table after filtering or duplicating [SCI-7794] (#4865) 2023-01-19 17:59:12 +01:00
Miha Mencin d3ce565c1d
Update LICENSE.txt to new copyright holder - SciNote (#4848) 
* Update LICENSE.txt
 2023-01-19 17:24:18 +01:00
Alex Kriuchykhin a69c2d1a55
Merge pull request #4869 from scinote-eln/dependabot/bundler/globalid-1.0.1 
Bump globalid from 1.0.0 to 1.0.1
 2023-01-19 17:10:48 +01:00
dependabot[bot] 75eb120159
Bump globalid from 1.0.0 to 1.0.1 
Bumps [globalid](https://github.com/rails/globalid) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/rails/globalid/releases)
- [Commits](https://github.com/rails/globalid/compare/v1.0.0...v1.0.1)

---
updated-dependencies:
- dependency-name: globalid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-19 16:06:55 +00:00
Alex Kriuchykhin 7980411db6
Merge pull request #4856 from scinote-eln/dependabot/bundler/rack-2.2.6.2 
Bump rack from 2.2.5 to 2.2.6.2
 2023-01-19 17:03:55 +01:00
artoscinote a9daa476e9
Merge pull request #4864 from artoscinote/ma_SCI_7796 
Cast rgb() formatted css colors to hex for DOCX [SCI-7796]
 2023-01-19 15:55:58 +01:00
Martin Artnik 0304daef7d Cast rgb() formatted css colors to hex for DOCX [SCI-7796] 2023-01-19 15:50:59 +01:00
sboursen-scinote 658862fca7 Refactor using delegated event [SCI-7745] 2023-01-19 15:36:34 +01:00
sboursen-scinote 3e60885d05 Fix the css selector in the clearnRowTaskSelection method and clear the checkboxes on task rename action [SCI-7745] 2023-01-19 15:35:25 +01:00
artoscinote f72a281e0a
Merge pull request #4850 from artoscinote/ma_SCI_7776 
Fix navigating away with unsaved TinyMCE changes [SCI-7776]
 2023-01-19 14:27:19 +01:00
Alex Kriuchykhin 58be66a06c
Merge pull request #4855 from okriuchykhin/ok_SCI_7779 
Fix icons in custom tinyMCE menu [SCI-7779]
 2023-01-19 13:21:35 +01:00
ajugo 6110068026
Fix protocols.io import [SCI-7791] (#4861) 2023-01-19 13:09:48 +01:00
artoscinote c1c8425a93
Merge pull request #4857 from artoscinote/ma_SCI_7778 
Fix text result creation [SCI-7778]
 2023-01-19 13:02:12 +01:00
artoscinote 20dee016ab
Merge pull request #4860 from artoscinote/ma_SCI_7780 
Initialize task provisioning polling on table page load [SCI-7780]
 2023-01-19 13:01:31 +01:00
aignatov-bio d6bbdac2bb
Merge pull request #4862 from aignatov-bio/ai-sci-7782-fix-excel-tables-in-tinymce 
Fix table overflow for TinyMCE [SCI-7782]
 2023-01-19 12:59:20 +01:00
Anton a39058ffe5 Fix table overflow for TinyMCE [SCI-7782] 2023-01-19 12:56:15 +01:00
Martin Artnik 8f97b8ad93 Initialize task provisioning polling on table page load [SCI-7780] 2023-01-19 12:35:24 +01:00
ajugo d64ccb441e
Fix bullet points and blocks in tinyMCE fields [SCI-7777][SCI-7785] (#4859) 2023-01-19 11:39:14 +01:00
Martin Artnik 6bddd6c716 Fix text result creation [SCI-7778] 2023-01-19 08:58:05 +01:00
dependabot[bot] 122c326216
Bump rack from 2.2.5 to 2.2.6.2 
Bumps [rack](https://github.com/rack/rack) from 2.2.5 to 2.2.6.2.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.5...v2.2.6.2)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-19 02:01:41 +00:00
Oleksii Kriuchykhin a6abc9d7e5 Fix icons in custom tinyMCE menu [SCI-7779] 2023-01-18 16:43:50 +01:00
Alex Kriuchykhin 1ac86b8188
Merge pull request #4832 from okriuchykhin/ok_SCI_7638 
Improve loading speed of inventory table [SCI-7638]
 2023-01-18 11:39:52 +01:00
Oleksii Kriuchykhin e51cf28ec6 Improve loading speed of inventory table [SCI-7638] 2023-01-18 11:10:43 +01:00
Martin Artnik b46c92b3c6 Fix navigating away with unsaved TinyMCE changes [SCI-7776] 2023-01-18 11:00:08 +01:00
Alex Kriuchykhin f455b8fb32
Merge pull request #4784 from okriuchykhin/ok_SCI_7703 
Improve handling of db locks [SCI-7703]
 2023-01-18 10:24:52 +01:00
Alex Kriuchykhin 3466a67de1
Merge pull request #4838 from okriuchykhin/ok_SCI_7743 
Fix tags editing for archived tags [SCI-7743]
 2023-01-17 17:31:02 +01:00
Oleksii Kriuchykhin 3a85cdde0a Improve handling of db locks [SCI-7703] 2023-01-17 17:30:20 +01:00
artoscinote 27ec967f11
Merge pull request #4849 from artoscinote/ma_SCI_7737 
Always use e.currentTarget [SCI-7737]
 2023-01-17 16:24:18 +01:00
Martin Artnik e0fff38d49 Always use e.currentTarget [SCI-7737] 2023-01-17 16:13:19 +01:00
aignatov-bio 42bf090eb3
Merge pull request #4846 from aignatov-bio/ai-sci-7540-improve-microinteracitons-experiment-table 
Improve microinteractions in experiment table [SCI-7540]
 2023-01-17 15:13:00 +01:00
aignatov-bio 5cbaf83067
Merge pull request #4845 from aignatov-bio/ai-sci-7758-fix-user-designation-on-creation 
Fix user designation on task creation [SCI-7758]
 2023-01-17 15:12:46 +01:00
artoscinote c7dc9efe10
Merge pull request #4847 from artoscinote/ma_SCI_7774 
Fix copying and pasting TinyMCE images [SCI-7774]
 2023-01-17 14:48:50 +01:00