61 commits

Author	SHA1	Message	Date
aignatov-bio	188013dd56	Change permission for sorting in steps and asset view [SCI-5289]	2020-12-08 10:45:43 +01:00
aignatov-bio	568fcb20df	Fix protocol revert from repository [SCI-5285]	2020-12-04 12:07:25 +01:00
aignatov-bio	c212d514d5	Fix delete asset in protocol repository	2020-11-25 13:13:06 +01:00
aignatov-bio	e8e9244d96	Fix I18n and double loading	2020-11-03 09:07:49 +01:00
aignatov-bio	eca39a00b5	Add attachments dropdown to step	2020-11-02 18:47:08 +01:00
aignatov-bio	12991e8fd3	Commit add asset preview mode switcher to step	2020-10-29 16:42:05 +01:00
aignatov-bio	d99e279ecc	Add gallery to file preview	2020-10-29 14:30:26 +01:00
aignatov-bio	1ed65eddfa	Move ordering to front-end	2020-09-25 15:06:09 +02:00
aignatov-bio	70a0da17b2	Fix markup	2020-09-24 17:12:53 +02:00
aignatov-bio	780db9d134	Add assets view switcher	2020-09-24 17:10:36 +02:00
aignatov-bio	e4b94b582a	Add dynamic render of wopi files in viewport	2020-09-23 12:32:46 +02:00
aignatov-bio	443c301ca1	Fix align for step content	2020-05-14 21:53:00 +02:00
aignatov-bio	bd742d388d	Small CSS improvments for mobile	2020-05-13 10:58:40 +02:00
Urban Rotnik	d974ff57e1	Fix attachments sorting	2020-01-28 15:01:20 +01:00
Anton Ignatov	33497d11a3	Merge branch 'activestorage_migration'	2019-10-01 10:36:05 +02:00
Mojca Lorber	47ccf38662	Redesign of sorting button for projects/experiments cards	2019-09-16 14:43:12 +02:00
Oleksii Kriuchykhin	c352a73d79	ActiveStorage fixies after latest master merge [SCI-3757]	2019-08-09 14:56:00 +02:00
Oleksii Kriuchykhin	973efa55e1	Merge branch 'master' into ok_SCI_3678	2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin	b4f632dba8	Remove dowload endpoint from assets controller [SCI-3680]	2019-08-07 15:21:41 +02:00
Anton Ignatov	ffd415d409	Inital refactor for Assets model	2019-07-12 15:02:06 +02:00
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	c0c8e0e1a3	Refactor Experiment workflow images [SCI-3539]	2019-07-04 09:33:12 +02:00
Jure Grabnar	20134c9f8a	Features/protocolsio integration (#1893) ... Features/protocolsio integration	2019-07-03 17:32: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
Oleksii Kriuchykhin	5acb16d43e	Update Asset helper methods [SCI-3539]	2019-06-28 08:17:09 +02:00
Urban Rotnik	9cb4454537	New implementation for attachments creation	2019-06-27 17:02:06 +02:00
Anton Ignatov	7e5c39d3e4	Merge branch 'master' into features/marvinjs-integration	2019-06-21 14:51:45 +02:00
Alex Kriuchykhin	db7c6435b3	Merge pull request #1851 from okriuchykhin/ok_SCI_3436 ... Implement saving of attachments ordering on steps [SCI-3436]	2019-06-20 11:31:15 +02:00
Oleksii Kriuchykhin	a855eade4c	Merge branch 'master' into ok_SCI_3461	2019-06-11 17:48:02 +02:00
Oleksii Kriuchykhin	6e1a7a3392	Implement saving of attachments ordering on steps [SCI-3436]	2019-06-11 10:08:33 +02:00
Oleksii Kriuchykhin	e543a849d4	Add document file preview generation with LibreOffice [SCI-3145]	2019-06-05 14:52:30 +02:00
Anton Ignatov	c9a29b12ba	Merge branch 'master' into features/marvinjs-integration	2019-05-31 10:27:14 +02:00
Mojca Lorber	a3c29738bb	Hide create office file button to user without permission	2019-05-27 14:58:10 +02:00
Oleksii Kriuchykhin	84a2ad4487	Refactor the async thumbnail reloading (spinner) [SCI-3461]	2019-05-21 17:29:33 +02:00
Anton Ignatov	dcb6162ded	Fix merge error	2019-05-16 09:40:02 +02:00
Anton Ignatov	259b75a6ba	Merge branch 'master' into features/marvinjs-integration	2019-05-16 09:28:48 +02:00
Oleksii Kriuchykhin	4b1c4bd140	Fix handling of proccessing step attachments [SCI-3381]	2019-05-13 17:12:06 +02:00
aignatov-bio	71b3228310	Update protocol preview style [SCI-3416] (#1729) ... * Update protocol appearance	2019-05-13 10:45:12 +02:00
Anton Ignatov	e5b4adcc25	Merge branch 'master-with-note-section' into features/marvinjs-integration	2019-05-11 20:51:01 +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
Anton Ignatov	dcf94e78e1	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-08 14:03:41 +02:00
aignatov-bio	cc8a152278	Fix step attachments sorting (#1718)	2019-05-06 09:56:26 +02:00
Anton Ignatov	fef691d30f	Add error handling and secutiry checks	2019-05-02 16:12:25 +02:00
Anton Ignatov	2847ec7609	Add env variable and check for MarvinJS available	2019-04-28 17:08:18 +02:00
Anton Ignatov	54731856f0	Finish step chemical attachments	2019-04-27 19:08:40 +02:00