Oleksii Kriuchykhin
|
40550f92c9
|
Improve HTML data escaping in JSON endpoints [SCI-3403]
|
2019-05-08 17:38: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 |
|
Urban Rotnik
|
d5e2398f5c
|
Merge pull request #1699 from urbanrotnik/ur-sci-3346-global-activities-fix
Bulk insert for SystemNotifications, updated ordering [SCI-3346]
|
2019-05-08 09:17:56 +02:00 |
|
Urban Rotnik
|
62bc0520e9
|
Update method last_sync_timestamp from Last to First user
|
2019-05-08 08:38:11 +02:00 |
|
Urban Rotnik
|
2364c2653f
|
Add bulk insert for UserSystemNotifications, New service for sending emails
|
2019-05-08 08:38:10 +02:00 |
|
Urban Rotnik
|
357c6e6b98
|
Change ordering by created_at instead by last_time_changed_at
|
2019-05-08 08:37:34 +02:00 |
|
Oleksii Kriuchykhin
|
8239ab9c6b
|
Fix TravisCI tests [SCI-3402]
|
2019-05-07 17:27:23 +02:00 |
|
Alex Kriuchykhin
|
66a563e032
|
Merge pull request #1733 from okriuchykhin/ok_SCI_3351
Fix deletion of unconfirmed users [SCI-3351]
|
2019-05-07 16:43:05 +02:00 |
|
Oleksii Kriuchykhin
|
84712de9ca
|
Fix failing tests [SCI-3368]
|
2019-05-07 16:42:06 +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 |
|
Oleksii Kriuchykhin
|
8461949bed
|
Fix deletion of inconfirmed users [SCI-3351]
|
2019-05-07 16:02:45 +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 |
|
Oleksii Kriuchykhin
|
0147b3e3d7
|
Switch from package-lock.json to yarn.lock [SCI-3402]
|
2019-05-06 14:04:41 +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 |
|
aignatov-bio
|
60296419e8
|
Update project card due date dropdown (#1716)
|
2019-04-30 13:30:09 +02:00 |
|
Anton Ignatov
|
7c55fcf0cf
|
Merge branch 'master' into master-with-note-section
|
2019-04-30 12:07:59 +02:00 |
|
mlorb
|
9f0983de77
|
Merge pull request #1706 from mlorb/ml-sci-3350
Change ownership of inventory items, when a user leaves a team [SCI-3350]
|
2019-04-30 10:39:14 +02:00 |
|
aignatov-bio
|
26dc1a0a4a
|
Note section css issues [SCI-3378] (#1715)
* Fix step name width bug
|
2019-04-30 10:23:44 +02:00 |
|
aignatov-bio
|
687b53feb1
|
Add new tag activtiies [SCI-3341] (#1712)
* Add new tag activtiies
|
2019-04-30 10:23:09 +02:00 |
|