2887 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
mlorb	bd7eda1506	fix failing tests	2017-12-14 14:18:18 +01:00
mlorb	2936770c01	refactor can view team users ATWHO permission	2017-12-14 14:18:18 +01:00
mlorb	5c790287ec	refactor again manage user team permissions	2017-12-14 14:18:18 +01:00
mlorb	7c1ae6bc82	refactor manage repository permissions	2017-12-14 14:18:18 +01:00
mlorb	2918a9833d	refactor manage repository column permissions	2017-12-14 14:18:18 +01:00
mlorb	3f5e9e60b7	refactor view repository permission	2017-12-14 14:18:18 +01:00
mlorb	079ac7a4d3	refactor manage repository row permissions	2017-12-14 14:18:18 +01:00
mlorb	740ecc674b	refactor view repositories permission	2017-12-14 14:18:18 +01:00
mlorb	3ca51f097f	refactor manage sample permissions again by removing authorship and refactor manage sample elements permissions	2017-12-14 14:18:17 +01:00
mlorb	e577b363b2	byTheWay fix of Rails 5.1 bug	2017-12-14 14:18:17 +01:00
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
okriuchykhin	1c852252c4	Merge pull request #899 from okriuchykhin/ok_SCI_1839 ... Fix jsPlumb library loading [SCI-1839]	2017-12-04 14:12:12 +01:00
Luka Murn	022c81ec1f	Add developer documentation to Git ... Currently, this only includes some remarks regarding validation.	2017-12-01 15:53:38 +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
okriuchykhin	7dfaab82bb	Merge pull request #895 from okriuchykhin/ok_SCI_1840 ... Add initialization of the selectpicker on experiments actions [SCI-1840]	2017-11-30 10:56:07 +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
Zmago Devetak	215fa9d0b0	Merge pull request #887 from ZmagoD/zd_SCI_1762 ... fixes rspec tests	2017-11-24 11:48:39 +01:00
zmagod	65aee2630f	fix makefile	2017-11-24 09:56:04 +01:00
zmagod	6987261b53	disable pending cucumber tests	2017-11-24 09:52:13 +01:00
zmagod	6f8c97a686	remove rm container	2017-11-23 17:43:09 +01:00
zmagod	b5537e2dfc	change setup	2017-11-23 17:23:55 +01:00
zmagod	6d68135a70	adds mailer envs	2017-11-23 17:09:05 +01:00
zmagod	6d56377eb0	adds sleep time after Delayed::Worker.new.work_off	2017-11-23 16:57:30 +01:00
zmagod	331823c2fb	upgrade capybara_email gem	2017-11-23 16:27:49 +01:00
zmagod	dc51d328bc	removes make worker	2017-11-23 15:58:46 +01:00
zmagod	149f09da55	add workder to travic	2017-11-23 15:45:47 +01:00
zmagod	61be762b76	fix failing navigation spec	2017-11-23 15:30:08 +01:00
zmagod	930e3a86dc	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1762	2017-11-23 13:56:17 +01:00
Luka Murn	c51a85a161	Merge pull request #888 from biosistemika/lm-sci-1795 ... Setup main architecture for permissions refactoring [SCI-1795]	2017-11-23 12:32:49 +01:00