877 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	79e1eaf145	Fix export samples button [SCI-1936]	2018-01-15 13:54:08 +01:00
Zmago Devetak	0e6931b1f3	Merge pull request #908 from ZmagoD/zd_SCI_1866 ... Wrong date at activity	2018-01-08 14:20:26 +01:00
zmagod	eb8124ea5a	follow @duco 's suggestions	2018-01-05 17:08:00 +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
zmagod	862b73cae7	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866	2018-01-05 09:13:43 +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
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
mlorb	abced181d5	refactor manage repository rows permissions again because of addons	2018-01-04 11:53:58 +01:00
mlorb	0c519b8f03	refactor manage sample elements permissions again because of addons	2018-01-03 16:37:02 +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
zmagod	1d3881b649	fixes bug with duplicated activities and wrong date separators [fixes SCI-1866]	2018-01-03 13:48:59 +01:00
Oleksii Kriuchykhin	2e275d6d67	Add project/task path with tooltips to activities [SCI-1869]	2017-12-28 15:13:39 +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
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	72023c7dfe	refactor update/delete sample permissions	2017-12-14 14:18:17 +01:00
mlorb	f801ed8eb6	refactor view/export samples permission	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	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	a0b2d3f5ef	refactor read_team permission	2017-12-14 14:18:14 +01:00
zmagod	219ef3baf6	setup new pagination for activities	2017-12-14 14:02:40 +01:00
Oleksii Kriuchykhin	4ff6e87fed	Change invite users to project link to new settings page [SCI-1838]	2017-12-14 11:22:28 +01:00
Oleksii Kriuchykhin	6986d11cfe	Add Flow types for notifications [SCI-1865]	2017-12-13 17:25:25 +01:00
zmagod	249d3d7698	fixes current timezone setup for activities	2017-12-13 16:48:31 +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	ea63864b33	Add icons for different notification types in recent notification dropdown [SCI-1865]	2017-12-12 17:05:08 +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
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
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
zmagod	54e360bb52	fixes team switch	2017-11-06 15:14:17 +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
zmagod	e17f945d8a	fix typos	2017-11-02 16:41:29 +01:00
zmagod	5538805faa	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1669	2017-11-02 14:39:07 +01:00
zmagod	3d22a5404d	add scenic gem, teams datatables sql view	2017-10-26 16:59:00 +02:00