362 commits

Author	SHA1	Message	Date
Anton	75a15310ac	Merge branch 'features/team-permissions' into features/label-templates	2022-09-13 14:26:15 +02:00
ajugo	b58e3cd4d8	Add zebra settings screen [SCI-7016] (#4310) ... * Add zebra settings screen [SCI-7016] * Fix hound [SCI-7016]	2022-08-04 11:14:35 +02:00
Anton	f84a972f6a	Fix show password for invitation/password reset screens [SCI-6791]	2022-06-09 11:40:22 +02:00
Oleksii Kriuchykhin	c5c3afa906	Update team users table with new user assignments [SCI-6842]	2022-06-01 15:06:19 +02:00
Oleksii Kriuchykhin	6febad1b95	Update the exiting permissions helpers so they will check new permissions [SCI-6821]	2022-05-24 10:49:49 +02:00
ajugo	02677aaaba	Focus authenticator code field [SCI-6716] (#4022)	2022-04-14 15:17:56 +02:00
Miha Mencin	fd54704d3e	SCI-6271 Allow giot_connect to be shown in connected accounts	2021-12-15 14:17:51 +01:00
Alex Kriuchykhin	f11a4701d0	Merge pull request #3629 from artoscinote/ma_SCI_6193 ... Added optional webhook secret key [SCI-6193]	2021-11-08 21:00:40 +01:00
Martin Artnik	3406cd9235	Added optional webhook secret key [SCI-6193]	2021-11-03 15:04:13 +01:00
Oleksii Kriuchykhin	47b8347ce6	Add support of Okta SSO provider [SCI-6184]	2021-11-02 16:19:56 +01:00
Alex Kriuchykhin	1bde37db78	Merge branch 'develop' into ok_SCI_5579	2021-10-28 13:26:27 +02:00
aignatov-bio	a93f2889b7	Fix 2fa redirecting [SCI-6103]	2021-09-28 12:34:41 +02:00
Martin Artnik	3a70aadea4	Added specific html class to printer settings section [SCI-6039]	2021-09-02 09:52:52 +02:00
artoscinote	c977decd8a	Merge pull request #3496 from aignatov-bio/ai-sci-5950-fix-webhook-position-in-menu ... Fix webhook sidebar position and fix texting in inventory [SCI-5950]	2021-08-20 11:05:15 +02:00
aignatov-bio	dc192ddbfb	Fix webhook sidebar position and fix texting in invnetory [SCI-5950]	2021-08-19 14:23:53 +02:00
aignatov-bio	bbb6cd226b	Add permission check for webhooks sidebar button [SCI-6016] (#3493)	2021-08-19 12:04:52 +02:00
aignatov-bio	852d2cc03c	CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970] (#3486) ... * CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970] * Small fixes [SCI-5972]	2021-08-16 10:51:46 +02:00
aignatov-bio	cfa7937f88	Cancel changes after exit webhook edit mode [SCI-5964]	2021-08-05 12:44:01 +02:00
Martin Artnik	57d5e6c2a7	Merge branch 'develop' into features/barcodes	2021-08-03 13:36:36 +02:00
Martin Artnik	a82af505eb	Merge branch 'develop' into features/webhooks	2021-08-02 16:22:52 +02:00
aignatov-bio	43571b5692	Print labels changes [SCI-5943] (#3461)	2021-08-02 15:38:37 +02:00
Martin Artnik	110ddd872e	Added placeholder FLUICS printer setup	2021-07-23 14:56:21 +02:00
Martin Artnik	b32b207f3d	Added FLUICS API client [SCI-5939]	2021-07-23 13:52:28 +02:00
Oleksii Kriuchykhin	c26dcf4b23	Replace empty? with blank? [SCI-5579]	2021-07-23 11:56:28 +02:00
aignatov-bio	f2e5dc8b2f	Add printers to addon page [SCI-5904][SCI-5931] (#3450) ... * Add printers to addon page [SCI-5904] * Fix markup	2021-07-21 13:48:38 +02:00
Martin Artnik	0c63013d8b	Made 2fa enable modal accessible globally [SCI-5856]	2021-07-05 16:50:37 +02:00
Martin Artnik	47071e23a1	Added specs for webhooks	2021-06-17 14:54:30 +02:00
Oleksii Kriuchykhin	b132a13698	Fix user preferences date format selector [SCI-5815]	2021-06-15 11:15:46 +02:00
Martin Artnik	380473c825	Fixed emails for successful report file generation [SCI-5814]	2021-06-14 13:25:50 +02:00
aignatov-bio	afe2a19c88	Add webhooks management [SCI-5767] (#3376) ... * Add webhooks managment [SCI-5767] * Markup fixes [SCI-5676]	2021-06-09 12:53:11 +02:00
aignatov-bio	9559ed88aa	Add webhooks index page [SCI-5766] (#3366)	2021-06-03 14:00:43 +02:00
aignatov-bio	f98aad5853	Fix nit issue in team description [SCI-5700]	2021-05-29 23:10:48 +02:00
Oleksii Kriuchykhin	29c83ffbb1	Merge branch 'develop' into features/new-reports	2021-05-21 11:04:17 +02:00
miha	ac18cb7225	rename partial to include html	2021-04-14 14:07:55 +02:00
miha	e610683d5c	[SCI-5623] added external_id setting to user	2021-04-14 09:44:09 +02:00
Oleksii Kriuchykhin	2f6194a99f	Remove canvas-to-blob library [SCI-5595]	2021-03-29 14:02:30 +02:00
aignatov-bio	8396c086f5	Add sticky toolbar for projects page [SCI-5401] (#3108) ... * Add sticky toolbar for projects page [SCI-5401]	2021-01-25 15:36:23 +01:00
aignatov-bio	2fe55250b9	Update settings navigation [SCI-5316] (#3028)	2021-01-05 09:11:05 +01:00
Mojca Lorber	81798a96ad	Add new SciNote avatars	2020-11-25 10:43:59 +01:00
Oleksii Kriuchykhin	6c367428a1	Fix team switcher [SCI-5080]	2020-10-02 14:25:44 +02:00
aignatov-bio	9474319d6b	Fir error handling in invite user view	2020-08-13 11:34:21 +02:00
aignatov-bio	91b8475db5	Merge pull request #2784 from aignatov-bio/ai-sci-4918-display-all-errors-on-signup ... Fix error handling on registration page [SCI-4918]	2020-08-12 09:39:21 +02:00
aignatov-bio	84b99eaf3d	Fix error handling on registration page	2020-08-11 15:39:35 +02:00
Urban Rotnik	3c3a2bfb8b	Add check if user is locked, show link unlock instructions	2020-08-06 15:18:20 +02:00
aignatov-bio	33e3e3d301	Small 2fa fixes	2020-07-27 13:42:51 +02:00
aignatov-bio	53d62b0310	Fix tests	2020-07-22 13:16:27 +02:00
aignatov-bio	ddfe8231d8	Merge branch 'features/2fa' into develop	2020-07-22 11:56:36 +02:00
aignatov-bio	c592954400	Add UX	2020-07-13 16:05:23 +02:00
Mojca Lorber	212ba76c16	Fix Settings pages titles	2020-07-13 14:51:51 +02:00
aignatov-bio	7d20bf6fea	Add recovery screen	2020-07-13 09:51:04 +02:00
aignatov-bio	fef6e5f1db	Add recovery strategy for 2fa	2020-07-09 17:01:00 +02:00
Urban Rotnik	b11f166c38	Fix cucumber tests	2020-07-09 13:14:07 +02:00
Mojca Lorber	00b668a4ba	Change title size to h1	2020-07-08 13:02:47 +02:00
aignatov-bio	88c092dc98	Add i18n and constants	2020-07-07 15:59:02 +02:00
aignatov-bio	7a9a25e6a9	Add 2fa wizzard tabs	2020-07-07 13:17:17 +02:00
aignatov-bio	be3a1994f8	Add basic UX to 2FA	2020-07-07 13:09:48 +02:00
aignatov-bio	4b9881e31e	Add 2fa to user settings page	2020-07-01 13:25:06 +02:00
Urban Rotnik	62a4a5f203	Add 2fa login	2020-07-01 12:46:26 +02:00
aignatov-bio	fe79fa4788	Fix markup	2020-06-29 10:57:41 +02:00
aignatov-bio	6fa97d3639	Add enable 2fa button to user settings	2020-06-29 10:56:06 +02:00
Urban Rotnik	a9bed41ff5	Remove obsolete html message	2020-05-22 10:33:13 +02:00
Urban Rotnik	5c72200801	Remove tooltips settings for user	2020-04-28 12:44:47 +02:00
aignatov-bio	f313b6ff01	Merge pull request #2492 from aignatov-bio/ai-sci-4339-refactor-login-screen ... Update css for login screen [SCI-4339]	2020-04-02 15:47:17 +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	b9e81f208d	Fix i18n	2020-03-27 10:34:06 +01:00
aignatov-bio	8ff4b540e2	Update css for login screen	2020-03-27 09:43:49 +01:00
Oleksii Kriuchykhin	4db810c18f	Fix taken space display for teams [SCI-4479]	2020-03-23 16:32:05 +01:00
Mojca Lorber	ea755eaea7	Change default date in preferences	2020-03-17 15:52:57 +01:00
aignatov-bio	8b273acaca	Update all sidebars	2020-02-28 14:03:08 +01:00
Oleksii Kriuchykhin	62c19f7c02	Add invite users to the team permission check [SCI-4381]	2020-02-26 17:25:38 +01:00
Mojca Lorber	509e197f64	Change repository name and team name to h2	2020-02-11 13:18:33 +01:00
Mojca Lorber	e70bc67146	Implement missing style guide changes	2020-01-31 14:11:37 +01:00
Mojca Lorber	981f8678df	Fix alerts style	2020-01-21 15:21:40 +01:00
aignatov-bio	54c78cf4d1	Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles ... Update colors and buttons	2020-01-08 12:30:51 +01:00
aignatov-bio	68646276f5	Replace bootstrap styles for button	2020-01-07 16:13:34 +01:00
Oleksii Kriuchykhin	d9b9243da7	Merge branch 'develop' into features/new-column-types	2020-01-07 16:03:33 +01:00
aignatov-bio	464d03558a	Fix markup, replace buttons and add new logo	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
Oleksii Kriuchykhin	ff4ef818fb	Implement SSO with Azure AD [SCI-4142]	2019-12-10 17:24:53 +01:00
Oleksii Kriuchykhin	03667f619f	Merge branch 'release-1-17-7' into develop	2019-12-05 13:03:39 +01:00
Urban Rotnik	3a76753b72	Add Edit renderer for ListColumnType	2019-11-29 12:52:27 +01:00
Oleksii Kriuchykhin	6c7f45fc20	Add simplified view for sign-in form [SCI-4098]	2019-11-28 17:00:43 +01:00
Oleksii Kriuchykhin	f5abb7c767	Add connected accounts section to settings [SCI-4106]	2019-11-27 23:16:25 +01:00
aignatov-bio	3322676373	Replace RTE with simple textarea	2019-11-27 12:37:33 +01:00
aignatov-bio	7fa753ca81	Fix name update and path to team	2019-11-23 23:20:38 +01:00
aignatov-bio	96523ae131	Update CSS for team preferences and enable autosave	2019-11-22 10:46:44 +01:00
aignatov-bio	56ae32323c	Add autosave for protocol keywords and user preferences	2019-11-20 14:57:53 +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
Mojca Lorber	7b86a3932a	Additional avatar small fixes	2019-10-30 15:23:14 +01:00
Mojca Lorber	a0873cb16d	Small improvements in the avatar settings	2019-10-29 13:21:22 +01:00
aignatov-bio	54627faeb3	Fix tests	2019-10-11 11:46:51 +02:00
aignatov-bio	521a367960	Add predefined avatars	2019-10-11 11:46:51 +02:00
aignatov-bio	1f43f35073	First modal	2019-10-11 11:46:51 +02:00
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
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
Luka Murn	9bf8b5d864	Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 ... Conflicts: Makefile app/assets/javascripts/projects/index.js.erb app/assets/stylesheets/themes/scinote.scss config/locales/en.yml	2018-04-12 13:16:46 +02:00
mlorb	8a35ce5c58	add locales	2018-04-09 10:53:03 +02:00
mlorb	70dfe66b2d	refactoring	2018-04-06 14:20:40 +02:00