160 commits

Author	SHA1	Message	Date
okriuchykhin	0b1f43c1c5	Merge pull request #954 from okriuchykhin/ok_SCI_1970 ... Add health check endpoint to API controller [SCI-1970]	2018-01-25 14:33:37 +01:00
zmagod	f8a3fca2db	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin	28be7c4fc4	Add health check endpoint to API controller [SCI-1970]	2018-01-22 16:52:48 +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	a3a494c3a2	fix banana: remove dead code which strangely reappeared, probably with some rebasing	2017-12-14 14:18:15 +01:00
zmagod	b106545d31	fixes per @duco 's request	2017-12-13 08:57:50 +01:00
zmagod	b6a5ab5e6c	fix request	2017-12-01 17:29:46 +01:00
zmagod	52b278fe78	adds premissions service to FE	2017-12-01 17:15:15 +01:00
Oleksii Kriuchykhin	84f4aba213	Pull latest master into gilson-iot-rails4	2017-11-15 15:15:26 +01:00
mlorb	cd6799d571	Merge pull request #866 from biosistemika/protocols-io-import ... Protocols io import	2017-11-13 11:53:28 +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	2118b31762	adds about sciNote modal	2017-11-02 13:23:57 +01:00
zmagod	e5a01f7a57	adds integration tests for about sciNote modal	2017-10-27 16:37:42 +02:00
Luka Murn	4e06b5c397	Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]""	2017-10-17 13:17:49 +02:00
Luka Murn	4d8f2665d3	Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"	2017-10-17 13:10:02 +02:00
Luka Murn	fe89b942e7	Add Add-ons page to User -> Settings -> Account ... Closes SCI-1675.	2017-10-11 14:15:37 +02:00
Zanz2	66e5004e60	Changed import text to be inside en.yml, as said in the code review, deleted some blank lines	2017-10-07 15:56:43 +02:00
zmagod	84f279de22	setup flow	2017-10-04 09:16:17 +02:00
Zanz2	11b2ef3112	Made code nicer, hopefully not unintentionally breaking something	2017-09-25 13:53:32 +02:00
mlorb	48c8922604	adds invite users modal	2017-09-21 10:45:35 +02:00
Luka Murn	80c05e50ec	Semi-working version of create new team form	2017-09-19 16:30:26 +02:00
Zanz2	7aba782639	optimised code so i dont need javascript locals anymore and working to fix infamous html tags bug where second modal doesnt show	2017-09-19 15:02:16 +02:00
zmagod	d1477179b2	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1499	2017-09-18 15:10:52 +02:00
Zanz2	f861b1fc52	Configured the controller,the main task ahead is to figure out how to import all of the data i have available	2017-09-15 15:52:55 +02:00
Toni Dezman	d38f4343f2	Decupling redux part 1	2017-09-14 11:46:49 +02:00
zmagod	705d07f60e	adds remove team action	2017-09-13 17:11:51 +02:00
Zanz2	b7432b336a	added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller	2017-09-13 15:15:08 +02:00
zmagod	1b3b3dfea9	adds team members update role functionality	2017-09-12 17:30:13 +02:00
Toni Dezman	185039bc99	adds suggestions from code review	2017-09-04 15:00:26 +02:00
zmagod	91d2d8a935	adds team details view	2017-08-31 15:56:55 +02:00
Toni Dezman	c3f46d4877	adds hounds suggestions on improving the code	2017-08-31 13:24:57 +02:00
Toni Dezman	77a6a99513	fixes 404 request error	2017-08-31 13:03:15 +02:00
Toni Dezman	4034400c42	Merge branch 'decoupling-settings-page' into td_SCI_1565	2017-08-31 11:42:15 +02:00
Toni Dezman	8b61fe563c	user preferences APIs	2017-08-31 11:23:44 +02:00
Toni Dezman	2e6a942152	api for timezone	2017-08-30 14:59:17 +02:00
Oleksii Kriuchykhin	c3fceb90df	Backport API to Rails-4 [SCI-1579]	2017-08-30 13:30:41 +02:00
zmagod	ee054f91b8	adds bullet gem [fixes SCI-1578]	2017-08-30 09:29:45 +02:00
Toni Dezman	ea9a195f09	email and password action/redusers work	2017-08-26 14:07:31 +02:00
Toni Dezman	ccd14f6b50	adds apis for full_name and initials input fields	2017-08-25 14:45:02 +02:00
zmagod	782daabce1	first run	2017-08-25 08:54:32 +02:00
Toni Dezman	e4a704d063	namespaces client_api/users/user_controller.rb	2017-08-25 08:21:52 +02:00
Toni Dezman	692df427b2	adds wildcard for settings/*all to show react 404 page	2017-08-22 10:35:18 +02:00
zmagod	c5e32c4ea0	Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into merge-rails-5.1-branch	2017-08-21 09:52:14 +02:00
zmagod	bd352869a3	adds user account dropdown	2017-08-09 09:08:13 +02:00
zmagod	226458a3f0	adds recent notifications	2017-08-08 15:44:28 +02:00
zmagod	c314bae28d	add team switch js/controller	2017-08-03 16:03:15 +02:00
zmagod	6ef19725f1	adds redux	2017-08-02 17:27:05 +02:00
zmagod	caae1e2fe8	adds intl, router, bootstrap to npm modules	2017-07-31 10:42:40 +02:00
zmagod	a46e28a85a	fixes signup spec [fixes SCI-1471]	2017-07-28 15:37:28 +02:00