206 commits

Author	SHA1	Message	Date
zmagod	811b206392	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1641	2017-10-06 17:05:07 +02:00
zmagod	839eaf8e03	downgrade to react 15 since bootstrap-react is not fully compatible	2017-10-06 17:02:14 +02:00
zmagod	3321fc495c	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628	2017-10-06 15:54:52 +02:00
zmagod	8dfb5e2260	implements @mlorb suggestions	2017-10-06 15:22:01 +02:00
zmagod	c3562e08e9	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566	2017-10-06 10:46:47 +02:00
zmagod	5a31df7204	adds @Ducz0r suggestions	2017-10-06 10:45:22 +02:00
zmagod	c20f0c2d8a	fixes user_controller specs, adds user model specs for settings	2017-10-05 15:53:05 +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
mlorb	7db4bd1f5f	fix a few style error on All teams page	2017-10-05 10:05:55 +02:00
mlorb	fcea55c2a1	Merge pull request #808 from mlorb/ml-sci-1631 ... Fix rounded style of buttons and fix invite users to a team style errors [SCI-1631]	2017-10-04 14:57:45 +02:00
zmagod	14bae8def5	trigger redirect to root page on team switch [fixes SCI-1641]	2017-10-04 14:42:38 +02:00
zmagod	4380a65caf	fixes activities key [fixes SCI-1628]	2017-10-04 13:45:52 +02:00
zmagod	e9568bcd47	optin flow in activities modal	2017-10-04 11:35:32 +02:00
zmagod	84f279de22	setup flow	2017-10-04 09:16:17 +02:00
mlorb	83f06361f2	fix rounded style of buttons and fix invite users to a team style errors	2017-10-03 17:33:30 +02:00
zmagod	ce6613ac63	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629	2017-10-03 16:05:45 +02:00
zmagod	55332e2957	adds bootstrap and font-awesome in webpacker build fixes the missing icons bug [fixes SCI-1629]	2017-10-03 16:01:33 +02:00
Luka Murn	2964579638	Fix Zmago's comments	2017-10-03 11:14:47 +02:00
Luka Murn	8ba7ed5884	Change the generation to be done using Redux (instead of this.window...)	2017-10-02 19:25:04 +02:00
zmagod	182e3dcc37	added colors constants	2017-10-02 14:56:49 +02:00
zmagod	edf4443995	added notification alert [fixes SCI-1566]	2017-10-02 14:51:54 +02:00
Luka Murn	cbf2e3cc3f	Hound is love, Hound is life	2017-09-28 20:07:11 +02:00
Luka Murn	a0db8fcf9d	Some codestyle fixes	2017-09-28 19:49:25 +02:00
Luka Murn	6951755a92	Add animation, multiple alerts, make them float	2017-09-28 19:39:17 +02:00
zmagod	9de8592858	fixed edit image on hover action	2017-09-28 17:13:04 +02:00
zmagod	f492234f89	fixes hound allerts	2017-09-28 17:00:11 +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
Luka Murn	f6c7e854ad	Update main application, slight refactor	2017-09-27 17:59:04 +02:00
Luka Murn	a46f50af21	Remove FlashMessages component	2017-09-27 17:34:45 +02:00
Luka Murn	82d672293a	First WIP version of FlashMessages & Alert components	2017-09-27 17:29:04 +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	ac3601bd2e	hound	2017-09-21 10:56:17 +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
Luka Murn	5429f6bbbd	Fix @ZmagoD's remarks	2017-09-21 08:06:11 +02:00
zmagod	c636ca4276	refactor user preferences and profile page	2017-09-20 11:17:59 +02:00
Luka Murn	6e993f41b8	Indentation error	2017-09-19 16:59:19 +02:00
Luka Murn	869c3593a3	Hound is love, Hound is life	2017-09-19 16:56:39 +02:00
Luka Murn	decdce17fa	Fix rebasing problems	2017-09-19 16:47:55 +02:00
Luka Murn	44877a13a5	Refactor services on backend. New team page is now working	2017-09-19 16:32:21 +02:00
Luka Murn	80c05e50ec	Semi-working version of create new team form	2017-09-19 16:30:26 +02:00
Luka Murn	df44976fc6	Save input values into component state	2017-09-19 14:07:17 +02:00
Luka Murn	0108d9ea19	Finish new team GUI	2017-09-19 14:04:46 +02:00
Luka Murn	28cb9643d9	Blank new team page with breadcrumbs	2017-09-19 14:04:46 +02:00
zmagod	40af99c57f	fix hound v2	2017-09-19 13:36:51 +02:00
zmagod	8416ccc5c2	fixes hound alerts	2017-09-19 13:33:43 +02:00
zmagod	88928be2d3	fixes profile page route, moves source files out of packs folder, restructure React app architecture [fixes SCI-1622]	2017-09-19 13:08:08 +02:00