87 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	91468faaf9	Fix addons display in info modal [SCI-1875]	2018-01-17 18:30:55 +01:00
Zmago Devetak	ebd354e4d5	Merge pull request #900 from ZmagoD/zd_SCI_1854 ... adds premissions service to FE	2018-01-12 14:24:28 +01:00
zmagod	371491c259	refactor	2018-01-12 11:38:52 +01:00
mlorb	6c4514f550	add create_teams permission checks	2018-01-09 15:28:27 +01:00
zmagod	0d7c116de1	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854	2018-01-09 10:03:02 +01:00
zmagod	c5379896c0	fix HOC to recive objects	2018-01-08 16:28:20 +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	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	99185871c4	fix naming things	2018-01-05 15:15:50 +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
zmagod	e0e3ef9359	fixes flow, and before_action in permissions_controller	2018-01-03 17:23:50 +01:00
zmagod	1d3881b649	fixes bug with duplicated activities and wrong date separators [fixes SCI-1866]	2018-01-03 13:48:59 +01:00
mlorb	bd7eda1506	fix failing tests	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	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
zmagod	219ef3baf6	setup new pagination for activities	2017-12-14 14:02:40 +01:00
zmagod	249d3d7698	fixes current timezone setup for activities	2017-12-13 16:48:31 +01:00
zmagod	b106545d31	fixes per @duco 's request	2017-12-13 08:57:50 +01:00
Oleksii Kriuchykhin	6256acdfea	Rename notifications settings accessor [SCI-1864]	2017-12-07 13:59:33 +01:00
zmagod	e01e7bebbf	add permissions endpoint on the API	2017-12-04 13:25:48 +01:00
zmagod	52b278fe78	adds premissions service to FE	2017-12-01 17:15:15 +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	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	2118b31762	adds about sciNote modal	2017-11-02 13:23:57 +01:00
zmagod	3d22a5404d	add scenic gem, teams datatables sql view	2017-10-26 16:59:00 +02:00
zmagod	c36fcb1fa4	fixes user invitation button [fixes SCI-1726]	2017-10-25 11:31:32 +02:00
Luka Murn	c026b60790	Update Profile page to use validation	2017-10-23 18:04:20 +02:00
zmagod	d85233cb2c	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566	2017-10-09 09:30:06 +02:00
zmagod	2a64d23a6e	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1567	2017-10-09 09:14:58 +02:00
zmagod	5a31df7204	adds @Ducz0r suggestions	2017-10-06 10:45:22 +02:00
zmagod	dea69014d0	fixes bug with password confirmation	2017-10-06 09:54:17 +02:00
zmagod	a020e23286	follow suggestions of @Ducz0r	2017-10-05 13:56:56 +02:00
zmagod	754627efe7	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564	2017-10-05 11:08:31 +02:00
zmagod	524e8bffbf	fixes sign out action on settings page, clean the redux store, handles redirect to sign in page if session is terminated [fixes SCI-1567]	2017-10-05 10:07:50 +02:00
zmagod	edf4443995	added notification alert [fixes SCI-1566]	2017-10-02 14:51:54 +02:00
zmagod	cb4bacc372	refactor preferences page [fixes SCI-1564]	2017-09-28 16:53:51 +02:00
zmagod	c8c8afdd1d	update react-bootstrap	2017-09-28 15:00:54 +02:00
mlorb	c358f8fa0c	write unit tests for invite users	2017-09-28 14:49:33 +02:00
zmagod	26b526d61b	adds getter and setters for user settings	2017-09-27 14:38:52 +02:00
zmagod	66269d68ff	fixed image upload	2017-09-27 09:17:09 +02:00
zmagod	e2aa0d7515	fixes user profile	2017-09-26 17:29:11 +02:00
zmagod	1a7f8fc857	added frontend validations	2017-09-22 16:59:38 +02:00
mlorb	9d96bf668a	fix error handeling, refactoring	2017-09-21 16:42:56 +02:00
zmagod	39025769ec	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564	2017-09-21 13:45:27 +02:00
zmagod	ed2beefc08	fixed profile info inputs	2017-09-21 13:42:49 +02:00
mlorb	55772a80ab	fix hound and refactor	2017-09-21 10:45:36 +02:00
mlorb	48c8922604	adds invite users modal	2017-09-21 10:45:35 +02:00