686 Commits

Author	SHA1	Message	Date
riley	9f4c30f466	found the bang	2017-01-19 14:23:57 -07:00
David Erwin	fa53327571	Merge branch 'master' into registration-fix	2017-01-19 15:20:52 -05:00
Riley Davis	07e24496da	allow uppercase displaynames at creation	2017-01-18 13:13:02 -07:00
Riley Davis	f07026d6dd	hide uppercase login	2017-01-18 12:57:07 -07:00
Belén Curcio	7140723570	Merge branch 'master' into design-pass-adm	2017-01-18 14:40:09 -03:00
Riley Davis	14fd5e4451	does a null check	2017-01-17 15:12:19 -07:00
Riley Davis	af71059948	Revert "My Comment bug fix"	2017-01-17 14:53:28 -07:00
Belen Curcio	b5afd9cbeb	çhanges	2017-01-17 16:39:05 -03:00
Belen Curcio	3640a93a2f	Changes	2017-01-17 16:25:47 -03:00
Riley Davis	1b50cb06d4	gotta commit something to see changes	2017-01-17 11:38:15 -07:00
Belen Curcio	6d826e9115	Working Stream	2017-01-17 12:47:06 -03:00
David Erwin	249a8f78dc	Merge branch 'master' into bug-comment-number	2017-01-17 10:03:34 -05:00
David Erwin	04e3f12c87	Merge branch 'master' into bugfix-flagged-actions	2017-01-17 09:52:26 -05:00
David Erwin	e41acffcf0	Merge branch 'master' into password-length-test	2017-01-17 09:47:42 -05:00
Gabriela Rodríguez Berón	5a22e99282	Merge branch 'master' into bug-comment-number	2017-01-13 15:25:27 -08:00
Gabriela Rodríguez Berón	4f013c50e6	Merge branch 'master' into bugfix-flagged-actions	2017-01-13 15:05:54 -08:00
Gabriela Rodríguez Berón	1accc54238	Merge branch 'master' into unique-username	2017-01-13 14:21:42 -08:00
Riley Davis	44a06aef46	do not render tab content unless they're active	2017-01-13 14:33:01 -07:00
Belen Curcio	f0cc82cb6d	Changes	2017-01-13 18:16:46 -03:00
Belen Curcio	cae101627f	Merge branch 'master' of github.com:coralproject/talk into design-pass-adm	2017-01-13 17:14:51 -03:00
Belen Curcio	e69262c665	Community Section Ready	2017-01-13 17:11:46 -03:00
Riley Davis	7295d78523	typos	2017-01-13 11:13:28 -07:00
Belen Curcio	9876e04454	Ban User box	2017-01-13 13:54:45 -03:00
Belen Curcio	712c53389b	Banned Words and Suspect	2017-01-13 13:07:45 -03:00
Wyatt Johnson	281a49dc74	Merge branch 'master' into bugfix-flagged-actions	2017-01-12 16:29:32 -07:00
Gabriela Rodríguez Berón	1cc048d46e	Merge branch 'master' into unique-username	2017-01-12 14:53:13 -08:00
gaba	1027b19a49	Added regex to look for the field that is duplicated. Not sure if there is a better way to do it.	2017-01-12 14:43:36 -08:00
David Jay	f3f5397459	Removing rejected and approved comments from flagged feed.	2017-01-12 17:32:48 -05:00
Riley Davis	0eefd3364b	update tests	2017-01-12 15:25:36 -07:00
David Jay	3e0d56b942	Keeping hydrated comments in assets in COMMENTS_BY_USER_REQUEST.	2017-01-12 16:41:50 -05:00
Belen Curcio	ce01389809	Ádding Icon to Coral UI Button	2017-01-12 18:20:42 -03:00
Belen Curcio	87b350e3a9	Missing tab wrapper	2017-01-12 17:56:00 -03:00
Belen Curcio	c375d11e32	Coral UI - List and Item	2017-01-12 17:47:45 -03:00
Riley Davis	f1272338cd	re-use dispatch function	2017-01-12 13:30:53 -07:00
Riley Davis	3285a5ec29	add status to Comment. /comments/pending and /comments/rejected ONLY return the respective comments	2017-01-12 12:16:13 -07:00
gaba	acf3ad5e28	Some conflicts were added.	2017-01-12 11:10:07 -08:00
gaba	873ec09f62	Merge branch 'master' into unique-username	2017-01-12 08:46:51 -08:00
Belen Curcio	3d65231db5	Progress	2017-01-12 13:27:37 -03:00
Belen Curcio	4a4affad70	More Design Tweaks	2017-01-12 09:16:23 -03:00
Belen Curcio	7101d99187	Merge branch 'master' of github.com:coralproject/talk into design-pass-adm	2017-01-12 08:09:55 -03:00
David Jay	11f18c23cb	Merge branch 'master' into users-bug-fix	2017-01-10 14:13:31 -05:00
Belen Curcio	3a510168d3	design progress	2017-01-10 16:12:15 -03:00
David Jay	d9147da8fc	Making user action item_type 'users' for consistency.	2017-01-10 13:59:36 -05:00
Belen Curcio	ca369dcb4a	Header version	2017-01-10 12:01:48 -03:00
Belen Curcio	a4e6638217	Tab bar, removing extra mdl js. It adds more events	2017-01-10 10:55:03 -03:00
Belen Curcio	be293a03de	Header	2017-01-09 19:17:21 -03:00
Belen Curcio	4f4ecd8dfb	header	2017-01-09 18:07:02 -03:00
riley	7bc848b801	make tests pass	2017-01-09 10:47:28 -07:00
Belen Curcio	1acc92a1f2	Header Changes	2017-01-09 12:45:41 -03:00
Riley Davis	a3bb8e2f41	remove logs. missed some errors	2017-01-06 13:11:37 -07:00