2322 commits

Author	SHA1	Message	Date
zmagod	c5379896c0	fix HOC to recive objects	2018-01-08 16:28:20 +01:00
zmagod	c07f54a0c7	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854	2018-01-08 08:38:14 +01:00
mlorb	fd6dfbd561	rename create_teams	2018-01-05 16:47:48 +01:00
mlorb	e76ec7f4a4	Merge pull request #911 from mlorb/ml-sci-1797 ... Permissions - refactor organization & team level permissions (core) [SCI-1797]	2018-01-05 16:03:55 +01:00
mlorb	efb4ce289c	fix and/or use	2018-01-05 15:52:41 +01:00
mlorb	99185871c4	fix naming things	2018-01-05 15:15:50 +01:00
mlorb	70ae14a9b8	refactor manage repository permissions again because of addons	2018-01-05 11:17:01 +01:00
mlorb	ec851caa80	refactor manage repository column permissions again because of addons	2018-01-05 10:43:59 +01:00
okriuchykhin	4cdbecc3bc	Merge pull request #923 from okriuchykhin/ok_SCI_1869 ... Add project/task path with tooltips to activities [SCI-1869]	2018-01-04 16:44:35 +01:00
Oleksii Kriuchykhin	53f4db9352	Code refactoring [SCI-1869]	2018-01-04 14:56:16 +01:00
okriuchykhin	b0f8c36677	Merge pull request #917 from okriuchykhin/ok_SCI_1870 ... Fix adding users to a task [SCI-1870]	2018-01-04 14:14:05 +01:00
okriuchykhin	e49ffb61d4	Merge pull request #914 from okriuchykhin/ok_SCI_1873 ... Fix repositories [SCI-1873]	2018-01-04 13:33:30 +01:00
mlorb	abced181d5	refactor manage repository rows permissions again because of addons	2018-01-04 11:53:58 +01:00
Oleksii Kriuchykhin	070711917e	Code fixes [SCI-1873]	2018-01-04 11:25:34 +01:00
zmagod	e0e3ef9359	fixes flow, and before_action in permissions_controller	2018-01-03 17:23:50 +01:00
okriuchykhin	d149facd50	Merge pull request #922 from okriuchykhin/ok_SCI_1875 ... Fix about modal [SCI-1875]	2018-01-03 17:00:29 +01:00
mlorb	0c519b8f03	refactor manage sample elements permissions again because of addons	2018-01-03 16:37:02 +01:00
okriuchykhin	ac7746ae91	Merge pull request #916 from okriuchykhin/ok_SCI_1871 ... Fix canvas update [SCI-1871]	2018-01-03 15:47:10 +01:00
okriuchykhin	ff62a36788	Merge pull request #910 from okriuchykhin/ok_SCI_1838 ... Change invite users to project link to new settings page [SCI-1838]	2018-01-03 14:47:26 +01:00
okriuchykhin	b8fa3c4d51	Merge pull request #905 from okriuchykhin/ok_SCI_1865 ... Add icons for different notification types in recent notification dropdown [SCI-1865]	2018-01-03 14:23:53 +01:00
mlorb	dc68b3068b	fix Rails 5.1 bug with params	2018-01-03 13:19:56 +01:00
Oleksii Kriuchykhin	2e275d6d67	Add project/task path with tooltips to activities [SCI-1869]	2017-12-28 15:13:39 +01:00
Oleksii Kriuchykhin	89230bd730	Fix about modal [SCI-1875]	2017-12-22 18:27:20 +01:00
mlorb	0774b6f7e6	refactor manage samples permissions again, so that addons permissions can be added	2017-12-20 16:05:05 +01:00
Oleksii Kriuchykhin	49ae9bcd55	Fix adding users to a task [SCI-1870]	2017-12-20 13:44:21 +01:00
Oleksii Kriuchykhin	66869fe4cf	Fix canvas update [SCI-1871]	2017-12-20 11:44:11 +01:00
Oleksii Kriuchykhin	512ee07bde	Fix repositories [SCI-1873]	2017-12-19 17:53:45 +01:00
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