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

10890 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
artoscinote 6367842e1e
Step table CSS fixes [SCI-6998] (#4270) 2022-07-20 12:07:25 +02:00
Alex Kriuchykhin 7874a3e1c5
Fix updating protocol from repository [SCI-6993] (#4266) 2022-07-20 10:14:48 +02:00
artoscinote 087ffb28c3
Step element header style fixes [SCI-6996] (#4268) 2022-07-20 10:14:23 +02:00
ajugo 1732c8897a
Docx report fixes [SCI-6979] (#4265) 
* Fixes for docx [SCI-6979]

* Remove step description from DOCX [SCI-6979]
 2022-07-20 10:12:38 +02:00
artoscinote 49dfa2c2aa
Fix multiline paste on windows [SCI-6960] (#4267) 2022-07-19 16:44:35 +02:00
Alex Kriuchykhin fd4c6aa682
Merge pull request #4257 from okriuchykhin/ok_SCI_6986 
Fix protocol status bar reloading after step elements modifications [SCI-6986]
 2022-07-19 14:27:40 +02:00
Oleksii Kriuchykhin b582b138f5 Fix protocol status bar reloading after step elements modifications [SCI-6986] 2022-07-19 14:27:03 +02:00
artoscinote b6b1fed7e2
Fix alignment of items in reorder modal [SCI-6995] (#4264) 2022-07-19 10:10:07 +02:00
artoscinote 0c42e029ae
Fix step title alignments [SCI-6994] (#4263) 
* Fix step title alignments [SCI-6994]

* Fix step serializer [SCI-6994]
 2022-07-19 10:09:33 +02:00
artoscinote 6b8ea376bc
CSS fix for file dropdown [SCI-6990] (#4261) 2022-07-19 10:09:19 +02:00
ajugo ca87d93cb3
Fix protocol metadata alignments [SCI-6991] (#4262) 2022-07-18 16:56:51 +02:00
ajugo 8172523f5a
Protocol alignment fixes [SCI-6988] (#4259) 
* Fix rendering protocol steps

* Fix empty space for step text [SCI-6988]

* Align step number and step name [SCI-6988]

* Align step number and step name [SCI-6988]
 2022-07-18 16:56:06 +02:00
ajugo a55d6ea9de
Replaced default ruby error pages [SCI-6967] (#4230) 
* Replaced default ruby error pages [SCI-6967]

* Remove error 500 in controller [SCI-6967]
 2022-07-15 10:43:07 +02:00
ajugo 1cd5a35b32
Fix refresh task name from linked protocol [SCI-6992] (#4256) 2022-07-15 10:14:49 +02:00
ajugo 0d8d1270ce
Disable double clikc on new repository row [SCI-6977] (#4255) 2022-07-15 10:14:26 +02:00
ajugo ccf95fea24
Fix file block issues [SCI-6966] (#4244) 
* Fix bugs for step attachments [SCI-6966]

* Fix flickering on fast drag over of file [SCI-6966]

* Fix flickering on fast drag over of file [SCI-6966]

* CSS fixes, rearrange steps button hiding [SCI-6940][SCI-6934] (#4234)

* Hide rearange steps button when less than 2 steps [SCI-6934]

* Task status buttons CSS fix [SCI-6940]

* Fix microinteraction for table editing [SCI-6957] (#4236)

* Fix protocol elements allignments [SCI-6932]

* DOCX layout improvements [SCI-6857] (#4160)

* Fix edit step button [SCI-6938] (#4232)

* Clean storage usage check [SCI-6966]

Co-authored-by: artoscinote <85488244+artoscinote@users.noreply.github.com>
Co-authored-by: Anton <anton@scinote.net>
 2022-07-15 10:13:55 +02:00
Alex Kriuchykhin 7b158133cb
Merge pull request #4252 from okriuchykhin/ok_SCI_6973 
Fix step elements interactions for technician role [SCI-6973]
 2022-07-15 10:12:23 +02:00
aignatov-bio 63c54d9005
Merge pull request #4227 from aignatov-bio/ai-sci-6971-fix-step-comments 
Fix step comments [SCI-6971]
 2022-07-15 10:10:56 +02:00
artoscinote 39f5a017cf
Add print button to protocol in repository [SCI-6871] (#4246) 2022-07-15 10:10:18 +02:00
artoscinote c707a3aac6
Fix step update activities [SCI-6980] (#4250) 2022-07-15 10:09:49 +02:00
Oleksii Kriuchykhin a40b218f97 Fix step elements interactions for technician role [SCI-6973] 2022-07-15 10:09:38 +02:00
aignatov-bio 2ec93cef43
Merge pull request #4249 from aignatov-bio/ai-sci-6989-update-protocol-name-on-link 
Update protocol name on save with link [SCI-6989]
 2022-07-15 10:08:41 +02:00
ajugo bab466d908
Fix grip for checklist elemnt position [SCI-6961] (#4254) 2022-07-15 10:07:31 +02:00
ajugo c85612ee4e
Fix protocol template alignment and placeholders [SCI-6981] (#4253) 
* Fix protocol template alignment and placeholders [SCI-6981]

* Add placeholder text [SCI-6981]
 2022-07-15 10:00:50 +02:00
Alex Kriuchykhin 045d254d3c
Merge pull request #4245 from biosistemika/dependabot/npm_and_yarn/moment-2.29.4 
Bump moment from 2.29.2 to 2.29.4
 2022-07-15 09:40:59 +02:00
Anton e320571876 Update protocol name on save with link [SCI-6989] 2022-07-14 12:59:12 +02:00
aignatov-bio 2b8c512c4d
Merge pull request #4248 from aignatov-bio/ai-sci-6949-fix-merge-conflicts 
Fix merge issues for step [SCI-6949]
 2022-07-14 12:53:26 +02:00
Anton 32fac2f9ab Fix merge issues for step [SCI-6949] 2022-07-14 12:50:06 +02:00
aignatov-bio c5c6f73d32
Fix update sanitize gem version (#4247) 2022-07-14 12:36:02 +02:00
Alex Kriuchykhin 46cf62368d
Merge pull request #4229 from okriuchykhin/ok_SCI_6969 
Fix file upload and edit interactions on steps page [SCI-6969]
 2022-07-14 09:48:20 +02:00
dependabot[bot] 4de110cf5b
Bump moment from 2.29.2 to 2.29.4 
Bumps [moment](https://github.com/moment/moment) from 2.29.2 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.2...2.29.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-14 07:48:13 +00:00
Alex Kriuchykhin 0a8acb36f8
Merge pull request #4231 from okriuchykhin/ok_SCI_6974 
Fix display of stock consumption in assigned items table [SCI-6974]
 2022-07-14 09:47:57 +02:00
Alex Kriuchykhin 51ee4e46dd
Merge pull request #4233 from okriuchykhin/rails_6_1_6_1_fix 
Update Rails version to 6.1.6.1
 2022-07-14 09:47:40 +02:00
ajugo 5d2d002a04
Fix text element opening tinymce [SCI-6938] (#4243) 
* Fix edit step button [SCI-6938]

* Fix text element opening tinymce [SCI-6938]
 2022-07-13 21:09:30 +02:00
ajugo 914516ac4c
Fix checklist item alignments and step edit alignment [SCI-6961] (#4242) 2022-07-13 21:02:21 +02:00
aignatov-bio 4968a8d4ef
Merge pull request #4228 from aignatov-bio/ai-sci-6945-replace-scinote-illustrations 
Replace scinote illustrations [SCI-6945]
 2022-07-13 18:03:41 +02:00
aignatov-bio b65de36c29
Merge pull request #4239 from aignatov-bio/ai-sci-6970-step-rearranging-fixes 
Step rearranging fixes [SCI-6970]
 2022-07-13 18:03:12 +02:00
aignatov-bio 186f892288
Merge branch 'develop' into ai-sci-6970-step-rearranging-fixes 2022-07-13 18:03:03 +02:00
artoscinote c7ac9190c3
TinyMCE and styling fixes [SCI-6956][SCI-6952][SCI-6948] (#4241) 
* Also validate char count on paste in TinyMCE [SCI-6952]

* Fix new text tinymce init [SCI-6956]

* Fix step head styling [SCI-6952]

* Fix step dropdown icon [SCI-6948]
 2022-07-13 18:02:35 +02:00
artoscinote a73fc8c0fd
Fix automatically adding new checklist item [SCI-6960] (#4238) 2022-07-13 17:58:58 +02:00
aignatov-bio a845eec33e
Merge pull request #4240 from aignatov-bio/ai-sci-6958-fix-delete-modal 
Fix delete modals size [SCI-6958]
 2022-07-13 17:58:39 +02:00
ajugo df84496381
Fix edit step button [SCI-6938] (#4232) 2022-07-13 16:13:42 +02:00
Anton 34ff261ddf Fix delete modals size [SCI-6958] 2022-07-13 15:53:08 +02:00
Anton 496ade309c Step rearranging fixes [SCI-6970] 2022-07-13 15:17:32 +02:00
artoscinote 3d2e835268
DOCX layout improvements [SCI-6857] (#4160) 2022-07-13 12:52:56 +02:00
aignatov-bio b84e77210f
Merge pull request #4237 from aignatov-bio/ai-sci-6932-protocol-section-css-fixes 
Fix protocol elements alignments [SCI-6932]
 2022-07-13 12:42:22 +02:00
Anton cbeac82992 Fix protocol elements allignments [SCI-6932] 2022-07-13 12:37:57 +02:00
artoscinote 15e812a358
Fix rendering of WOPI files [SCI-6936] (#4235) 2022-07-13 12:21:56 +02:00
artoscinote a575487271
Fix microinteraction for table editing [SCI-6957] (#4236) 2022-07-13 12:21:41 +02:00
artoscinote 17eada574e
CSS fixes, rearrange steps button hiding [SCI-6940][SCI-6934] (#4234) 
* Hide rearange steps button when less than 2 steps [SCI-6934]

* Task status buttons CSS fix [SCI-6940]
 2022-07-13 10:47:12 +02:00