Commit graph

10905 commits

Author SHA1 Message Date
aignatov-bio
25b808532d
Merge pull request #4258 from aignatov-bio/ai-sci-6972-fix-viewer-role
Fix step for viewer role [SCI-6972]
2022-07-25 11:38:08 +02:00
Anton
3f82666619 Fix step for viewer role [SCI-6972] 2022-07-25 11:35:34 +02:00
artoscinote
dabb600e6f
Fix rounded corners on text block [SCI-6996] (#4281) 2022-07-25 11:33:06 +02:00
aignatov-bio
cc47d2718f
Merge pull request #4282 from aignatov-bio/ai-sci-7008-fix-enter-button-on-checklist-item
Allow multiline in checklist items [SCI-7008]
2022-07-25 11:24:01 +02:00
Anton
70fe27f31b Allow multiline in checklist items [SCI-7008] 2022-07-25 11:21:31 +02:00
artoscinote
6f72777acd
Fix rounded corners on step elements [SCI-6996] (#4279) 2022-07-21 16:36:14 +02:00
artoscinote
5ec1002329
Simplify task locking logic on FE [SCI-6987] (#4278) 2022-07-21 15:49:03 +02:00
artoscinote
ac4e30d709
Fix reloading of attachments after saving MarvinJS [SCI-7015] (#4277) 2022-07-21 14:28:21 +02:00
ajugo
e4c5c66d35
Fix wopi file creation [SCI-7014] (#4276) 2022-07-21 14:19:06 +02:00
Alex Kriuchykhin
b9d953b3a4
Fix pdf report styling and bookmarks [SCI-6978] (#4274) 2022-07-21 09:57:28 +02:00
artoscinote
28ca1aaec6
Disable checklist item drag for less than 2 items, fix base element controller [SCI-6997] (#4275) 2022-07-21 09:57:14 +02:00
Alex Kriuchykhin
d5e4af953c
Merge pull request #4269 from biosistemika/dependabot/npm_and_yarn/terser-4.8.1
Bump terser from 4.0.2 to 4.8.1
2022-07-21 09:45:51 +02:00
artoscinote
d0cc3155f1
Only activate overlay when dragging files [SCI-6997] (#4272) 2022-07-20 13:39:04 +02:00
artoscinote
088c4c1c94
Add hover state to step checkbox [SCI-6999] (#4271) 2022-07-20 12:24:43 +02:00
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
dependabot[bot]
b967f8d7e4
Bump terser from 4.0.2 to 4.8.1
Bumps [terser](https://github.com/terser/terser) from 4.0.2 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-20 01:29:55 +00: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