Alex Kriuchykhin
|
48bdc880f5
|
Merge pull request #1693 from okriuchykhin/ok_SCI_3266
Fix task clonning with TinyMCE images [SCI-3266]
|
2019-04-23 17:02:52 +02:00 |
|
Oleksii Kriuchykhin
|
7c91b4a255
|
Merge remote-tracking branch 'scinote/master-with-note-section' into ok_SCI_3266
|
2019-04-23 17:01:13 +02:00 |
|
Oleksii Kriuchykhin
|
c7a707f9db
|
Fix task clonning with TinyMCE images [SCI-3266]
|
2019-04-23 15:16:40 +02:00 |
|
Urban Rotnik
|
f894bca694
|
Add saving event when user clicks out of textarea
|
2019-04-23 15:02:59 +02:00 |
|
Urban Rotnik
|
774521df7a
|
Changes to comments section in Task Steps
|
2019-04-23 15:02:58 +02:00 |
|
Urban Rotnik
|
11a7a975af
|
Merge branch 'features/scinote-improvements' into master-with-note-section
|
2019-04-23 14:50:03 +02:00 |
|
Urban Rotnik
|
55bb9d06c4
|
Merge pull request #1652 from urbanrotnik/ur-sci-3136-changes-to-appearance-of-attachment-section
Changes to attacmhemnts on step [SCI-3136] [SCI-3167]
|
2019-04-23 14:17:59 +02:00 |
|
Urban Rotnik
|
7a2bfc12ce
|
Remove form_asset partial
|
2019-04-23 13:50:48 +02:00 |
|
Urban Rotnik
|
b1dabaca15
|
New helper for file thumbnails
|
2019-04-23 13:50:48 +02:00 |
|
Urban Rotnik
|
ea0368aa11
|
Attachments update for edit page
|
2019-04-23 13:50:47 +02:00 |
|
Anton Ignatov
|
7d60eb5572
|
Fix migration issues
|
2019-04-23 11:11:22 +02:00 |
|
Anton Ignatov
|
aa2dab2014
|
Merge branch 'features/note-section' into master-with-note-section
|
2019-04-23 10:31:37 +02:00 |
|
Jure Grabnar
|
1da1558849
|
Merge pull request #1683 from jbargu/jg_3179
Archived results are now separated in exported project
|
2019-04-19 18:26:22 +02:00 |
|
aignatov-bio
|
6ac620feb3
|
Migration for old tinymce assets [SCI-3176] (#1663)
* adding rake task
* Addign test for update images
* Adding tests for tiny mce model
|
2019-04-19 15:24:54 +02:00 |
|
aignatov-bio
|
6968060078
|
Fix user order bug (#1687)
|
2019-04-19 15:24:13 +02:00 |
|
aignatov-bio
|
92d8e42a92
|
Add floating toolbar for tinymce (#1688)
|
2019-04-19 15:12:06 +02:00 |
|
aignatov-bio
|
ba1e3dc3c6
|
Add smooth loading for inline task and protoocl description editing (#1682)
|
2019-04-19 14:47:05 +02:00 |
|
aignatov-bio
|
6b45dcd475
|
Update eln export for new tinyMCE image format (#1680)
|
2019-04-19 14:44:40 +02:00 |
|
aignatov-bio
|
a75c4c2f91
|
Update Result API for new tiny mce image format (#1674)
|
2019-04-19 14:44:16 +02:00 |
|
Mojca Lorber
|
208b7c9939
|
Fix hound
|
2019-04-19 13:56:21 +02:00 |
|
Mojca Lorber
|
36e7cfe5c4
|
Change failing tests
|
2019-04-19 13:37:52 +02:00 |
|
Mojca Lorber
|
b00cf07684
|
Add activity for importing inventory items
|
2019-04-18 15:18:10 +02:00 |
|
Miha Mencin
|
be31cc373d
|
Update Version
to 1.16.2
|
2019-04-18 10:22:35 +02:00 |
|
aignatov-bio
|
1da0a3c6ef
|
Merge pull request #1685 from aignatov-bio/ai-disable-zoom
disable zoom
|
2019-04-18 09:15:27 +02:00 |
|
Anton Ignatov
|
f1d801117d
|
disable zoom
|
2019-04-18 09:11:27 +02:00 |
|
Alex Kriuchykhin
|
8fa6bbc0ab
|
Merge pull request #1679 from okriuchykhin/ok_SCI_3177
Improve experiment preview image generation [SCI-3177]
|
2019-04-17 20:35:29 +02:00 |
|
aignatov-bio
|
f6c04c252e
|
Merge pull request #1684 from aignatov-bio/ai-fix-ie-zoom-out
Remove minimum zoom size
|
2019-04-17 18:58:38 +02:00 |
|
Anton Ignatov
|
f6ecea42cf
|
Remove minimum zoom size
|
2019-04-17 18:51:52 +02:00 |
|
Miha Mencin
|
7e699ce648
|
Update Version
to 1.16.1
|
2019-04-17 18:17:05 +02:00 |
|
Jure Grabnar
|
1295c0583a
|
Archived results are now separated in exported project
Closes SCI-3179
|
2019-04-17 16:37:21 +02:00 |
|
Alex Kriuchykhin
|
5799065036
|
Merge pull request #1681 from okriuchykhin/schema_update
Update schema.rb file
|
2019-04-17 15:39:23 +02:00 |
|
Oleksii Kriuchykhin
|
4014f19665
|
Update schema.rb file
|
2019-04-17 14:57:38 +02:00 |
|
Oleksii Kriuchykhin
|
96cf7b4de2
|
Fix failing tests [SCI-3177]
|
2019-04-17 12:58:47 +02:00 |
|
Alex Kriuchykhin
|
b4cf665c21
|
Merge pull request #1673 from okriuchykhin/ok_SCI_3294
Fix team export/import for new activities [SCI-3294]
|
2019-04-17 12:49:45 +02:00 |
|
Oleksii Kriuchykhin
|
f9832013b0
|
Improve experiment preview image generation [SCI-3177]
|
2019-04-17 12:06:46 +02:00 |
|
Urban Rotnik
|
12bfb7e51c
|
Merge pull request #1678 from urbanrotnik/ur-sci-3355-notifications-dropdown-problem-with-1-team
Fix navigationJS team switch when have only 1 team [SCI-3355]
|
2019-04-17 10:15:53 +02:00 |
|
Urban Rotnik
|
3f037ef517
|
Fix navigationJS team switch when have only 1 team
|
2019-04-17 09:58:18 +02:00 |
|
Urban Rotnik
|
782d1dfc2d
|
Merge pull request #1677 from urbanrotnik/ur-sci-3345-export-all-counter-fix-2
Exports left after export [SCI-3345]
|
2019-04-16 14:44:48 +02:00 |
|
Urban Rotnik
|
4f8faba84e
|
Exports left after export fix
|
2019-04-16 14:21:47 +02:00 |
|
Alex Kriuchykhin
|
663f6a9d38
|
Merge pull request #1676 from okriuchykhin/ok_SCI_3347
Remove unused devise_security_extension dependency [SCI-3347]
|
2019-04-16 13:10:40 +02:00 |
|
Oleksii Kriuchykhin
|
572f28f0b8
|
Remove unused devise_security_extension dependency [SCI-3347]
|
2019-04-16 13:08:15 +02:00 |
|
Urban Rotnik
|
0ba0dccd57
|
Merge pull request #1675 from urbanrotnik/ur-sci-3345-export-all-counter-fix
Fix for exports_left, fix for some edge cases [SCI-3345]
|
2019-04-16 10:32:31 +02:00 |
|
Urban Rotnik
|
22af36dd2d
|
Fix for exports_left, fix for some edge cases
|
2019-04-16 09:59:02 +02:00 |
|
Oleksii Kriuchykhin
|
2320941b5d
|
Fix team export/import for new activities [SCI-3294]
|
2019-04-15 15:13:10 +02:00 |
|
mlorb
|
1e3d0e901a
|
Merge pull request #1667 from mlorb/ml-sci-3304
Fix links in activity message for protocols in repository [SCI-3304]
|
2019-04-15 11:55:08 +02:00 |
|
aignatov-bio
|
4fec72bc46
|
Merge pull request #1671 from aignatov-bio/ai-sci-3319-duplicate-activity-wronglink
Fix duplicate activity issue and fix link to inventory [SCI-3319]
|
2019-04-15 11:51:09 +02:00 |
|
Urban Rotnik
|
7eeba0e57e
|
Merge pull request #1670 from urbanrotnik/ur-sci-3343-dynamic-filtering-default-fix
Dynamic filtering default fix [SCI-3343]
|
2019-04-15 11:40:16 +02:00 |
|
Anton Ignatov
|
dd8b3caf65
|
Fix duplicate activtiy issue and fix link to inventory
|
2019-04-15 11:35:30 +02:00 |
|
Urban Rotnik
|
83f2a5c961
|
Dynamic filtering default fix
|
2019-04-15 11:20:43 +02:00 |
|
Alex Kriuchykhin
|
a61d637e6d
|
Merge pull request #1669 from okriuchykhin/ok_SCI_3340
Fix crash when no activities present [SCI-3340]
|
2019-04-15 11:13:25 +02:00 |
|