136 Commits

Author	SHA1	Message	Date
David Jay	409c9c3eb5	Merge branch 'master' into fix-signup-bug	2016-12-12 15:56:26 -05:00
David Jay	cb576dca8f	Updating signup endpoint to reflect current api.	2016-12-12 15:52:34 -05:00
Belen Curcio	a872128a55	logOut Stae	2016-12-11 22:52:47 -03:00
David Jay	d229d5a96f	Updating route to davidjay.	2016-12-09 19:28:19 -05:00
David Jay	f5ac576187	Merge branch 'master' of github.com:coralproject/talk into flag-username	2016-12-09 16:33:06 -05:00
David Jay	90ef16e111	Merge branch 'master' of github.com:coralproject/talk into flag-username	2016-12-09 15:51:13 -05:00
Gabriela Rodríguez Berón	f29c0a3a09	Merge branch 'master' into ban-user	2016-12-09 10:43:55 -10:00
Gabriela Rodríguez Berón	ba169147e7	Merge branch 'master' into ban-user	2016-12-09 10:28:32 -10:00
Gabriela Rodríguez Berón	1fefd3c8b4	Merge branch 'master' into wordlist	2016-12-09 10:26:39 -10:00
gaba	15557c16e2	Merge branch 'master' into ban-user	2016-12-09 08:28:46 -10:00
David Jay	bf01543a88	Merge branch 'master' of github.com:coralproject/talk into flag-username	2016-12-09 13:26:48 -05:00
David Jay	e032a5521e	Merge branch 'master' of github.com:coralproject/talk into wordlist	2016-12-09 13:05:11 -05:00
Belen Curcio	3ef8f295c3	newConfig update	2016-12-09 12:59:17 -03:00
Dan Zajdband	09ba535d68	Merge with master	2016-12-09 10:17:55 -05:00
Belen Curcio	acbd465636	merge	2016-12-08 16:37:11 -03:00
David Jay	b3d84d724f	Merge branch 'master' of github.com:coralproject/talk into flag-username	2016-12-08 14:36:02 -05:00
David Jay	fc96c1ee91	Compressing variables from postAction into single object.	2016-12-08 14:27:31 -05:00
gaba	50afa3d190	Merge branch 'master' into ban-user	2016-12-08 09:22:22 -10:00
Belen Curcio	74e4771e17	new config	2016-12-08 16:21:07 -03:00
Riley Davis	be2d9838e6	Merge branch 'master' into wordlist	2016-12-08 09:13:48 -10:00
David Jay	e91564f706	Merge branch 'master' of github.com:coralproject/talk into like-login-prompt	2016-12-08 13:49:15 -05:00
Dan Zajdband	fb392422ea	Added textarea for closed message on admin	2016-12-08 12:44:02 -05:00
David Jay	6fc3f00175	Merge branch 'master' of github.com:coralproject/talk into flag-username	2016-12-07 22:21:50 -05:00
David Jay	dd85fbb3e0	Adding other field.	2016-12-07 22:16:41 -05:00
gaba	23c67b4a49	It fix the status change after merging master in.	2016-12-07 16:37:11 -10:00
Riley Davis	6247510cd7	Merge branch 'master' into wordlist	2016-12-07 16:15:23 -10:00
David Jay	18f7b07198	Addressing setting bug caused by open thread feature.	2016-12-07 21:12:31 -05:00
David Jay	713cc0cda1	Posting actions to comment and user endpoints.	2016-12-07 19:01:02 -05:00
Riley Davis	f2ded3f2a7	replace things multiple times	2016-12-06 14:34:27 -10:00
Riley Davis	31c87cb93f	make the translation function accept n arguments. ninja bugfix to permalink	2016-12-06 14:17:01 -10:00
Riley Davis	f2c751f9f0	Merge branch 'master' into i18n-var	2016-12-06 13:41:44 -10:00
David Jay	507e89a301	Merge branch 'master' of github.com:coralproject/talk into flag-username	2016-12-06 18:19:45 -05:00
David Jay	13d0dec84a	Updating postAction to send reasons to backend.	2016-12-06 18:11:44 -05:00
Belen Curcio	e751d91794	typo	2016-12-06 14:21:02 -03:00
Belen Curcio	8036b4790d	Notifications	2016-12-06 14:09:36 -03:00
Belen Curcio	623c32a002	Configure Stream Ready, Checkbox Coral UI	2016-12-06 12:18:29 -03:00
David Jay	3562d9f235	Merge branch 'master' into wordlist	2016-12-05 17:44:23 -05:00
Belen Curcio	08e232c4fe	User Should still be able to see sign info even if its closed // moving comp	2016-12-05 19:28:47 -03:00
Belen Curcio	03b6ec4fe4	Lint	2016-12-05 19:18:29 -03:00
Dan Zajdband	62cc489c21	Merge with master	2016-12-05 16:39:00 -05:00
Dan Zajdband	4be258c63d	Added simple open/close flow	2016-12-05 11:02:39 -05:00
gaba	60d4793111	Adds a variable to the possible translations.	2016-12-02 16:12:24 -08:00
gaba	d12693ae47	Adds a variable to the translation.	2016-12-02 16:02:50 -08:00
David Jay	ead66520e2	Adjusting height of login button to match current comment.	2016-12-02 17:01:06 -05:00
gaba	1cda5b9099	Restrict content in the comment stream when banned.	2016-12-02 08:00:26 -08:00
David Jay	b5b0cd9b12	Adding banned word notification on post.	2016-12-01 21:32:08 -05:00
David Jay	2cb439ccf8	Reloading banned word list from settings.	2016-12-01 21:12:13 -05:00
Belen Curcio	990782a542	Sign in a restricted rout	2016-12-01 11:17:07 -03:00
Belen Curcio	c38c556002	merge	2016-11-30 20:11:22 -03:00
Belen Curcio	d90a158298	Bio Tooltips	2016-11-30 17:09:34 -03:00