1525 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	7d995189bd	Fixies after code review [SCI-2730]	2018-10-02 14:24:44 +02:00
Luka Murn	d71be76657	Fix minor styling & text on settings - preferences page	2018-10-02 13:59:19 +02:00
Luka Murn	c079f16d58	Fix the tooltips positioning on canvas	2018-10-02 13:50:26 +02:00
Oleksii Kriuchykhin	492a5de19e	Add Projects view - list/table view [SCI-2731]	2018-10-01 15:39:42 +02:00
Jure Grabnar	553ac4c360	Refactor code according to PR review ... PR review: https://github.com/biosistemika/scinote-web/pull/1304 Closes: [SCI-2640], [SCI-2642], [SCI-2643], [SCI-2644].	2018-09-30 16:37:18 +02:00
Oleksii Kriuchykhin	2508394924	Refactor Projects view - cards view [SCI-2730]	2018-09-27 10:43:44 +02:00
Oleksii Kriuchykhin	f8388d4bcd	Merge branch 'ok_SCI_2729' into ok_SCI_2730	2018-09-25 10:26:46 +02:00
Oleksii Kriuchykhin	80e73bfb97	Implement Projects view - navigation bar (tabs) [SCI-2729]	2018-09-24 16:25:04 +02:00
Luka Murn	63b4f7d909	Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662 ... Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]	2018-09-24 16:23:53 +02:00
Luka Murn	2396149c57	Merge pull request #1273 from Zanz2/zz_tooltip_settings_enable_sci2663 ... Added toggle checkbox for tooltips help in prefferences [SCI-2663]	2018-09-24 16:23:28 +02:00
Jure Grabnar	7877d559a3	Update email/notification, type: deliver ... Closes [SCI-2643], [SCI-2644].	2018-09-23 18:45:13 +02:00
Oleksii Kriuchykhin	84428b37c2	Add project view JSON endpoints [SCI-2728]	2018-09-21 10:39:20 +02:00
Zanz2	22a565a684	Made fixes according to review	2018-09-14 13:07:09 +02:00
Oleksii Kriuchykhin	49e788a9ad	Mergre latest core-api [SCI-2515]	2018-09-14 10:24:05 +02:00
Zanz2	0efaf827b8	Merge pull request #1285 from Zanz2/zz_refactor_icons_sci_2445_v2 ... Replaced image icon with paperclip on scinote [SCI-2712]	2018-09-11 09:36:47 +02: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	d4aa5e60a2	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zz_tooltip_settings_enable_sci2663 ... Merging to update db, so i dont have to docker-clean my whole environment 2 times to switch between this branch and up to date ones	2018-08-31 11:42:26 +02:00
Zanz2	15c124f3fd	replaced image icon with paperclip, to represent files, removed all image icons	2018-08-27 13:07:18 +02:00
Alex Kriuchykhin	151d1cf44d	Merge pull request #1270 from okriuchykhin/ok_SCI_2651 ... Refactor invite users modal initialization [SCI-2651]	2018-08-23 14:34:42 +02:00
Alex Kriuchykhin	75a48291e1	Merge pull request #1272 from okriuchykhin/ok_SCI_2654 ... Fix report elements sorting [SCI-2654]	2018-08-22 14:20:54 +02:00
Zanz2	0ed62b7375	refactored according to PR review	2018-08-21 11:35:22 +02:00
Zanz2	2d1d4c78bc	Merge branch 'master' into zz_in_app_tooltips_help_sci2662	2018-08-21 11:27:01 +02:00
Zanz2	36cca3d6aa	Implemented popover tooltips in all specified places, and fixed a bug where old popovers were open on page switch with ajax	2018-08-21 11:11:25 +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
Zanz2	9a482eab2e	Checkbox now gets styled properly and defaults to true	2018-08-21 09:02:54 +02:00
Zanz2	beb1d02914	Made fiew part for toggler, now debugging why checkbox doenst render properly and why it defaults to false always	2018-08-20 15:57:09 +02:00
Oleksii Kriuchykhin	62d99a4372	Fix report elements sorting [SCI-2654]	2018-08-20 14:46:23 +02:00
Zanz2	91f112dc38	Saving minor changes, deleted comments, stuck at drag n drop	2018-08-20 13:45:43 +02:00
Oleksii Kriuchykhin	6795b08a91	Refactor invite users modal initialization [SCI-2651]	2018-08-20 13:13:34 +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
Oleksii Kriuchykhin	ecde634a2c	Add OAuth2 provider [SCI-2515]	2018-08-17 13:17:59 +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
Zanz2	dfcaa40f1a	Merge branch 'master' into zz_refactor_icons_sci_2445_v2	2018-08-14 13:33:43 +02:00
Zanz2	45a4c1c598	changed the icons as per last comment in jira issue	2018-08-14 13:26:48 +02:00
mlorb	a6dd577b4e	fix time zone selector	2018-08-08 11:43:18 +02:00
Oleksii Kriuchykhin	38c36ab798	Fix modals handling with Turbolinks [SCI-2253]	2018-08-02 11:25:14 +02:00
Oleksii Kriuchykhin	5c999300b5	Fix avatar upload validators [SCI-2253]	2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin	10b86a9d05	Add data hook to settings/team page [SCI-2253]	2018-07-27 17:26:46 +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
Luka Murn	f23cc36803	Merge pull request #1224 from ZmagoD/zd_SCI_2429 ... fixes setting sidebar teams link[fixes SCI-2429]	2018-07-13 14:55:24 +02:00
Luka Murn	de29ab1b11	Merge pull request #1234 from ZmagoD/zd_SCI_2581 ... adds missing js in experiment canvas view [fixes SCI-2581]	2018-07-13 14:54:59 +02:00
Oleksii Kriuchykhin	3aceb12f03	Fix delete button in inventories [SCI-2594]	2018-07-08 21:59:02 +02:00
Oleksii Kriuchykhin	a169639b3c	Fix uploaded file max size validation in JS [SCI-2590]	2018-07-05 15:23:26 +02:00
zmagod	185657c626	adds missing js in experiment canvas view [fixes SCI-2581]	2018-07-05 14:36:54 +02:00