aignatov-bio
|
3633274c8f
|
Fix import for eln (#1741)
|
2019-05-13 10:22:30 +02:00 |
|
aignatov-bio
|
364f903b3c
|
Fix protocol preview name (#1749)
|
2019-05-13 10:17:47 +02:00 |
|
aignatov-bio
|
2010b3ad8f
|
Fix step comments bugs (#1751)
|
2019-05-13 09:49:53 +02:00 |
|
aignatov-bio
|
0b194eb3b1
|
Revert "Fix report saving (#1748)" (#1752)
This reverts commit 3db6129808.
|
2019-05-13 09:09:36 +02:00 |
|
aignatov-bio
|
3db6129808
|
Fix report saving (#1748)
|
2019-05-13 08:58:47 +02:00 |
|
aignatov-bio
|
634b58bd6a
|
Various UX improvements for note section [SCI-3444] (#1742)
* Various UX improvments for note section
|
2019-05-11 16:04:28 +02:00 |
|
mlorb
|
110c4ec460
|
Merge pull request #1743 from mlorb/ml-sci-3386
Fix tiny mce visuals, saving and cursor position [SCI-3386]
|
2019-05-10 17:45:12 +02:00 |
|
aignatov-bio
|
f684ddd365
|
Change dropdown highlight color and fix task tag position [SCI-3410] (#1735)
* Change dropdown highlight color and fix task tag position
|
2019-05-10 16:37:59 +02:00 |
|
Mojca Lorber
|
86255b9037
|
Remove automatic saving on task and protocol description
|
2019-05-10 15:30:29 +02:00 |
|
aignatov-bio
|
bbf54de9c7
|
Merge pull request #1736 from aignatov-bio/ai-sci-3423-add-old-tinymce-support
Add old tinymce image support [SCI-3423]
|
2019-05-10 15:27:42 +02:00 |
|
Mojca Lorber
|
d761a5cecb
|
Make tiny mce saving at clicking anywhere outside of the editor works only for task and protocol description
|
2019-05-10 11:27:47 +02:00 |
|
Mojca Lorber
|
8e6413b031
|
Fix tiny mce visuals, saving and cursor position
|
2019-05-10 10:52:14 +02:00 |
|
aignatov-bio
|
3bb268459f
|
Merge pull request #1739 from aignatov-bio/ai-sci-3425-add-smart-annotation-to-protocol-description
Fix smart annotation in protocols in repository [SCI-3425]
|
2019-05-09 15:36:42 +02:00 |
|
Anton Ignatov
|
2e6bab4638
|
Fix smart anottation to protocols in repository
|
2019-05-09 09:40:40 +02:00 |
|
aignatov-bio
|
531badf9ec
|
Merge pull request #1738 from aignatov-bio/ai-sci-3424-fix-uploading-portocol-from-repo
Fix protocol update error, rollback bootstrap gems and fix step name [SCI-3424][SCI-3427]
|
2019-05-08 17:40:24 +02:00 |
|
Anton Ignatov
|
995408e7fc
|
Fix protocol update error, rollback bootstrap gems and fix step name
|
2019-05-08 17:18:19 +02:00 |
|
Anton Ignatov
|
bee87f51ba
|
Fix tests
|
2019-05-08 15:22:06 +02:00 |
|
Anton Ignatov
|
5a5101410c
|
Fix markup
|
2019-05-08 14:35:28 +02:00 |
|
Anton Ignatov
|
b2063d3018
|
Fix markup
|
2019-05-08 14:30:33 +02:00 |
|
Anton Ignatov
|
f201c5440b
|
Add check for old tinymce for report and reassign process
|
2019-05-08 14:29:25 +02:00 |
|
Anton Ignatov
|
5d959f648e
|
Convert old tinymce assets to new on fly
|
2019-05-08 14:23:26 +02:00 |
|
aignatov-bio
|
d08bdd771e
|
Fix task tag cut off (#1734)
|
2019-05-08 10:21:59 +02:00 |
|
Miha Mencin
|
0a7696200a
|
Merge pull request #1732 from aignatov-bio/ai-sci-3413-tinymce-step-not-loading
Clear step edit textarea status before going to edit mode [SCI-3413]
|
2019-05-07 16:36:04 +02:00 |
|
Miha Mencin
|
b31645adbe
|
Merge pull request #1731 from aignatov-bio/ai-sci-3418-fix-window-scroll-after-exit-from-tinymce
Fix floating tool bar and scroll issue after leaving editor [SCI-3418]
|
2019-05-07 16:35:49 +02:00 |
|
Miha Mencin
|
60fd1a02c6
|
Merge pull request #1730 from aignatov-bio/ai-sci-3410-add-task-tag-on-enter
Add task tag on enter button [SCI-3410]
|
2019-05-07 16:35:34 +02:00 |
|
Miha Mencin
|
e660b64261
|
Merge pull request #1728 from aignatov-bio/ai-sci-3262-update-export-import-scripts
Update team exporter for new tinyMCE images [SCI-3262]
|
2019-05-07 16:35:23 +02:00 |
|
Miha Mencin
|
4b76151e40
|
Merge pull request #1727 from mlorb/ml-sci-3384
Fix bug when saving empty step description [SCI-3384]
|
2019-05-07 16:35:12 +02:00 |
|
Miha Mencin
|
7c088c8432
|
Merge pull request #1725 from aignatov-bio/ai-sci-3411-due-date-in-one-line
Fix due date position [SCI-3411]
|
2019-05-07 16:34:23 +02:00 |
|
Miha Mencin
|
7760e9611f
|
Merge pull request #1726 from aignatov-bio/ai-sci-3409-fix-icon-for-uncomplete-task
Fix button icon for uncomplete task [SCI-3409]
|
2019-05-07 16:34:00 +02:00 |
|
Anton Ignatov
|
ea545801aa
|
Clear edit textarea status before going to editmode
|
2019-05-07 15:54:32 +02:00 |
|
Anton Ignatov
|
826ed63f17
|
Fix floating tool bar and scroll issue after leaving editor
|
2019-05-07 15:21:15 +02:00 |
|
Anton Ignatov
|
168424a035
|
Add tag on enter button
|
2019-05-07 14:47:44 +02:00 |
|
Anton Ignatov
|
72a1c9b9bd
|
Fix merge conflict
|
2019-05-07 13:27:57 +02:00 |
|
Anton Ignatov
|
d36160386f
|
Merge branch 'master' into master-with-note-section
|
2019-05-07 13:26:55 +02:00 |
|
Anton Ignatov
|
7f296b35fa
|
Update team exporter for new tinymce images
|
2019-05-07 13:22:55 +02:00 |
|
aignatov-bio
|
7d54f2ab01
|
Fix issue with TInyMCE upload plugin (#1723)
|
2019-05-07 10:24:02 +02:00 |
|
Mojca Lorber
|
46e8f80965
|
Fix bug when saving empty step description
|
2019-05-06 17:14:19 +02:00 |
|
Anton Ignatov
|
0e1e7c3d82
|
Fix button icon for uncomplete task
|
2019-05-06 16:35:46 +02:00 |
|
Anton Ignatov
|
2d4f4ec8f8
|
Merge branch 'master-with-note-section' into ai-sci-3411-due-date-in-one-line
|
2019-05-06 16:22:34 +02:00 |
|
Anton Ignatov
|
2a294c408f
|
Fix due date alignment and chage header structure from bootstrap to flexbox
|
2019-05-06 16:20:00 +02:00 |
|
aignatov-bio
|
4c1a64ce4f
|
Fix tags line up (#1722)
|
2019-05-06 14:19:32 +02:00 |
|
Alex Kriuchykhin
|
f75c642884
|
Merge pull request #1721 from okriuchykhin/ok_SCI_3401
Update Ruby to 2.5.5, Rails to 5.1.7 and Devise to 4.6.2 [SCI-3401]
|
2019-05-06 12:58:23 +02:00 |
|
Jure Grabnar
|
c866d96ea7
|
Merge pull request #1720 from jbargu/jg_sci_3375
One project is duplicated in project list [SCI-3375]
|
2019-05-06 11:43:24 +02:00 |
|
Alex Kriuchykhin
|
3f0401bf9a
|
Merge pull request #1709 from okriuchykhin/ok_SCI_3398
Fix TinyMCE for results [SCI-3398]
|
2019-05-06 10:47:11 +02:00 |
|
mlorb
|
df16b54be0
|
Merge pull request #1719 from mlorb/ml-sci-3399
Visual fixes for edit/add step on protocol [SCI-3399]
|
2019-05-06 10:33:28 +02:00 |
|
Alex Kriuchykhin
|
49a790c50a
|
Merge pull request #1698 from okriuchykhin/ok_SCI_3182
Switch to memory_store for caching in production [SCI-3182]
|
2019-05-06 09:59:25 +02:00 |
|
aignatov-bio
|
cc8a152278
|
Fix step attachments sorting (#1718)
|
2019-05-06 09:56:26 +02:00 |
|
Oleksii Kriuchykhin
|
4522e6bf06
|
Update Ruby to 2.5.5, Rails to 5.1.7 and Devise to 4.6.2 [SCI-3401]
|
2019-04-30 17:04:48 +02:00 |
|
Jure Grabnar
|
de6509cc97
|
Add distinct to #visible_to in project.rb
Closes SCI-3375
|
2019-04-30 16:40:12 +02:00 |
|
Mojca Lorber
|
7be151bd2d
|
Visual fixes for edit/add step on protocol
|
2019-04-30 14:57:50 +02:00 |
|