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
Oleksii Kriuchykhin
382ed40dc4
Update Rails version to 6.1.6.1
2022-07-13 10:39:43 +02:00
Oleksii Kriuchykhin
d3a8b3ca59
Fix display of stock consumption in assigned items table [SCI-6974]
2022-07-12 16:53:07 +02:00
Oleksii Kriuchykhin
747e88fafc
Fix file upload and edit interactions on steps page [SCI-6969]
2022-07-12 15:24:12 +02:00
Anton
6b1259bdfc
Replace scinote illustrations [SCI-6945]
2022-07-12 14:34:27 +02:00
Anton
8e8826d33c
Fix step comments [SCI-6971]
2022-07-12 13:54:10 +02:00
Martin Artnik
99e5f7558a
Fix CSS syntax error
2022-07-12 10:59:33 +02:00
artoscinote
765e5b99bd
Protocol editing CSS fixes [SCI-6940] ( #4194 )
2022-07-12 10:43:01 +02:00
artoscinote
c89968453e
Fix checklist issues [SCI-6960] ( #4222 )
2022-07-12 10:41:58 +02:00
aignatov-bio
33e3d0f3f0
Merge pull request #4226 from aignatov-bio/ai-sci-6965-fix-save-to-protocol
...
Fix save protocol repository [SCI-6965]
2022-07-12 10:40:54 +02:00
aignatov-bio
3184647141
Merge pull request #4221 from aignatov-bio/ai-sci-6959-fix-step-content-blocks-allignment
...
Fix elements step elements alignment [SCI-6959]
2022-07-12 10:38:15 +02:00
aignatov-bio
67dbab97d9
Merge pull request #4220 from aignatov-bio/ai-sci-6944-change-core-colors
...
Update accent colors [SCI-6944]
2022-07-12 10:38:01 +02:00
Anton
e8a0e7c7d4
Fix save protocol repository [SCI-6965]
2022-07-12 10:37:36 +02:00
ajugo
7b525e5986
Fix en.yml [SCI-5319] ( #4225 )
2022-07-12 10:33:37 +02:00
ajugo
c2f17760ea
Replace favicon in public folder and fix what's new title [SCI-5319] ( #4224 )
...
* Fix what's new tab name [SCI-5319]
* Change favicons in public folder [SCI-5319]
2022-07-12 10:16:04 +02:00
artoscinote
dd27fadd98
Add step reordering and step element reordering service endpoints to API [SCI-6891][SCI-6892] ( #4179 )
...
* Add step reordering service endpoint to API [SCI-6891]
* Generalize reorder validation [SCI-6891]
* Add endpoint for reordering step elements, fix issues [SCI-6892]
* Add appropriate serializers [SCI-6891][SCI-6892]
* Add step elements to step serializer [SCI-6891]
* Simplify routes, add locking [SCI-6891]
2022-07-12 10:13:47 +02:00
ajugo
82132c865c
Add archived result counter and fix result counter [SCI-6946][6975] ( #4223 )
2022-07-12 09:58:21 +02:00
Alex Kriuchykhin
effd75a71a
Add ordering for tags on protocols page [SCI-6943] ( #4214 )
2022-07-12 09:49:24 +02:00
Anton
b5d67d429b
Fix elements step elements alignment [SCI-6959]
2022-07-11 13:53:16 +02:00
Anton
e472855690
Update accent colors [SCI-6944]
2022-07-11 12:00:13 +02:00
ajugo
045485ff45
Fix checklist item alignments and placeholder text [SCI-6961] ( #4211 )
2022-07-11 11:52:38 +02:00
aignatov-bio
cb86fe0e06
Merge pull request #4219 from aignatov-bio/ai-sci-6958-fix-steps-delete-modal
...
Fix delete steps modal size [SCI-6958]
2022-07-11 11:31:48 +02:00
ajugo
4db46eac44
Fix linked protocol naming and i flyout [SCI-6963] ( #4213 )
2022-07-11 11:29:05 +02:00
Anton
d805a420b9
Fix delete steps modal size [SCI-6958]
2022-07-11 11:28:45 +02:00
