302 Commits

Author	SHA1	Message	Date
Belen Curcio	3640a93a2f	Changes	2017-01-17 16:25:47 -03:00
Belen Curcio	6d826e9115	Working Stream	2017-01-17 12:47:06 -03:00
Gabriela Rodríguez Berón	4f013c50e6	Merge branch 'master' into bugfix-flagged-actions	2017-01-13 15:05:54 -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
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
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
Belen Curcio	ce01389809	Ádding Icon to Coral UI Button	2017-01-12 18:20:42 -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
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
Belen Curcio	3a510168d3	design progress	2017-01-10 16:12:15 -03: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
Gabriela Rodríguez Berón	1e445efaec	Merge branch 'master' into issue-191	2017-01-06 13:33:25 -03:00
Wyatt Johnson	4eb7c72ae2	Merge branch 'master' into email-confirm	2017-01-05 18:45:06 -07:00
gaba	ab825512b9	Adding missing translation. Not sure how to translate streams.	2017-01-04 16:46:19 -03:00
Riley Davis	12f6bb1ffe	fetch settings on mod queue load	2017-01-04 11:14:23 -07:00
gaba	7b9dbb5afd	Review changes.	2017-01-04 12:24:01 -03:00
gaba	e2a032d4a5	Merge branch 'master' into csrf	2017-01-03 16:25:05 -03:00
gaba	950340d5e7	Fix lint.	2017-01-03 15:18:39 -03:00
Riley Davis	a1def6f950	missing state for the wordlist.	2017-01-03 10:33:25 -07:00
Dan Zajdband	759e74a88d	coral-admin: Fixed check for component unmount removing a listener when there is no object	2017-01-03 10:46:55 -03:00
gaba	111e83a1e6	Removes plugin csrf	2017-01-03 08:41:28 -03:00
gaba	8e5e75ed6f	It works for user signin/signup and posting comments.	2016-12-23 14:57:39 -08:00
gaba	6892ef85f8	Sending the CSRF to the POST request.	2016-12-23 13:56:42 -08:00
Kim Gardner	ac66a7bb0e	Merge branch 'master' into csrf	2016-12-23 16:12:53 -05:00
gaba	8e6aa23d32	More CSRF in front-end.	2016-12-23 13:07:16 -08:00
Belen Curcio	8d992f7809	merg	2016-12-23 16:13:36 -03:00
Belen Curcio	168248f975	Presentational and Container Components added	2016-12-23 16:09:46 -03:00
gaba	ec3e9d1cd4	Merge branch 'master' into csrf	2016-12-22 14:23:01 -08:00
gaba	54d0096dd1	More CSRF in forms.	2016-12-22 14:17:09 -08:00
Riley Davis	1239141eb9	use setIn to simplify	2016-12-22 14:11:04 -07:00
Riley Davis	a9a9ebdfd9	normalize constant names	2016-12-22 13:53:42 -07:00
Riley Davis	9d1d109ec0	Merge branch 'master' ... Conflicts: client/coral-admin/src/reducers/index.js	2016-12-22 12:28:55 -07:00
Riley Davis	6cca99e75e	Merge branch 'master' into map-dispatch-mod-queue	2016-12-22 12:25:51 -07:00
David Jay	fdf5da56cf	Merge branch 'admin-asset-list' of github.com:coralproject/talk into admin-asset-list	2016-12-21 18:11:51 -08:00
David Jay	0fc3e09c74	Removing unused log statement and combining setState functions.	2016-12-21 18:08:57 -08:00