557 commits

Author	SHA1	Message	Date
aignatov-bio	012b7b3d23	Add switch for active/archive repository view	2020-06-04 18:41:45 +02:00
aignatov-bio	aaff5eb67f	Add name order for porject/experiment/task sidebar	2020-05-27 13:31:00 +02:00
Mojca Lorber	94dc314c73	Hide hamburger menu on login screen	2020-05-25 10:39:35 +02:00
aignatov-bio	3287070df7	Improve search through assigned tasks	2020-05-22 14:36:28 +02:00
aignatov-bio	d16930e987	Add private tasks to assigned task list	2020-05-20 17:23:48 +02:00
aignatov-bio	acb1b392fc	Merge pull request #2564 from aignatov-bio/ai-sci-4632-remove-task-inventory-tab ... Remove inventory tab from task and routes to inventory page [SCI-4632]	2020-05-18 11:16:17 +02:00
Urban Rotnik	a2ade6e0ec	Merge branch 'develop' into features/new-task-layout	2020-05-15 14:27:56 +02:00
aignatov-bio	bac98bdbdc	Remove inventory tab from task and routes to inventory page	2020-05-14 22:10:13 +02:00
aignatov-bio	2728df5bac	Move helper method to my_module_helper	2020-05-08 11:56:29 +02:00
aignatov-bio	8076d8f464	Create helper for partial	2020-05-07 12:51:18 +02:00
aignatov-bio	b9c5089c2b	Add search to assigned tasks dropdown	2020-04-28 12:41:59 +02:00
Urban Rotnik	8fa024ed10	Remove all tooltips from HTML	2020-04-28 12:30:43 +02:00
aignatov-bio	0604815c00	Add assigned task dropdown to repository	2020-04-24 15:43:10 +02:00
aignatov-bio	5705bd8497	Fix caching issue for sidebar	2020-03-31 22:12:38 +02:00
Alex Kriuchykhin	92279d07ad	Merge pull request #2437 from aignatov-bio/ai-sci-4380-saving-navigation-state ... Refactor sidebar [SCI-4380]	2020-03-30 09:56:51 +02:00
aignatov-bio	a7e4083ef1	Fix team dropdown	2020-03-25 12:31:47 +01:00
aignatov-bio	5004270c22	Teams dropdown apears everytime	2020-03-23 19:42:36 +01:00
Mojca Lorber	94d5dcf4a9	Add data hook	2020-03-18 10:50:09 +01:00
Mojca Lorber	7e36a4e357	Small support dropdown fixes	2020-03-17 15:44:57 +01:00
Miha Mencin	26b687f2e6	Merge pull request #2460 from biosistemika/features/dashboard ... Features/dashboard	2020-03-10 18:06:23 +01:00
Miha Mencin	62b934f012	Merge branch 'develop' into features/dashboard	2020-03-09 09:56:32 +01:00
Mojca Lorber	6bf191d124	Remove academy link from navigation and move about modal to support menu	2020-03-06 14:36:22 +01:00
aignatov-bio	e46e496702	Add user check to invite user modal	2020-03-03 10:30:04 +01:00
Oleksii Kriuchykhin	73623da02c	Merge branch 'develop' into features/dashboard	2020-02-28 16:46:56 +01:00
aignatov-bio	8b273acaca	Update all sidebars	2020-02-28 14:03:08 +01:00
aignatov-bio	9e15d1ea42	Refactor experiment sidebar	2020-02-27 16:04:44 +01:00
Oleksii Kriuchykhin	62c19f7c02	Add invite users to the team permission check [SCI-4381]	2020-02-26 17:25:38 +01:00
aignatov-bio	8e05908753	Small fixes	2020-02-25 17:19:11 +01:00
aignatov-bio	cf4dbd5ff4	Add calendar widget	2020-02-20 17:02:38 +01:00
aignatov-bio	5c0a769f87	General dashboard layout	2020-02-13 13:50:29 +01:00
mlorb	49bfb603c8	Merge pull request #2357 from mlorb/ml-sci-4130 ... Sidebar redesign [SCI-4130]	2020-02-04 09:55:00 +01:00
mlorb	7ad3527338	Merge pull request #2379 from urbanrotnik/ur-sci-4274-visual-fixes ... Visual fixes [SCI-4274]	2020-02-03 09:44:48 +01:00
Urban Rotnik	3db48c44f7	Add ordered scope	2020-01-30 13:47:14 +01:00
Urban Rotnik	1bb54d20cf	Teams ordering fixed	2020-01-30 13:46:04 +01:00
Urban Rotnik	765a577669	Ellipsis with css for Sidebar	2020-01-29 13:22:35 +01:00
Urban Rotnik	6c50b514f3	Put Academy icon back, resize team switch	2020-01-27 17:15:22 +01:00
Urban Rotnik	71a8a8655f	Remove Academy icon	2020-01-27 14:52:19 +01:00
Mojca Lorber	f5d245e7cc	Sidebar redesign	2020-01-24 13:22:04 +01:00
Mojca Lorber	981f8678df	Fix alerts style	2020-01-21 15:21:40 +01:00
aignatov-bio	e022f7a096	Fix small css issues	2020-01-20 15:48:51 +01:00
Mojca Lorber	772118d246	change html structure for flash msg, change columns buttons	2020-01-20 14:02:42 +01:00
Alex Kriuchykhin	f1babb2237	Merge pull request #2279 from okriuchykhin/ok_SCI_4000 ... Fix sidebar update for inline editing [SCI-4000]	2020-01-10 10:34:27 +01:00
Alex Kriuchykhin	9ab07af87b	Merge pull request #2282 from okriuchykhin/ok_SCI_4149 ... Disable comment edit mode if comment is not editable [SCI-4149]	2020-01-09 15:06:04 +01:00
Oleksii Kriuchykhin	1624f9d5ab	Disable comment edit mode if comment is not editable [SCI-4149]	2020-01-08 12:32:59 +01:00
aignatov-bio	68646276f5	Replace bootstrap styles for button	2020-01-07 16:13:34 +01:00
Oleksii Kriuchykhin	16b591b110	Fix sidebar update for inline editing [SCI-4000]	2020-01-06 16:07:23 +01:00
aignatov-bio	18a8be43f5	Add new logo	2020-01-06 10:40:20 +01:00
aignatov-bio	a281f09e7f	Add reports and missed modals	2020-01-06 10:40:20 +01:00
aignatov-bio	ef3814ccec	Add new buttons to protocols, tasks, experiments, projects	2020-01-06 10:40:20 +01:00
aignatov-bio	5ba8e6507e	Merge branch 'release-1-17-8' into ai-sci-fix-comment-error	2019-12-10 10:36:30 +01:00
aignatov-bio	63edd3e877	Remove edit initialization from view mode	2019-12-06 13:26:47 +01:00
Oleksii Kriuchykhin	7a89cae56f	Fix TinyMCE images and avatars for export all [SCI-4107]	2019-12-05 13:27:17 +01:00
aignatov-bio	b9a34fa809	Fix placeholder for authors	2019-11-15 16:23:48 +01:00
aignatov-bio	a9690482d1	Add autosave feature to text fields	2019-11-12 11:26:18 +01:00
Mojca Lorber	16eddc0ad0	Save on click away, inline editing	2019-11-03 14:59:30 +01:00
aignatov-bio	9950a23188	Replace base64 avatars with url	2019-10-22 12:27:13 +02:00
Alex Kriuchykhin	53caaf647b	Merge pull request #2080 from okriuchykhin/ok_SCI_3891 ... Move file preview generation to delayed job [SCI-3891]	2019-09-27 10:50:21 +02:00
Anton Ignatov	e01c438055	Fix padding for marvinjs modal	2019-09-24 11:02:15 +02:00
Oleksii Kriuchykhin	aabeeec95a	Move file preview generation to delayed job [SCI-3891]	2019-09-23 21:07:03 +02:00
Anton Ignatov	68994a77c8	Fix file preview in inventory	2019-09-18 11:21:33 +02:00
Oleksii Kriuchykhin	3509543e7b	Merge branch 'master' into ok_SCI_3881	2019-09-16 11:56:49 +02:00
aignatov-bio	1f12a63a25	Fix counter on task inventory and failing test (#2043)	2019-09-10 13:51:37 +02:00
mlorb	ba5bebedb2	change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022)	2019-09-02 10:30:29 +02:00
aignatov-bio	e2ad383c69	Fix UX for task inventory dropdown and big task title [SCI-3791] (#1998) ... * Fix ux for task inventory dropdown and big task title * Fix markup	2019-08-21 10:39:37 +02:00
Urban Rotnik	89f289660b	Add share_with_all feature to service, add new activities	2019-08-14 11:03:15 +02:00
aignatov-bio	737f9e572c	Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976) ... * Replace marvinJS logo and fix some merge issues * Fix tests	2019-08-13 11:04:19 +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
Luka Murn	83bb89fdf5	Cherry-picked commit from ZZ (and LM)'s various changes	2019-07-26 10:13:14 +02:00
Anton Ignatov	1e8663548e	Add MarvinJS assets to TinyMCE	2019-07-16 13:40:54 +02:00
aignatov-bio	a8623002e6	Small UI changes [SCI-3699] (#1935) ... * Small ui changes * Markup fix * Add class for addons	2019-07-15 13:28:20 +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
aignatov-bio	26ef970a1e	Add academy button (#1924)	2019-07-12 11:15:34 +02:00
Oleksii Kriuchykhin	64b7a5646a	Implement custom document file previewer [SCI-3677]	2019-07-10 14:37:23 +02:00
mlorb	23270393b0	Merge branch 'master' into ml-sci-3634	2019-07-09 14:38:00 +02:00
aignatov-bio	1a75a31647	Remove webinar button [SCI-3664] (#1906) ... * Remove webinar button * Remove constants and i18n	2019-07-09 14:01:09 +02:00
Mojca Lorber	989c10872c	Fixes visual bugs on protocols.io and home page	2019-07-04 18:22:51 +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
Oleksii Kriuchykhin	5acb16d43e	Update Asset helper methods [SCI-3539]	2019-06-28 08:17:09 +02:00
Anton Ignatov	31c6802a06	Add support for marvinjs on service	2019-06-23 00:09:49 +02:00
Anton Ignatov	8240c8baad	Initial refactoring for remote api support	2019-06-22 01:51:59 +02:00
Anton Ignatov	7e5c39d3e4	Merge branch 'master' into features/marvinjs-integration	2019-06-21 14:51:45 +02:00
aignatov-bio	da8d748c49	Fix small comments bugs (#1832)	2019-06-14 16:20:47 +02:00
aignatov-bio	7a3eedf461	Adding missing avatars to comments (#1838)	2019-06-14 16:20:13 +02:00
Oleksii Kriuchykhin	a855eade4c	Merge branch 'master' into ok_SCI_3461	2019-06-11 17:48:02 +02:00
Oleksii Kriuchykhin	e543a849d4	Add document file preview generation with LibreOffice [SCI-3145]	2019-06-05 14:52:30 +02:00
Alex Kriuchykhin	db399864f8	Merge pull request #1820 from okriuchykhin/ok_SCI_3526 ... Update Handsontable to 6.2.2 [SCI-3526]	2019-06-04 14:59:22 +02:00
aignatov-bio	d207cf5dce	Refactored comments over SciNote [SCI-3505] (#1808) ... * Preparing helpers for comments * Refactored comments over scinote * Update events	2019-06-04 14:40:21 +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
Oleksii Kriuchykhin	84a2ad4487	Refactor the async thumbnail reloading (spinner) [SCI-3461]	2019-05-21 17:29:33 +02:00
aignatov-bio	2cee46a10d	Fix experiment name length (#1789)	2019-05-21 15:54:01 +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
Oleksii Kriuchykhin	1128fedc51	Refactor title inline editing permission checking [SCI-3471]	2019-05-20 13:13:31 +02:00
Anton Ignatov	259b75a6ba	Merge branch 'master' into features/marvinjs-integration	2019-05-16 09:28:48 +02:00
Alex Kriuchykhin	bcbaf73669	Merge pull request #1773 from okriuchykhin/ok_SCI_3468 ... Add permission checking to inline editor fields [SCI-3468]	2019-05-15 17:49:15 +02:00
Oleksii Kriuchykhin	2ef926e795	Add permission checking to inline editor fields [SCI-3468]	2019-05-15 17:47:09 +02:00
aignatov-bio	24e30867da	Add smart annotation to comments [SCI-3458] (#1768) ... * Add smart annotation to comments	2019-05-15 14:59:15 +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	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
Luka Murn	5135922254	Move the WOPI controls partial to /wopi folder, fix typo	2019-05-10 16:51:54 +02:00
Anton Ignatov	b5271bdd2c	Add remote api support	2019-05-08 15:00:36 +02:00
Anton Ignatov	565a4959b4	small fixes and improvments	2019-05-03 15:24:28 +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	4d0d5aa014	Adding team sketches selector	2019-04-30 17:32:55 +02:00
aignatov-bio	26dc1a0a4a	Note section css issues [SCI-3378] (#1715) ... * Fix step name width bug	2019-04-30 10:23:44 +02:00
Anton Ignatov	2847ec7609	Add env variable and check for MarvinJS available	2019-04-28 17:08:18 +02:00
Anton Ignatov	46f0e0c0c2	Add marvin js assets to assets sort and name field	2019-04-27 12:46:45 +02:00
Anton Ignatov	baa9b94a63	Add new graph button to step	2019-04-26 20:33:20 +02:00
Anton Ignatov	40c1c9aef7	Add marvin js modal	2019-04-26 18:24:21 +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	ffb0db06b9	Add scroll to team selector (#1659)	2019-04-12 09:17:14 +02:00
Oleksii Kriuchykhin	c47d243b1f	Disable WOPI edit button in read only mode [SCI-3281]	2019-04-02 17:45:26 +02:00
Miha Mencin	4a87216a3d	Merge branch 'master' into features/global-activities	2019-03-25 14:35:24 +01:00
Anton Ignatov	29b67be127	Fix team selection in global activities and add link from navbar	2019-03-20 10:33:22 +01:00
aignatov-bio	6eae12efab	Updating permission check for image editing [SCI - 3153, 3159] (#1568) ... *Add permission check for assets editing * Add check for image format	2019-03-19 13:52:57 +01:00
Oleksii Kriuchykhin	a822227383	Add rich text editor to task and protocol description [SCI-3062][SCI-3071]	2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin	645930b8d7	Merge branch 'master' into features/note-section	2019-03-14 16:25:51 +01:00
Oleksii Kriuchykhin	feb75f62e1	Add workaround for image caching in fabric js [SCI-2855]	2019-03-11 15:10:32 +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
Oleksii Kriuchykhin	0c99ea9c5c	Fix local storage file download links [SCI-3048]	2019-03-07 16:46:05 +01:00
aignatov-bio	b1df8c9aa7	Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524) ... * Adding inline editing to experiment title, project title and task title	2019-03-06 09:17:34 +01:00
Anton Ignatov	f636b5adff	Remove script from modal	2019-03-01 14:56:06 +01:00
Urban Rotnik	3121bf1d39	Update tooltip for system notifications dropdown	2019-02-27 14:49:18 +01:00
Jure Grabnar	fb533eb9d3	Merge pull request #1507 from jbargu/jg_sci_2930_navigation_changed ... Add action_name to sidebar cache as dependency [SCI-2930]	2019-02-22 10:04:57 +01:00
Jure Grabnar	0fa06ea9fc	Merge pull request #1505 from jbargu/jg_sci_2928_few_turbolinks_bugs ... Check for recaptcha enabled boolean value	2019-02-20 18:29:40 +01:00
Jure Grabnar	61f9df0656	Add action_name to sidebar cache as dependency ... Closes SCI-2930.	2019-02-20 14:13:51 +01:00
Jure Grabnar	e392f9e61f	Check for recaptcha enabled boolean value ... Closes SCI-2928.	2019-02-20 10:14:37 +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
Urban Rotnik	16e9a56874	Add recaptcha to invitation modal ... SCI-2935	2019-01-25 11:27:01 +01:00
Alex Kriuchykhin	b530cea771	Merge pull request #1438 from okriuchykhin/ok_SCI_2776 ... Add counters to task inventories dropdown [SCI-2776]	2019-01-11 16:27:22 +01:00
Oleksii Kriuchykhin	132f46b136	Improve error handling in task inventories dropdown [SCI-2776]	2019-01-10 21:11:20 +01:00
Oleksii Kriuchykhin	534866467b	Add counters to task inventories dropdown [SCI-2776]	2019-01-03 14:11:00 +01:00
Oleksii Kriuchykhin	2769add4d9	Disable edit button for unsupported WOPI formats [SCI-2904]	2018-12-31 18:10:12 +01:00
mlorb	4040b31143	Fix behavior when user has no teams	2018-12-10 15:42:05 +01:00
Oleksii Kriuchykhin	d2b1fd8ef2	Remove unneeded check [SCI-2757]	2018-12-03 13:03:22 +01:00
Oleksii Kriuchykhin	60a19734b2	Enable caching for navigation sidebar [SCI-2757]	2018-11-29 11:28:36 +01:00
mlorb	8bf1056bf5	fix teams switch not working at navigating from task	2018-11-21 10:12:21 +01:00
Luka Murn	84df2c81f9	Merge branch 'features/export-all' ... Conflicts: app/controllers/experiments_controller.rb app/controllers/my_modules_controller.rb db/schema.rb	2018-11-13 09:14:02 +01:00
Zanz2	4dc1320988	Merge pull request #1326 from Zanz2/zz_pio_upload_button_sci2760 ... Disabled turbolinks in left navigation bar protocols button [SCI-2760]	2018-10-10 17:14:15 +02:00
Oleksii Kriuchykhin	af02f29fb5	Implement user state saving for projects overview [SCI-2733]	2018-10-10 16:15:31 +02:00
Zanz2	cfe5801856	Disabled turbolinks in left navigation bar protocols button, i think it fixes the issue	2018-10-06 12:56:13 +02:00
Luka Murn	21a24dc98b	Fix invite users modal to display tooltips in all variants ... Closes SCI-2759.	2018-10-02 17:55:39 +02:00
Oleksii Kriuchykhin	492a5de19e	Add Projects view - list/table view [SCI-2731]	2018-10-01 15:39:42 +02:00
Oleksii Kriuchykhin	80e73bfb97	Implement Projects view - navigation bar (tabs) [SCI-2729]	2018-09-24 16:25:04 +02:00
Zanz2	22a565a684	Made fixes according to review	2018-09-14 13:07:09 +02:00
Zanz2	2d1d4c78bc	Merge branch 'master' into zz_in_app_tooltips_help_sci2662	2018-08-21 11:27:01 +02:00
Zanz2	1159a32ce2	Implemented all except 2 tooltips, debbugging why they dont work now	2018-08-20 13:03:30 +02:00
Zanz2	8c492e1491	started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute	2018-08-17 16:03:49 +02:00
Zanz2	e1cadfc75e	saving work, removed testing buttons	2018-08-17 11:52:10 +02:00
Zanz2	637c7dfb19	modified styling and behaviour of popovers (tooltips) also made relevant text changes, except for last one in epic	2018-08-17 11:33:44 +02:00
Zanz2	a09834db6a	testing, made new popover designs	2018-08-16 16:10:19 +02:00
Zanz2	d2373980d4	Testing out new popover	2018-08-16 15:07:59 +02:00
Oleksii Kriuchykhin	b2bd1cb849	Upgrade to Turbolinks 5 [SCI-2253]	2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin	6669beaf0e	Change icons throughout the rest of application [SCI-2445]	2018-07-27 15:27:08 +02:00
Zmago Devetak	6cab1746cd	Merge pull request #1202 from ZmagoD/zd_SCI_2392 ... prevents asset preview modal to close on click [fixes SCI-2392]	2018-06-13 08:41:41 +02:00
zmagod	32a09f9780	prevents asset preview modal to close on click [fixes SCI-2392]	2018-06-11 13:03:11 +02:00
Luka Murn	eb29c50379	Fix asset link preview, fix inventory item modal window styling	2018-06-08 09:01:59 +02:00
Luka Murn	dbceac7aa4	Style inventories secondary navigation section	2018-06-08 08:31:22 +02:00
okriuchykhin	5ba60d9f8f	Merge pull request #1188 from okriuchykhin/ok_SCI_2478 ... Improve sidebar rendering performance [SCI-2478]	2018-06-01 15:17:34 +02:00
Oleksii Kriuchykhin	58d8414f92	Code fixes for sidebar [SCI-2478]	2018-06-01 15:05:12 +02:00
Oleksii Kriuchykhin	2ddc0fb561	Improve sidebar rendering performance [SCI-2478]	2018-06-01 13:49:02 +02:00
mlorb	0a8bfdb860	Reposition the arrow for opening/closing of Navigation	2018-06-01 13:18:49 +02:00
Luka Murn	e611e76fae	Fix Hound errors	2018-05-28 11:53:49 +02:00
Luka Murn	b3ae1d8fa6	Remove some dead code, make sidebar toggle animated	2018-05-27 16:24:47 +02:00
Luka Murn	8b527d8a5b	Restyle left side menu bar so it also works with lower heights	2018-05-27 15:24:49 +02:00
Luka Murn	fe3ddb7c65	Update code so it works	2018-05-25 08:50:27 +02:00
Luka Murn	c9f3de9f27	Improve toggle	2018-05-24 13:39:04 +02:00
mlorb	3368e3b963	Merge branch 'ux-release-1' into ml-sci-2271	2018-05-23 14:06:54 +02:00
mlorb	79f1a1c0ad	fix padding and change label colors	2018-05-23 11:13:28 +02:00
mlorb	7b5ec4ae3f	move the open/close arrow to the bottom of left menu	2018-05-23 09:44:46 +02:00
mlorb	c4ecfc4d38	Change icons throughout sciNote - navigation, project, task cards	2018-05-22 16:55:58 +02:00
mlorb	64cbddb9a0	UI/UX restyle - update colours for navigation	2018-05-18 10:41:32 +02:00
Zmago Devetak	c3d247faae	Merge pull request #1128 from ZmagoD/zd_SCI_2331 ... adds deface hook in support dropdown [fixes SCI-2331]	2018-05-18 09:31:02 +02:00
Zmago Devetak	9d2303c777	Merge pull request #1115 from ZmagoD/zd_SCI_2321 ... fixes images preview in repository/library [fixes SCI-2321]	2018-05-16 12:05:33 +02:00
mlorb	dfe65ccaed	UI/UX restyle - fixes throughout application - part 2	2018-05-14 18:33:57 +02:00
mlorb	f01cfc2968	fix hound	2018-05-14 12:08:45 +02:00
mlorb	ed27a7a62a	some extra restyling/unifying off app	2018-05-11 18:02:17 +02:00
zmagod	e5c3fb6af2	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321	2018-05-10 10:38:56 +02:00
zmagod	4bc01c44e9	add file name to loading image	2018-05-10 10:37:48 +02:00
mlorb	7df40e56c7	UI/UX restyle - fixes throughout application part one	2018-05-08 16:33:42 +02:00
zmagod	ed6098ece6	adds deface hook in support dropdown [fixes SCI-2331]	2018-05-07 13:09:33 +02:00
zmagod	60e5aa8716	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2142_v2	2018-05-03 14:49:06 +02:00
mlorb	d2c0ae241e	Merge pull request #1121 from mlorb/ml-sci-2244 ... Update buttons positions and wording throughout app [SCI-2244]	2018-05-03 11:05:15 +02:00
zmagod	66b676b5ce	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321	2018-04-26 17:04:36 +02:00
zmagod	0afe461962	fixes download link	2018-04-26 17:00:51 +02:00
zmagod	e9642cadad	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2304	2018-04-26 14:26:30 +02:00
mlorb	88d5ba369d	Merge branch 'ux-release-1' into ml-sci-2244	2018-04-26 14:07:03 +02:00
Luka Murn	cb6fe50832	Merge branch 'master' into ux-release-1 ... Conflicts: app/assets/javascripts/repositories/index.js	2018-04-26 11:38:54 +02:00
mlorb	9e11f3b220	update buttons positions and wording throughout app	2018-04-25 13:57:12 +02:00
zmagod	4d6e995481	add dismiss buttons back	2018-04-25 10:43:16 +02:00
zmagod	c026044322	fixes flash message [fixes SCI-2142]	2018-04-25 07:32:49 +02:00