2276 commits

Author	SHA1	Message	Date
mlorb	29f9414839	refactor create project permission	2017-12-14 14:18:17 +01:00
mlorb	72023c7dfe	refactor update/delete sample permissions	2017-12-14 14:18:17 +01:00
mlorb	b09377cd8d	refactor update sample permission	2017-12-14 14:18:17 +01:00
mlorb	f801ed8eb6	refactor view/export samples permission	2017-12-14 14:18:16 +01:00
mlorb	0d37f9c85a	refactor clone protocol permission	2017-12-14 14:18:16 +01:00
mlorb	f6d36ae6a2	refactor update protocol type in repository	2017-12-14 14:18:16 +01:00
mlorb	806fcbce36	refactor update protocol in repository permission	2017-12-14 14:18:16 +01:00
mlorb	e0d1ae174e	refactor read protocol in repository permission	2017-12-14 14:18:15 +01:00
mlorb	a3a494c3a2	fix banana: remove dead code which strangely reappeared, probably with some rebasing	2017-12-14 14:18:15 +01:00
mlorb	ccc2451494	refactor create sample permissions	2017-12-14 14:18:15 +01:00
mlorb	43c01b74b1	refactor create protocol permission	2017-12-14 14:18:14 +01:00
mlorb	11a3cd196c	add create, update team permission and refactor 422 respond handling in controllers	2017-12-14 14:18:14 +01:00
mlorb	8893fd668d	add create, update, delete user_team permission	2017-12-14 14:18:14 +01:00
mlorb	a0b2d3f5ef	refactor read_team permission	2017-12-14 14:18:14 +01:00
okriuchykhin	2fa7591f36	Merge pull request #903 from okriuchykhin/ok_SCI_1864 ... Rename notifications settings accessor [SCI-1864]	2017-12-13 12:57:56 +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
Luka Murn	86ac07c69f	Merge pull request #902 from biosistemika/rails-5.1 ... Merge rails-5.1 into decoupling-settings-page	2017-12-07 09:25:11 +01:00
Oleksii Kriuchykhin	c4fe2b1c11	Fix jsPlumb library loading [SCI-1839]	2017-12-01 10:48:07 +01:00
okriuchykhin	16729ccd7d	Merge pull request #898 from okriuchykhin/ok_SCI_1838 ... Fix assignment of users to projects [SCI-1838]	2017-11-30 11:16:07 +01:00
okriuchykhin	9ed73702c5	Merge pull request #896 from okriuchykhin/ok_SCI_1837 ... Fix Ajax calls with redirect [SCI-1837]	2017-11-30 11:00:26 +01:00
Oleksii Kriuchykhin	194054d973	Fix assignment of users to projects [SCI-1838]	2017-11-29 22:55:10 +01:00
Oleksii Kriuchykhin	7bb52191cd	Fix Ajax calls with redirect [SCI-1837]	2017-11-29 16:13:28 +01:00
Oleksii Kriuchykhin	6964ed2dbb	Add initialization of the selectpicker on experiments actions [SCI-1840]	2017-11-28 16:34:30 +01:00
Luka Murn	00fe267a2a	Minor codestyle fixes	2017-11-23 11:33:39 +01:00
Luka Murn	d715eb06ef	Add team & project role-related helper functions to User model ... This will be required later once we start using Canaid.	2017-11-16 15:50:30 +01:00
Zmago Devetak	fe128dc53b	Merge pull request #865 from ZmagoD/zd_SCI_1761 ... fixes password validations [fixes SCI-1761]	2017-11-13 13:09:46 +01:00
zmagod	26912a14d6	fixes password validations [fixes SCI-1761]	2017-11-10 12:59:37 +01:00
mlorb	fd743ec2d5	fix error with event not defined and add flowtype to ESLint	2017-11-10 09:30:55 +01:00
mlorb	dfb2689fbf	Merge pull request #860 from mlorb/ml-sci-1730 ... Fix team table does not retain the number of teams per page bug [SCI-1730]	2017-11-09 17:53:19 +01:00
zmagod	327e27e123	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1576	2017-11-09 15:55:10 +01:00
mlorb	b3e39697d5	Merge pull request #857 from mlorb/ml-sci-1575 ... Implement login feature integration tests [SCI-1575]	2017-11-09 13:48:57 +01:00
mlorb	b0fe792f9c	fix ESLint class-methods-use-this error	2017-11-09 13:33:41 +01:00
mlorb	c7f5d6ed8c	add state for number of teams per page	2017-11-09 13:29:14 +01:00
Zmago Devetak	7386974d64	Merge pull request #850 from ZmagoD/zd_SCI_1731 ... add scenic gem, teams datatables sql view	2017-11-09 11:37:20 +01:00
zmagod	e0b6683a44	create view directory per @Ducz0r 's request	2017-11-09 10:06:53 +01:00
mlorb	4e92065ea0	Merge pull request #855 from mlorb/ml-sci-1633-v2 ... Fix bug with import css styles [SCI-1633]	2017-11-09 09:49:37 +01:00
zmagod	9eac014f1a	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731	2017-11-09 09:05:22 +01:00
zmagod	e2af987b80	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1568	2017-11-09 08:35:39 +01:00
zmagod	33ebe1f748	integration tests for forgot_password [fixes SCI-1576]	2017-11-08 16:23:52 +01:00
zmagod	b036452d8c	adds background worker to cucumber tests	2017-11-08 11:59:01 +01:00
Luka Murn	dfa1c83c9f	Merge branch 'lm-add-flow-to-validation' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-add-flow-to-validation ... Conflicts: flow-typed/npm/lodash_v4.x.x.js	2017-11-08 09:33:29 +01:00
Luka Murn	0412c6f283	Update code per @ZmagoD's request	2017-11-07 17:30:15 +01:00
mlorb	157b1968cc	implement login's feature integration tests	2017-11-07 17:18:41 +01:00
mlorb	df835fccb4	fix bug with import css styles	2017-11-07 11:09:30 +01:00
zmagod	3255d5cf7c	code cleanup	2017-11-06 15:37:09 +01:00
zmagod	54e360bb52	fixes team switch	2017-11-06 15:14:17 +01:00
mlorb	bd569b9746	small changes	2017-11-06 11:34:25 +01:00
mlorb	21e3c653eb	add integration tests for single team feature	2017-11-03 10:48:09 +01:00
zmagod	5bc38414d1	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731	2017-11-03 09:56:44 +01:00