64 commits

Author	SHA1	Message	Date
Alex Kriuchykhin	1bde37db78	Merge branch 'develop' into ok_SCI_5579	2021-10-28 13:26:27 +02:00
aignatov-bio	7621deeb2a	Small label printers fixes [SCI-6021][SCI-6024] (#3502)	2021-08-23 13:58:16 +02:00
Oleksii Kriuchykhin	c26dcf4b23	Replace empty? with blank? [SCI-5579]	2021-07-23 11:56:28 +02:00
Alex Kriuchykhin	8ab7b94443	Fix error message at login with false credential [SCI-5412] (#3102)	2021-01-19 17:19:40 +01:00
Oleksii Kriuchykhin	67b3f853d7	Merge branch 'develop' into features/folders	2020-12-18 14:51:21 +01:00
aignatov-bio	2294d396f9	Add comments sidebar layout	2020-11-18 16:26:01 +01:00
aignatov-bio	c56f7912ef	Update file preview	2020-10-29 14:23:32 +01:00
Oleksii Kriuchykhin	21fab4198c	Merge branch 'develop' into features/local	2020-10-01 11:52:59 +02:00
Oleksii Kriuchykhin	25a9f5c685	Add typeface-lato for shipping Lato fonts	2020-09-28 18:02:47 +02:00
aignatov-bio	f4a13a73cb	Refactor smart annotation front-end	2020-09-09 12:25:34 +02:00
aignatov-bio	15de84ff2f	Not include marvinJS library, if marvinJS disabled	2020-06-08 09:59:26 +02:00
Urban Rotnik	5c72200801	Remove tooltips settings for user	2020-04-28 12:44:47 +02:00
aignatov-bio	bdf4394d5f	Clean notifications partial from layouts	2020-02-13 09:52:45 +01:00
aignatov-bio	26783e64da	Fix protocols table CSS	2020-02-11 15:58:17 +01:00
Urban Rotnik	1ecea5216e	Add webpack libs for emojis and assets	2020-01-21 11:43:04 +01:00
aignatov-bio	6a67280f6a	Add new emoji picker	2020-01-21 10:50:55 +01:00
Oleksii Kriuchykhin	973efa55e1	Merge branch 'master' into ok_SCI_3678	2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin	eaf9d59819	Merge branch 'activestorage_migration' into ok_SCI_3679	2019-08-06 15:27:31 +02:00
Oleksii Kriuchykhin	423528933e	Switch to global JS constants [SCI-3679]	2019-08-06 15:06:19 +02:00
Oleksii Kriuchykhin	5e65b07bdc	Implement DirectUpload for Steps, Results and Inventories [SCI-3679]	2019-07-25 18:00:24 +02:00
Mojca Lorber	f8afc92606	Fix page redirect and add success flash msg after protocols.io import action	2019-07-11 09:50:39 +02:00
aignatov-bio	a08d93376c	Add promo modal when MarvinJS disabled (#1872)	2019-07-01 11:51:13 +02:00
Anton Ignatov	b5271bdd2c	Add remote api support	2019-05-08 15:00:36 +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
Oleksii Kriuchykhin	9bbdc8fc89	Include tui image editor with webpack [SCI-2856]	2019-03-11 15:12:38 +01:00
Oleksii Kriuchykhin	80e525fd97	Improve image editor behaviour [SCI-2855]	2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin	89e968c410	Add tui.image-editor [SCI-2815]	2019-03-11 15:08:15 +01:00
aignatov-bio	8e905b67b2	System notification navbar menu drop down [SCI 2955] (#1498) ... * Add dropdown menu and icon for system notifications * Finish system notification dropdown menu and add tests	2019-02-19 11:08:59 +01:00
aignatov-bio	c598541e09	System notification modal window [SCI-2957 and SCI-2958] (#1484) ... * Added new system notification modal * Adding loading system notification on sign in	2019-02-15 13:07:29 +01:00
mlorb	4040b31143	Fix behavior when user has no teams	2018-12-10 15:42:05 +01:00
Luka Murn	586a442abc	Refactor the settings page, rename setting to tooltips_enabled	2018-09-05 16:36:32 +02:00
Zanz2	1bed2c2a3c	Partially fixed according to pull request review, added comments to code review	2018-08-31 12:11:51 +02:00
Zanz2	880582de25	Added just a data attribute, so i dont have to add it on other branch	2018-08-21 09:59:49 +02:00
Oleksii Kriuchykhin	b2bd1cb849	Upgrade to Turbolinks 5 [SCI-2253]	2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin	a169639b3c	Fix uploaded file max size validation in JS [SCI-2590]	2018-07-05 15:23:26 +02:00
zmagod	bb62fc3715	adds data-hook	2018-06-14 12:42:49 +02:00
mlorb	2bce62cab8	Merge branch 'ux-release-1' into ml-sci-2405	2018-05-28 11:43:14 +02:00
mlorb	f791234ec7	changes on Zmago's request	2018-05-28 11:36:37 +02:00
mlorb	099cc29abb	fix tests	2018-05-28 09:29:46 +02:00
mlorb	f02363dfce	fix error if user is not assigned to any teams	2018-05-25 17:14:22 +02:00
zmagod	6512970b9c	adds flash_message div in manage repository column page	2018-05-25 14:36:15 +02:00
zmagod	c026044322	fixes flash message [fixes SCI-2142]	2018-04-25 07:32:49 +02:00
zmagod	233e73c709	adds asset preview link to repository row modal and to table row item [fixes SCI-2110]	2018-04-10 17:06:53 +02:00
zmagod	cf7761daaa	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223	2018-04-06 12:56:39 +02:00
Oleksii Kriuchykhin	51860652c1	Refactor smart annotations modal [SCI-2223]	2018-04-02 20:38:56 +02:00
Oleksii Kriuchykhin	cc5d8550b1	Refactor file preview modal [SCI-2217]	2018-03-30 11:50:28 +02:00
mlorb	884eef9d07	Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118	2018-03-20 14:25:59 +01:00
zmagod	311b2dac5a	Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2142	2018-03-16 16:21:47 +01:00
mlorb	9fd845c478	fix failing cucumber tests	2018-03-14 17:55:04 +01:00