249 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	0094528a02	Improve connected accounts unlinking [SCI-4142]	2019-12-12 14:57:27 +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
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	7fa753ca81	Fix name update and path to team	2019-11-23 23:20:38 +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
Oleksii Kriuchykhin	ab691efdb2	Fix LinkedIn sign-up [SCI-4047]	2019-10-29 16:20:19 +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
Oleksii Kriuchykhin	3509543e7b	Merge branch 'master' into ok_SCI_3881	2019-09-16 11:56:49 +02:00
Anton Ignatov	d1e1da8580	Fix permission check for invite users	2019-08-14 14:47:02 +02:00
Oleksii Kriuchykhin	973efa55e1	Merge branch 'master' into ok_SCI_3678	2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin	973fc775c0	Enforce file size limits for direct uploads on S3 [SCI-3681]	2019-08-06 17:09:00 +02:00
Oleksii Kriuchykhin	9d926dc956	Refactor TinyMce assets, user avatars, zip files [SCI-3539]	2019-07-05 16:56:05 +02:00
Mojca Lorber	41935a9471	Remove unassign_user_from_project notification and change code to use helper method for assignment notification generation	2019-07-01 13:44:27 +02:00
aignatov-bio	59e824ef9e	Fix nil handling in different places [SCI-2840] (#1777) ... * Fix nil handling in different places	2019-05-21 15:53:34 +02:00
Oleksii Kriuchykhin	5b0e9872c3	Improve handling of CSRF token errors [SCI-2841]	2019-05-14 17:02:56 +02:00
Jure Grabnar	91820ed9c1	Wrap sign_in user into begin/rescue block ... Closes SCI-3276	2019-04-03 09:09:20 +02:00
aignatov-bio	e6102c72c7	Adding missed activities [SCI-3253] (#1614) ... * Adding missed activties * Adding test for activities	2019-04-02 11:50:37 +02:00
Oleksii Kriuchykhin	7d4fbcb32e	Fix unconfirmed users clean-up issues [SCI-3172]	2019-03-29 11:11:53 +01:00
Oleksii Kriuchykhin	6bc944fcc7	Fix role name in change user role in team activity [SCI-3213]	2019-03-28 16:26:07 +01:00
Miha Mencin	4a87216a3d	Merge branch 'master' into features/global-activities	2019-03-25 14:35:24 +01:00
Urban Rotnik	e7b57aa4f7	Add creating activities for Team actions	2019-03-12 09:15:06 +01:00
Miha Mencin	9807c80286	move the create action to the tope section of controller	2019-03-05 10:49:36 +01:00
Miha Mencin	67fe486874	put the scheduling logic into session create action	2019-03-05 10:43:39 +01:00
Miha Mencin	fa7bba9de7	scheduling creation of demo project at the sign in time ... remove wrong schema, fix comment, add migration	2019-03-04 18:26:15 +01:00
Miha Mencin	844303ae7c	SCI-3119 schedule the creaton of template	2019-03-01 17:47:04 +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
Urban Rotnik	16e9a56874	Add recaptcha to invitation modal ... SCI-2935	2019-01-25 11:27:01 +01:00
mlorb	0b6b3b3609	code simplify	2018-11-27 10:58:51 +01:00
mlorb	18d9ab5888	fixes upon @Ducz0r request	2018-11-26 14:23:26 +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
Oleksii Kriuchykhin	8d0dbc7076	Add time format selection to settings [SCI-2778]	2018-11-09 16:19:40 +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	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
zmagod	db1944cc90	move maximum file size limit to an ENV variable [fixes SCI-2415]	2018-06-19 14:15:14 +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	80fe1dd73b	fix travis	2018-04-06 17:16:04 +02:00
mlorb	b8e91e91a1	refactor settings into the new navigation bar	2018-04-05 16:30:02 +02:00
Oleksii Kriuchykhin	a105e61d48	Remove tutorial [SCI-1860]	2018-03-18 13:18:05 +01:00
Oleksii Kriuchykhin	1082f7f93c	Fix notification for user removal from a team [SCI-2131]	2018-03-07 13:20:17 +01:00
mlorb	a19b672a83	change validation again	2018-03-05 13:12:44 +01:00
mlorb	d19ca7fbdc	change validation	2018-03-02 16:32:46 +01:00
mlorb	f5949e9d10	refactor	2018-03-01 17:52:24 +01:00
mlorb	08439e7f58	sign up with linkedIn account	2018-02-28 18:12:21 +01:00
zmagod	25dcfe66ae	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960	2018-02-01 16:04:05 +01:00
zmagod	9b836d04fa	fixes per @mlorb 's request	2018-01-24 13:21:53 +01:00
zmagod	f8a3fca2db	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
zmagod	ee7c646b1d	update user settings controllers to new permission system [fixes SCI-1960]	2018-01-22 16:42:26 +01:00
zmagod	488dba378e	fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944]	2018-01-17 15:06:43 +01:00
mlorb	aba426091c	add render 403 for create team permission	2018-01-10 10:47:45 +01:00
mlorb	6c4514f550	add create_teams permission checks	2018-01-09 15:28:27 +01:00
mlorb	e577b363b2	byTheWay fix of Rails 5.1 bug	2017-12-14 14:18:17 +01:00
Oleksii Kriuchykhin	baf3151bb0	Fix notification settings accessors [SCI-1864]	2017-12-13 11:59:53 +01:00
Oleksii Kriuchykhin	6256acdfea	Rename notifications settings accessor [SCI-1864]	2017-12-07 13:59:33 +01:00
Oleksii Kriuchykhin	84f4aba213	Pull latest master into gilson-iot-rails4	2017-11-15 15:15:26 +01:00
okriuchykhin	2e0bf91467	Merge pull request #831 from biosistemika/revert-830-revert-820-lm-sci-1675 ... Add Add-ons page to User -> Settings -> Account [SCI-1675], vol. 2	2017-10-27 11:14:39 +02:00
zmagod	d2ed415a25	Fixes per @okriuchykhin 's request	2017-10-26 10:42:18 +02:00
zmagod	5e6a4bb69a	adds environment variable that disables/enables the creation of new team when user sign up	2017-10-25 15:29:04 +02:00
zmagod	c554bc5c18	fixes accept invitation bug [fixes SCI-1684]	2017-10-17 16:00:26 +02:00
Luka Murn	4e06b5c397	Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]""	2017-10-17 13:17:49 +02:00
Luka Murn	4d8f2665d3	Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"	2017-10-17 13:10:02 +02:00
Luka Murn	fe89b942e7	Add Add-ons page to User -> Settings -> Account ... Closes SCI-1675.	2017-10-11 14:15:37 +02:00
Oleksii Kriuchykhin	c3fceb90df	Backport API to Rails-4 [SCI-1579]	2017-08-30 13:30:41 +02:00
Luka Murn	9227ea5854	Finish the user settings jsonb, also fix references throughout app ... Closes SCI-1475.	2017-08-10 14:29:01 +02:00
Luka Murn	c62002381b	Add default settings migration and concern	2017-08-10 11:30:57 +02:00
zmagod	bc33883c3c	first run fixing addons	2017-06-30 10:23:28 +02:00
Zmago Devetak	0dc4addd6c	fix typo	2017-05-12 10:10:50 +02:00
Oleksii Kriuchykhin	bb8c7c342c	Add additional info to samples info modal [SCI-960]	2017-05-11 22:20:06 +02:00
zmagod	80a0af8c9f	replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241]	2017-05-11 11:36:47 +02:00
Matej Zrimšek	bafdbf4082	Email is now case insensitive when inviting users by it. [fixes SCI-856]	2017-04-18 18:01:29 +02:00
Mojca Lorber	27c661d7c4	fix bug with changing user own role from admin to normal user	2017-04-12 16:56:10 +02:00
zmagod	836baa7412	fixes bug with user teams table [fixes SCI-987]	2017-02-15 10:06:21 +01:00
Luka Murn	1b6f50647c	Please Hound	2017-02-13 16:40:27 +01:00
Luka Murn	280b7a0e75	Minor fix	2017-02-09 15:10:45 +01:00
Luka Murn	2a9f975c13	Some minor fixes	2017-02-09 14:58:11 +01:00
Luka Murn	f7bd62547e	Refactor teams settings into its own controllers	2017-02-09 14:37:59 +01:00
Luka Murn	5cb3eb5e09	Refactor preferences -> move them to subcontroller, subroute	2017-02-09 11:07:16 +01:00
okriuchykhin	c2a69982aa	Merge pull request #471 from okriuchykhin/ok_SCI_936 ... Adds datatable to all teams page [SCI-936]	2017-02-07 10:33:33 +01:00
Oleksii Kriuchykhin	cc6b518c7f	Check that user is a member of a team when switching to it [SCI-984]	2017-02-03 16:10:37 +01:00
Oleksii Kriuchykhin	db90c5d63b	Add datatable to all teams page [SCI-936]	2017-02-02 09:53:59 +01:00
Zmago Devetak	5c9954bb89	Merge pull request #450 from ZmagoD/zd_SCI_939 ... Refactor "organizations" to "teams"	2017-02-01 13:12:02 +01:00
zmagod	be5faad97c	fixes hound	2017-01-31 13:33:55 +01:00
Oleksii Kriuchykhin	d1e69438de	Add config option to enable/disable users registration [SCI-935]	2017-01-30 15:04:02 +01:00
zmagod	c2c5616078	rename Organization to Team in controllers	2017-01-24 17:06:51 +01:00
zmagod	21c2f82582	rename controllers where org/organization	2017-01-24 16:57:14 +01:00
Luka Murn	cf72da5635	Merge branch 'improved-files-handling' into 'master' ... Conflicts: app/assets/javascripts/protocols/steps.js.erb app/helpers/assets_helper.rb db/schema.rb	2017-01-18 11:29:40 +01:00
okriuchykhin	02bfd19d1c	Merge pull request #385 from okriuchykhin/ok_SCI_102 ... Fix XSS on activites and throghout the rest of app [SCI-102]	2017-01-16 11:41:38 +01:00
Oleksii Kriuchykhin	0546716a0b	Improve user input sanitization, fix bugs [SCI-102]	2017-01-11 15:50:11 +01:00
Luka Murn	ef688feb4e	Hotfix 1.6.1 ... Set confirmed_at to created_at when using no email confirmations and users sign up by themselves.	2017-01-05 15:27:18 +01:00
Oleksii Kriuchykhin	835e982292	SAnitize AJAX calls in controllers and datatables [SCI-102]	2017-01-05 13:12:22 +01:00
zmagod	ac52e643be	cleanup direct upload	2016-12-08 11:26:13 +01:00
Luka Murn	372b455d7d	Merge pull request #332 from Ducz0r/lm-sci-750-751 ... Fix inviting users not working	2016-12-01 15:52:40 +01:00
Luka Murn	6a770f6a7e	Fix inviting users not working ... Closes SCI-750, SCI-751. Probably reopens parts of SCI-746.	2016-12-01 15:46:37 +01:00
Matej Zrimšek	3bdaa4bcef	Some token authentication refactoring and error handilng fixes. [closes SCI-689]	2016-12-01 15:38:56 +01:00
Matej Zrimšek	46465060d0	Added automatic sign in with token authentication, needed when signing in from different webpage. [closes SCI-689]	2016-11-30 16:56:56 +01:00
Luka Murn	b5d0a39827	Fix some recaptcha form submit errors for signup pages ... Closes SCI-746.	2016-11-29 15:53:58 +01:00
okriuchykhin	5981d1a48e	Merge pull request #316 from okriuchykhin/ok_SCI_738 ... Add full name field to accept invitation form [SCI-738]	2016-11-25 16:15:23 +01:00
Oleksii Kriuchykhin	3fdb20b92c	Add full name field to accept invitation form [SCI-738]	2016-11-25 11:15:10 +01:00
Luka Murn	87d3280847	Refactor registrations_controller code slightly	2016-11-25 09:56:07 +01:00
Oleksii Kriuchykhin	698e07a3b5	Enable reCaptcha and auto log in on confirm invitation form [SCI-706]	2016-11-24 14:11:02 +01:00
Mojca Lorber	60f23b109b	integrate reCaptcha into sciNote	2016-11-22 14:57:41 +01:00
Luka Murn	3be30c0e7a	Re-introduce fix for SCI-650 that was lost during merge ... Closes SCI-650.	2016-11-18 10:57:03 +01:00
Luka Murn	9d3685f872	Merge branch 'gamification' into 'master' ... Conflicts: app/controllers/users/invitations_controller.rb app/controllers/users/settings_controller.rb	2016-11-17 16:30:18 +01:00
Luka Murn	04749c3b2c	Allow inviting of existing, unconfirmed users ... Closes SCI-676.	2016-11-15 15:04:31 +01:00
Luka Murn	861e7cf72d	Update invited user form so it works if user inputs empty team name ... Closes SCI-650	2016-11-11 17:27:32 +01:00
Luka Murn	564274a588	Set invited_by field to invited users	2016-11-10 14:45:24 +01:00
Mojca Lorber	27c83992b4	refactoring notification method	2016-11-07 15:31:06 +01:00
Luka Murn	ce7733e9e9	Also add notification when UserOrganization is created	2016-11-07 09:47:30 +01:00
Luka Murn	0ab62576a2	Add new modal to organization page, remove old modal code	2016-11-07 09:43:10 +01:00
Luka Murn	6fe0d6b3df	A working invite modal!	2016-11-07 09:43:10 +01:00
Luka Murn	ccf8932611	Add first version of invite users modal	2016-11-07 09:43:09 +01:00
Mojca Lorber	749b108928	fix hound	2016-11-02 13:32:15 +01:00
Mojca Lorber	a2213e23b3	add notification for removing user from team and removing user from project	2016-11-02 11:52:41 +01:00
zmagod	6a328969f0	reset current_user if the user leaves the team [fixes SCI-599]	2016-10-25 09:53:02 +02:00
zmagod	e02132578a	first run	2016-10-24 20:07:20 +02:00
zmagod	557957c857	fixed issue with mozilla browsers	2016-10-17 15:21:19 +02:00
zmagod	1614cbc2b2	fixes repeat tutorial button and localization typos	2016-10-17 15:16:22 +02:00
zmagod	931cba2666	fixes hound [fixes SCI-512]	2016-10-17 15:10:26 +02:00
zmagod	8f24d0d80c	fixed new user registration	2016-10-17 15:10:26 +02:00
zmagod	d7f514db09	fixes search	2016-10-17 15:10:26 +02:00
zmagod	efe031d766	setup current_organization in all controllers	2016-10-17 15:10:26 +02:00
zmagod	d86a4dd311	setup global team switch view and controller action	2016-10-17 15:10:26 +02:00
Matej Zrimšek	a6a2a237aa	Removed unneeded ERB tags, which caused error. Minor refactoring.	2016-10-17 11:57:47 +02:00
Matej Zrimšek	5966911b92	Fixed Hound alerts.	2016-10-17 11:57:46 +02:00
Matej Zrimšek	0780bd2416	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
Matej Zrimšek	a3dfb59558	Added remaining constants.	2016-10-17 11:30:05 +02:00
Matej Zrimšek	21ec05d541	Refactored searches (user and globals earch) and used constants.	2016-10-17 11:17:59 +02:00
Luka Murn	bdaeb4db13	Add notification mailer preview	2016-10-13 08:56:04 +02:00
mlorb	78f7879c04	Merge pull request #216 from mlorb/ml_sci_555 ... Adding update notifications in settings [SCI-555]	2016-10-13 08:53:55 +02:00
Mojca Lorber	42f6b679f8	Adding system notifications email function in settings	2016-10-12 11:50:26 +02:00
Luka Murn	cccabcdd7b	Remove invitation_to_organization email ... This email is no longer needed, because if user enables assignment notifications, he/she will already receive an email whenever he/she is added to a new organization/team (via notifications email).	2016-10-12 10:54:36 +02:00
Oleksii Kriuchykhin	5399033fce	Added user settings for email notifications [SCI-443]	2016-10-11 16:43:17 +02:00
zmagod	9c7a690944	fixed type, fixed settings controller, fixes setting view on mobile devices	2016-10-05 14:33:22 +02:00
zmagod	a68e7abc57	first run notification settings	2016-10-04 15:52:48 +02:00
zmagod	947096862d	fixed hound	2016-10-03 11:40:59 +02:00
zmagod	ea17182372	generate notifications [fixes SCI-440]	2016-10-03 11:37:29 +02:00
Matej Zrimšek	234918a76d	Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits.	2016-09-21 19:48:18 +02:00
Matej Zrimšek	c2f0106993	Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408]	2016-09-16 15:56:44 +02:00
Matej Zrimšek	4ad384df5a	Fixed hound alerts.	2016-08-17 21:02:05 +02:00
Matej Zrimšek	27a9dac412	File permissions corrected, with some refactoring.	2016-08-17 18:23:24 +02:00
Matej Zrimšek	c87ba5b45c	Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page.	2016-08-17 18:10:32 +02:00
Matej Zrimšek	951cf67b3d	A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.	2016-08-17 18:08:21 +02:00
Luka Murn	076b67620f	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00
Luka Murn	055298fee8	Initial commit.	2016-02-12 16:52:43 +01:00