Anton Ignatov
|
259b75a6ba
|
Merge branch 'master' into features/marvinjs-integration
|
2019-05-16 09:28:48 +02:00 |
|
aignatov-bio
|
980d86824f
|
Fix updating process for old tinyMCE tags (#1772)
* Fix update old tinyMCE for deleted objects
* Add error handling
|
2019-05-15 16:11:48 +02:00 |
|
aignatov-bio
|
1555daa0c6
|
Fix non associated tinyMCE images (#1762)
* Fix non assosiated tinyMCE images
|
2019-05-14 15:01:57 +02:00 |
|
Anton Ignatov
|
e5b4adcc25
|
Merge branch 'master-with-note-section' into features/marvinjs-integration
|
2019-05-11 20:51:01 +02:00 |
|
Anton Ignatov
|
bee87f51ba
|
Fix tests
|
2019-05-08 15:22:06 +02:00 |
|
Anton Ignatov
|
5d959f648e
|
Convert old tinymce assets to new on fly
|
2019-05-08 14:23:26 +02:00 |
|
Anton Ignatov
|
dcf94e78e1
|
Merge branch 'master-with-note-section' into feature/marvinjs-integration
|
2019-05-08 14:03:41 +02:00 |
|
Anton Ignatov
|
7f296b35fa
|
Update team exporter for new tinymce images
|
2019-05-07 13:22:55 +02:00 |
|
Anton Ignatov
|
f80d881847
|
Fix markup
|
2019-04-28 19:11:41 +02:00 |
|
Anton Ignatov
|
260810fff8
|
Add editing mode for tinymce images
|
2019-04-28 16:16:31 +02:00 |
|
Anton Ignatov
|
193edfbc35
|
Add marvin js support to TinyMCE
|
2019-04-27 22:54:59 +02:00 |
|
aignatov-bio
|
84993ea3ef
|
Update protocol repository for new description format [SCI-3371] (#1689)
* Update protocol repository for new description format
* move image clone method to concerns
|
2019-04-24 13:34:56 +02:00 |
|
Oleksii Kriuchykhin
|
c7a707f9db
|
Fix task clonning with TinyMCE images [SCI-3266]
|
2019-04-23 15:16:40 +02:00 |
|
aignatov-bio
|
6b45dcd475
|
Update eln export for new tinyMCE image format (#1680)
|
2019-04-19 14:44:40 +02:00 |
|
Anton Ignatov
|
c9f9523210
|
Remove src when save description and rename token tag
|
2019-04-02 13:41:32 +02:00 |
|
Anton Ignatov
|
4ec0a3c871
|
Update TinyMCE image loader for new fields
|
2019-03-22 10:52:26 +01:00 |
|
Anton Ignatov
|
5d6f009ee8
|
fix error for delay deleting
|
2019-03-20 15:20:31 +01:00 |
|
Anton Ignatov
|
55c93922ea
|
markup fixes
|
2019-03-20 14:46:54 +01:00 |
|
Anton Ignatov
|
07c2819163
|
refactoring tinymce image uploading
|
2019-03-20 14:46:54 +01:00 |
|
Oleksii Kriuchykhin
|
311189a2e9
|
Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]
|
2018-12-13 11:18:09 +01:00 |
|
Oleksii Kriuchykhin
|
e43b366cdb
|
Disable fragment caching
|
2018-11-29 18:07:31 +01:00 |
|
Oleksii Kriuchykhin
|
380a96dcce
|
Add caching for step and result fragments [SCI-2830]
|
2018-11-14 11:57:53 +01:00 |
|
zmagod
|
db1944cc90
|
move maximum file size limit to an ENV variable [fixes SCI-2415]
|
2018-06-19 14:15:14 +02:00 |
|
zmagod
|
f8a3fca2db
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
|
2018-01-23 11:06:33 +01:00 |
|
Zmago Devetak
|
3cd7e6fdde
|
fix open method
|
2017-11-24 15:19:58 +01:00 |
|
zmagod
|
91fec89cab
|
adds tiny_mce_assets to protocol export
|
2017-11-21 16:30:48 +01:00 |
|
zmagod
|
525c9770ac
|
fixes experiment page [fixes SCI-1395]
|
2017-06-28 15:21:32 +02:00 |
|
zmagod
|
819f47b450
|
setup sciNote for Rails 5.1
|
2017-06-23 15:19:08 +02:00 |
|
zmagod
|
2d69896897
|
fixes pdf export and image size [fixes SCI-1247]
|
2017-05-09 13:59:59 +02:00 |
|
zmagod
|
ed24448817
|
adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203]
|
2017-04-25 14:24:05 +02:00 |
|
zmagod
|
1fefeee3d1
|
adds team space related methods
|
2017-04-25 13:44:31 +02:00 |
|
zmagod
|
66f43803c0
|
refactor, fix user annotation bug
|
2017-04-24 16:22:25 +02:00 |
|
zmagod
|
55c8c498e2
|
add image upload functionality to result text
|
2017-04-24 12:28:27 +02:00 |
|
zmagod
|
550f563666
|
working version for steps first run
|
2017-04-21 16:09:04 +02:00 |
|