8775 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Belen Curcio	e751d91794	typo	2016-12-06 14:21:02 -03:00
Belen Curcio	8036b4790d	Notifications	2016-12-06 14:09:36 -03:00
Wyatt Johnson	5298efa89f	Adjusting based on PR feedback, added public filter to settings object	2016-12-06 11:55:15 -05:00
Wyatt JohnsonandGitHub	d2d4640eee	Merge branch 'master' into status-history	2016-12-06 11:08:00 -05:00
Belen Curcio	623c32a002	Configure Stream Ready, Checkbox Coral UI	2016-12-06 12:18:29 -03:00
David JayandGitHub	3562d9f235	Merge branch 'master' into wordlist	2016-12-05 17:44:23 -05:00
Belén CurcioandGitHub	c7108b7fed	Merge pull request #91 from coralproject/stream-e2e ... Embed stream end to end testing	2016-12-05 19:39:14 -03:00
David Jay	ab43d1f0ac	Showing first set of options in menu.	2016-12-05 17:38:13 -05:00
Belén CurcioandGitHub	67aa261a56	Merge branch 'master' into stream-e2e	2016-12-05 19:34:57 -03:00
Belén CurcioandGitHub	e644b68f66	Merge pull request #127 from coralproject/close-comments ... Adds the ability to close and open comments on an asset	2016-12-05 19:33:05 -03: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	568e46f1e3	Added restricted wrapper	2016-12-05 17:02:21 -05:00
Dan Zajdband	62cc489c21	Merge with master	2016-12-05 16:39:00 -05:00
David Jay	a9bc90619d	Adding popup on report button click.	2016-12-05 15:59:16 -05:00
Wyatt Johnson	91efa60b55	Fixed linting error	2016-12-05 14:20:47 -05:00
Wyatt Johnson	d1cdc48e85	Merge branch 'master' into status-history	2016-12-05 14:20:31 -05:00
Wyatt Johnson	40fd5984a9	Added "assigned_by" to status changes	2016-12-05 13:49:12 -05:00
David JayandGitHub	9c19cabf3e	Merge branch 'master' into i18n-var	2016-12-05 12:43:40 -05:00
David JayandGitHub	7c02ece881	Merge branch 'master' into stream-e2e	2016-12-05 12:42:26 -05:00
Wyatt Johnson	2f7f0249b2	Added status changing + history ... - Status's for comments is now an array of objects	2016-12-05 11:28:27 -05:00
Dan Zajdband	95ec57c64d	Added default message on thread	2016-12-05 11:11:21 -05:00
Dan Zajdband	4be258c63d	Added simple open/close flow	2016-12-05 11:02:39 -05:00
Kim GardnerandGitHub	bd30b41d3b	Merge branch 'master' into wordlist	2016-12-04 01:03:19 -05:00
Kim GardnerandGitHub	51c29e0c31	Merge branch 'master' into like-login-prompt	2016-12-04 00:59:39 -05:00
Kim GardnerandGitHub	d85d15a55a	Merge pull request #84 from coralproject/guides ... Add CONTRIBUTING.md first draft	2016-12-04 00:59:08 -05:00
Kim GardnerandGitHub	e528e0678f	Merge branch 'master' into stream-e2e	2016-12-04 00:49:27 -05:00
Kim GardnerandGitHub	ea604d54ac	Merge branch 'master' into like-login-prompt	2016-12-04 00:48:50 -05:00
Kim GardnerandGitHub	2f965f2009	Merge branch 'master' into guides	2016-12-04 00:47:32 -05:00
gaba	3463e09cab	Setting the showuserdialog in the reducer for comments.	2016-12-02 17:05:23 -08:00
gaba	eb916099bd	Merge	2016-12-02 16:52:16 -08:00
gaba	60d4793111	Adds a variable to the possible translations.	2016-12-02 16:12:24 -08:00
gaba	07e3a935ab	Show the Dialog.	2016-12-02 16:03:19 -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
David ErwinandGitHub	e6a32c91a2	Merge branch 'master' into wordlist	2016-12-02 16:02:44 -05:00
David ErwinandGitHub	6990600c10	Merge pull request #124 from coralproject/like-login-prompt ... Like/Flag Login Prompt	2016-12-02 16:02:34 -05:00
David ErwinandGitHub	f2273f1698	Merge branch 'master' into like-login-prompt	2016-12-02 15:58:54 -05:00
David ErwinandGitHub	9f9e80e647	Merge pull request #123 from coralproject/info-box-fix ... Info box fix	2016-12-02 15:50:40 -05:00
David Jay	0eca9eeadc	Prompting login when a loggout out user likes or comments.	2016-12-02 15:45:26 -05:00
David Jay	c387df55f3	Removing .env-test	2016-12-02 12:52:43 -05:00
David Jay	b1d0f8443f	Updating infobox styling.	2016-12-02 12:47:18 -05:00
David Jay	8dad90104d	Returning infobox data in stream.	2016-12-02 12:26:31 -05:00
David Jay	94dd79b6a7	Updating test db logic.	2016-12-02 12:03:25 -05:00
gaba	1cda5b9099	Restrict content in the comment stream when banned.	2016-12-02 08:00:26 -08:00
gaba	da7f39c9e9	Merge branch 'master' into ban-user	2016-12-02 07:58:46 -08:00
gaba	29f547d268	Trying to fix ban user dialog.	2016-12-02 06:35:55 -08:00
David Jay	0e75319c04	Moving banned wordlist text to translations.	2016-12-01 21:49:55 -05: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