414 commits

Author	SHA1	Message	Date
Anton Ignatov	7831b0a089	Merge branch 'activestorage_migration' into features/marvinjs-integration	2019-07-12 15:00:07 +02:00
Anton Ignatov	57a273d5d0	Merge branch 'activestorage_migration' into features/marvinjs-integration	2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin	64b7a5646a	Implement custom document file previewer [SCI-3677]	2019-07-10 14:37:23 +02:00
Oleksii Kriuchykhin	a1941a21dc	Futher refactoring of old Paperclip methods [SCI-3539]	2019-07-09 10:28:15 +02:00
Oleksii Kriuchykhin	9d926dc956	Refactor TinyMce assets, user avatars, zip files [SCI-3539]	2019-07-05 16:56:05 +02:00
Oleksii Kriuchykhin	4ea6b56582	Fix Step and Result file previews [SCI-3539]	2019-07-01 23:30:20 +02:00
Anton Ignatov	1f40fa69fc	Merge branch 'features/marvinjs-integration' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration	2019-07-01 11:51:27 +02:00
aignatov-bio	a08d93376c	Add promo modal when MarvinJS disabled (#1872)	2019-07-01 11:51:13 +02:00
Anton Ignatov	c9ae9f056e	Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration	2019-07-01 10:44:29 +02:00
Anton Ignatov	390002f40f	Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539	2019-07-01 10:12:26 +02:00
Anton Ignatov	6be227b2d3	Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration	2019-06-28 10:47:38 +02:00
Oleksii Kriuchykhin	5acb16d43e	Update Asset helper methods [SCI-3539]	2019-06-28 08:17:09 +02:00
Anton Ignatov	7e5c39d3e4	Merge branch 'master' into features/marvinjs-integration	2019-06-21 14:51:45 +02:00
Anton Ignatov	a843a016a0	Fix markup and naming	2019-06-19 15:19:47 +02:00
Anton Ignatov	f480c0eb8d	Adding new activtiies for image editing	2019-06-14 16:15:30 +02:00
aignatov-bio	52a2f5cd0e	Add recent protocols dropdown to task page [SCI-3417] (#1800) ... * Add recent protocols dropdown to task page	2019-06-13 15:47:29 +02:00
Oleksii Kriuchykhin	109793c7fb	Upgrade to Rails 5.2.3 and add ActiveStorage [SCI-3539]	2019-06-13 12:10:44 +02:00
Jure Grabnar	27edafaafb	Fix unlinked file in processing image quality	2019-06-09 09:20:43 +02:00
Oleksii Kriuchykhin	e543a849d4	Add document file preview generation with LibreOffice [SCI-3145]	2019-06-05 14:52:30 +02:00
Oleksii Kriuchykhin	01a5a17bb4	Update Handsontable to 6.2.2 [SCI-3526]	2019-06-04 14:31:37 +02:00
Anton Ignatov	c9a29b12ba	Merge branch 'master' into features/marvinjs-integration	2019-05-31 10:27:14 +02:00
Luka Murn	3a2bf2ce8a	Merge pull request #1780 from Ducz0r/lm-perform-wopi-checks-on-startup ... Add a startup check for WOPI_ENABLED == true variables	2019-05-22 16:56:55 +02:00
Luka Murn	5c88e9ab7e	Fix 'if..' logic to work properly when WOPI_ENABLED is undefined	2019-05-22 16:36:23 +02:00
aignatov-bio	2de2ead723	Refactor avatar image appearance across Scinote [SCI-3482] (#1787) ... * Refactor avatar appearance across Scinote	2019-05-21 15:19:44 +02:00
Luka Murn	4136aa0575	Add a startup check for WOPI_ENABLED == true variables	2019-05-18 10:22:53 +02:00
Anton Ignatov	259b75a6ba	Merge branch 'master' into features/marvinjs-integration	2019-05-16 09:28:48 +02:00
Miha Mencin	5ff344c208	Merge pull request #1746 from biosistemika/lm-sci-3426 ... Changes to create new office file button [SCI-3426]	2019-05-13 10:55:58 +02:00
aignatov-bio	d3aa6371cd	Fix report saving [SCI-3443] (#1753) ... * Fix report saving * Fix the report saving by using the reports' structures * Remove uneccesary yarn.lock (mistake)	2019-05-13 10:55:08 +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
Luka Murn	890df8803e	Add file name validation to create new Office file modal window	2019-05-10 18:19:32 +02:00
Anton Ignatov	88e67a16c2	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-02 16:16:03 +02:00
Anton Ignatov	7c55fcf0cf	Merge branch 'master' into master-with-note-section	2019-04-30 12:07:59 +02:00
aignatov-bio	687b53feb1	Add new tag activtiies [SCI-3341] (#1712) ... * Add new tag activtiies	2019-04-30 10:23:09 +02:00
Anton Ignatov	2847ec7609	Add env variable and check for MarvinJS available	2019-04-28 17:08:18 +02:00
Anton Ignatov	40c1c9aef7	Add marvin js modal	2019-04-26 18:24:21 +02:00
aignatov-bio	dc7fddc60a	Improve task tags (#1708)	2019-04-26 15:38:33 +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	11a7a975af	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +02:00
Anton Ignatov	aa2dab2014	Merge branch 'features/note-section' into master-with-note-section	2019-04-23 10:31:37 +02:00
aignatov-bio	6b45dcd475	Update eln export for new tinyMCE image format (#1680)	2019-04-19 14:44:40 +02:00
Mojca Lorber	b00cf07684	Add activity for importing inventory items	2019-04-18 15:18:10 +02:00
aignatov-bio	7ef7e2397f	Change activity filter order and reduce custom date label size [SCI-3301] (#1651) ... * Change activity filter order and reduce custom date label size * Fix hound	2019-04-09 14:18:22 +02:00
Mojca Lorber	501c46bc92	Remove activities that belong to addons	2019-04-05 16:25:22 +02:00
Jure Grabnar	613843d095	Temp commit	2019-04-04 16:58:55 +02:00
Jure Grabnar	7136294386	Remove archive_task from the list of activity_types ... Closes SCI-3288	2019-04-03 19:13:00 +02:00
Oleksii Kriuchykhin	9e91e9e59d	Improve large image saving after editing [SCI-3289]	2019-04-03 16:31:56 +02:00
Jure Grabnar	22d193114e	Add asset to activity message item type ... Closes SCI-3283	2019-04-02 16:10:20 +02:00
aignatov-bio	e6102c72c7	Adding missed activities [SCI-3253] (#1614) ... * Adding missed activties * Adding test for activities	2019-04-02 11:50:37 +02:00