168 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	973efa55e1	Merge branch 'master' into ok_SCI_3678	2019-08-08 11:17:07 +02:00
Jure Grabnar	d9f6c249f9	Fix CVE-2015-9284 omniauth security precautions ... Close SCI-3588	2019-07-31 16:59:38 +02:00
Jure Grabnar	6546bd1532	Add omniauth-rails_csrf_protection gem ... Close SCI-3588	2019-07-31 16:05:06 +02:00
Oleksii Kriuchykhin	9d926dc956	Refactor TinyMce assets, user avatars, zip files [SCI-3539]	2019-07-05 16:56:05 +02:00
aignatov-bio	cd7460a4bd	Add croppie tool to avatar editing [SCI-3502] (#1801) ... * Add croppie tool to avatar editing	2019-05-31 15:44:27 +02:00
Mojca Lorber	eac90109f7	Change ownership of inventory items, when a user leaves a team	2019-04-26 10:47:08 +02:00
aignatov-bio	606708987f	Notification changes on settings page [SCI 3084] (#1517) ... * Fix css and update text settings	2019-02-22 13:20:51 +01:00
Urban Rotnik	29d77ca81d	Add system_notification sending email feature	2019-02-19 11:20:25 +01:00
Miha Mencin	126a031498	SCI-2928 moving team modal js file to application.js.erb in order to run the first time when page is loaded	2019-01-23 15:30:23 +01:00
Oleksii Kriuchykhin	5ea5b76d39	Change sample date in date format settings [SCI-2907]	2019-01-03 14:15:41 +01:00
Oleksii Kriuchykhin	23f8602872	Use fixed date example in date format dropdown [SCI-2907]	2018-12-13 17:53:04 +01:00
mlorb	8170e1b367	Merge pull request #1414 from mlorb/ml-sci-2899 ... Fix invited member is added multiple times to team [SCI-2899]	2018-12-12 11:26:41 +01:00
mlorb	d761a81b26	fix download link in email again	2018-12-07 15:02:45 +01:00
mlorb	d37f3a3c09	fix invited member is added multiple times to team	2018-12-07 11:36:26 +01:00
mlorb	5dee804006	fix download exported project from email link	2018-12-06 09:42:58 +01:00
mlorb	398c2f0576	Merge pull request #1392 from mlorb/ml-sci-2676 ... Hide sign-in with third party applications (e.g. LinkedIn) in Oauth… [SCI-2676]	2018-11-27 11:06:45 +01:00
mlorb	18d9ab5888	fixes upon @Ducz0r request	2018-11-26 14:23:26 +01:00
Luka Murn	87ff7c71e3	Update the delivery email look & feel ... Closes SCI-2884.	2018-11-23 17:24:10 +01:00
mlorb	f61187dd18	Hide sign-in with third party applications (e.g. LinkedIn) in Oauth flows	2018-11-23 15:44:04 +01:00
Oleksii Kriuchykhin	537de596a7	Merge latest master [SCI-2778]	2018-11-14 13:05:57 +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
Oleksii Kriuchykhin	8d0dbc7076	Add time format selection to settings [SCI-2778]	2018-11-09 16:19:40 +01:00
Luka Murn	42793d25b7	Add bottom padding to sign in/up/forgot password pages ... Closes SCI-2764.	2018-10-24 13:57:58 +02:00
Luka Murn	95340bcf36	Update team name placeholder & sublabel on sign up pages	2018-10-24 13:43:56 +02:00
Jure Grabnar	d7c875135e	Merge pull request #1304 from jbargu/jg_zipfile_structure ... Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]	2018-10-05 15:36:56 +02:00
Luka Murn	d71be76657	Fix minor styling & text on settings - preferences page	2018-10-02 13:59:19 +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
Jure Grabnar	7877d559a3	Update email/notification, type: deliver ... Closes [SCI-2643], [SCI-2644].	2018-09-23 18:45:13 +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	2d1d4c78bc	Merge branch 'master' into zz_in_app_tooltips_help_sci2662	2018-08-21 11:27:01 +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	6795b08a91	Refactor invite users modal initialization [SCI-2651]	2018-08-20 13:13:34 +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
mlorb	a6dd577b4e	fix time zone selector	2018-08-08 11:43:18 +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
zmagod	1a15ac7acf	fixes setting sidebar teams link[fixes SCI-2429]	2018-06-26 13:09:56 +02:00
Luka Murn	23d8dc0b31	Change login button color to green ... What it says, change it to `btn-primary`.	2018-05-25 17:05:00 +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
mlorb	cea7f5a3f7	some extra style unification	2018-05-15 17:10:31 +02:00
mlorb	dfe65ccaed	UI/UX restyle - fixes throughout application - part 2	2018-05-14 18:33:57 +02:00
mlorb	7df40e56c7	UI/UX restyle - fixes throughout application part one	2018-05-08 16:33:42 +02:00
mlorb	f97477f3f0	some extra button styling	2018-04-26 15:19:05 +02:00
mlorb	763d934aa7	fix buttons again	2018-04-26 15:02:24 +02:00