2067 commits

Author	SHA1	Message	Date
zmagod	5a31df7204	adds @Ducz0r suggestions	2017-10-06 10:45:22 +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
mlorb	c358f8fa0c	write unit tests for invite users	2017-09-28 14:49:33 +02:00
mlorb	4ef7b57f31	fix error handeling	2017-09-22 09:57:41 +02:00
mlorb	9d96bf668a	fix error handeling, refactoring	2017-09-21 16:42:56 +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	e078ae4f77	Merge branch 'rails-5.1' into decoupling-settings-page	2017-09-21 08:36:09 +02:00
Luka Murn	beae1b05d8	Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile Gemfile.lock	2017-09-21 08:27:38 +02:00
Luka Murn	5429f6bbbd	Fix @ZmagoD's remarks	2017-09-21 08:06:11 +02:00
Luka Murn	416ccf905d	Minor fix	2017-09-20 10:53:38 +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
zmagod	015026926d	refactor	2017-09-18 15:46:24 +02:00
zmagod	f0a8275559	fixes merge conflicts	2017-09-18 15:36:33 +02:00
zmagod	b9492daa69	fixes changeTeam method	2017-09-18 15:16:07 +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
Toni Dezman	39c9b708bd	Merge pull request #780 from programmertoni/td_SCI_1565 ... Td sci 1565	2017-09-18 11:37:19 +02:00
zmagod	40359c5c73	fixed edit name modal	2017-09-15 16:34:05 +02:00
zmagod	83647d81b4	adds edit team name modal	2017-09-15 14:00:48 +02:00
zmagod	1a00b53034	adds user_team tests	2017-09-14 13:11:19 +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
zmagod	1b3b3dfea9	adds team members update role functionality	2017-09-12 17:30:13 +02:00
Toni Dezman	1cd9cd92fc	adds global spinner	2017-09-11 14:30:49 +02:00
Toni Dezman	67d617deb5	adds hound_bot's and zmagos suggestions	2017-09-07 13:40:53 +02:00
Mojca Lorber	0e14420193	fix bugs with importing samples	2017-09-06 14:41:14 +02:00
Toni Dezman	185039bc99	adds suggestions from code review	2017-09-04 15:00:26 +02:00
zmagod	9c01ab414c	refactor leave team	2017-09-01 17:10:43 +02:00
zmagod	91d2d8a935	adds team details view	2017-08-31 15:56:55 +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
zmagod	1325732b0c	adds specs for team controller actions	2017-08-30 16:18:21 +02:00
Toni Dezman	2e6a942152	api for timezone	2017-08-30 14:59:17 +02:00
zmagod	ee054f91b8	adds bullet gem [fixes SCI-1578]	2017-08-30 09:29:45 +02:00
Toni Dezman	c82dfa502a	adds errors in client_api for users_controller	2017-08-29 13:14:52 +02:00
zmagod	ec86691659	fixed tests	2017-08-29 12:04:00 +02:00
zmagod	c54dd9473e	adds controller spec for leave team [fixes SCI-1497]	2017-08-29 11:56:46 +02:00
zmagod	478bd491ff	added pagination and sorting to team tables	2017-08-28 17:05:09 +02:00