54 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	69812786ba	Fix protocol owner re-assignment when removing a user from a team [SCI-7457]	2022-11-18 12:52:30 +01:00
Oleksii Kriuchykhin	0a8ebef095	Update teams table with new user assignments system [SCI-7291]	2022-10-05 18:28:40 +02:00
Oleksii Kriuchykhin	b675fb14eb	Fix user adding/removing from a team [SCI-7240]	2022-09-26 12:14:03 +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
Oleksii Kriuchykhin	03ec4cb319	Setup user assignments relations for team, inventory and protocol [SCI-6818]	2022-05-17 14:32:14 +02:00
Oleksii Kriuchykhin	30031e2f07	Fix user removal from a team [SCI-6323]	2021-12-06 14:24:59 +01:00
Martin Artnik	3406cd9235	Added optional webhook secret key [SCI-6193]	2021-11-03 15:04:13 +01:00
Martin Artnik	57d5e6c2a7	Merge branch 'develop' into features/barcodes	2021-08-03 13:36:36 +02:00
aignatov-bio	43571b5692	Print labels changes [SCI-5943] (#3461)	2021-08-02 15:38:37 +02:00
Martin Artnik	b32b207f3d	Added FLUICS API client [SCI-5939]	2021-07-23 13:52: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	47071e23a1	Added specs for webhooks	2021-06-17 14:54:30 +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
Urban Rotnik	5c72200801	Remove tooltips settings for user	2020-04-28 12:44:47 +02:00
Oleksii Kriuchykhin	0094528a02	Improve connected accounts unlinking [SCI-4142]	2019-12-12 14:57:27 +01:00
Oleksii Kriuchykhin	03667f619f	Merge branch 'release-1-17-7' into develop	2019-12-05 13:03:39 +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
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	e6102c72c7	Adding missed activities [SCI-3253] (#1614) ... * Adding missed activties * Adding test for activities	2019-04-02 11:50:37 +02:00
Oleksii Kriuchykhin	6bc944fcc7	Fix role name in change user role in team activity [SCI-3213]	2019-03-28 16:26:07 +01:00
Urban Rotnik	e7b57aa4f7	Add creating activities for Team actions	2019-03-12 09:15:06 +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
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	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
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
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
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
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
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