Commit Graph
382 Commits
Author SHA1 Message Date
Riley Davis a3f99f76e2 Merged branch master into admin-apollo 2017-02-08 13:42:37 -07:00
Gabriela Rodríguez BerónandGitHub f014338083 Merge branch 'master' into story-138524853-domain-whitelist 2017-02-07 15:38:09 -08:00
Belen Curcio a4d62f78f2 Apollo config ready 2017-02-07 20:10:18 -03:00
Gabriela Rodríguez BerónandGitHub 5b609ceb86 Merge branch 'master' into story-138524853-domain-whitelist 2017-02-07 14:20:48 -08:00
Wyatt Johnson 4e1891c068 Fixed install state. 2017-02-07 14:30:25 -07:00
gaba d08a9fb7b2 Front End for Domain Whitelist. 2017-02-07 13:07:22 -08:00
Belen Curcio a3e1bd972c Redirect if its initialized, funtionallity of finalStep 2017-02-07 17:44:27 -03:00
Wyatt JohnsonandGitHub 5cdfc7bd1b Merge branch 'master' into install-admin 2017-02-07 10:05:31 -07:00
Wyatt Johnson cdc81c4fc5 Added new setup endpoint 2017-02-07 10:02:23 -07:00
Wyatt Johnson f47638ae07 Removed provisioning text. 2017-02-07 09:45:43 -07:00
Belen Curcio 526f0145f1 if goTo is not defined 2017-02-07 02:06:32 -03:00
Belen Curcio 0b9956a842 Merge branch 'master' of github.com:coralproject/talk into install-admin 2017-02-07 00:16:51 -03:00
Belen Curcio e239926866 Failure check 2017-02-07 00:07:53 -03:00
Belen Curcio 3a953c7efe First Step 2017-02-06 23:23:08 -03:00
Belen Curcio 77f090fd3c Multiple validations 2017-02-06 23:18:14 -03:00
David JayandGitHub 652170735b Merge branch 'master' into username-ban 2017-02-06 18:14:13 -08:00
Belen Curcio 16f93a0a19 Validaiton 2017-02-06 22:41:21 -03:00
David JayandGitHub cb78e8d563 Merge branch 'master' into username-ban 2017-02-06 10:23:14 -08:00
Riley Davis e91ff306e9 whoops, missed one 2017-02-03 14:21:22 -07:00
David Jay d92c2d9744 Updating user queue routes. 2017-02-03 10:18:29 -08:00
Benjamin Goering 160fb6e4d4 Add async attribute to coral-embed scripts 2017-02-04 02:03:31 +08:00
Benjamin Goering 841d6add45 Rename /Coral.js to /embed.js 2017-02-04 01:48:57 +08:00
Benjamin Goering f7cddad659 Futureproof Embed Code
* Add client/coral-embed-api module. It's meant to be included in an HTML page and define window.Coral
* Serve coral-embed-api at /Coral.js
* Update / handler (article view) to use new embed format
* Update Talk Admin embed code section to use new embed format
2017-02-04 00:47:32 +08:00
Belen Curcio 80241025e5 linitin 2017-02-03 13:43:17 -03:00
Wyatt Johnson 2df980b560 Merge branch 'master' into install-admin 2017-02-02 10:34:17 -07:00
David Jay feb0860ba1 Merge branch 'master' of github.com:coralproject/talk into username-ban 2017-02-02 12:29:29 -05:00
David ErwinandGitHub 22e32b1869 Merge branch 'master' into hide-pending-sometimes 2017-02-02 10:16:53 -05:00
Wyatt JohnsonandGitHub bd86eef441 Merge branch 'master' into add-yarn 2017-02-02 08:02:06 -07:00
Belen Curcio 65aa5e7e92 Ádding Select, Options to Coral Ui and steps with formField 2017-02-02 11:31:43 -03:00
Belen Curcio ad8d92a8ea Merge branch 'master' of github.com:coralproject/talk into install-admin 2017-02-01 23:08:22 -03:00
David Jay 97c3ebc3e0 Whitelisting usernames once they have been approved. 2017-02-01 20:55:45 -05:00
David Jay 5831a6f927 Merge branch 'master' of github.com:coralproject/talk into username-ban 2017-02-01 20:00:54 -05:00
David Jay 7e907e18f2 Enabling canEditName when suspending user. 2017-02-01 16:19:42 -05:00
David Jay b2430eaf60 Adding displayname editing and appropriate toggle. 2017-02-01 15:55:33 -05:00
Riley Davis 22c0ed686f rename everything to Pre-Mod from Pending. hide the pre-mod tab sometimes. 2017-02-01 13:33:29 -07:00
Wyatt Johnson 7beb28e077 Updated documentation 2017-02-01 12:54:15 -07:00
Riley DavisandGitHub ec956165a3 Merge branch 'master' into bugfix-asset-search 2017-02-01 11:35:59 -07:00
Belen Curcio 7866d1f8cd Done Wizard mEnu 2017-02-01 15:17:15 -03:00
David Jay 37975574ea Switching rejected usernames from suspended to banned. 2017-02-01 12:26:01 -05:00
Belen Curcio 12070309d6 Wizard Nav 2017-02-01 12:11:15 -03:00
Belen Curcio 6a4315d608 Working Install Wizard 2017-02-01 10:49:16 -03:00
David Jay 7babb14bab Addressing bug in asset search. 2017-01-31 14:37:52 -05:00
Belen Curcio 890da0400f Steps 2017-01-31 16:31:29 -03:00
Riley Davis e63e1f3428 Merge branch 'master'
Conflicts:
	errors.js
	test/routes/api/auth/index.js
2017-01-31 12:05:16 -07:00
Riley Davis 5e521b832c add a confirm-email landing page 2017-01-27 15:04:42 -07:00
David JayandGitHub f09d9d0a8b Merge branch 'master' into e2e-env-fix 2017-01-27 14:10:59 -05:00
David Jay fcf22ef4f9 Adding selenium settings and fixing bug in moderation approval. 2017-01-27 14:07:34 -05:00
David Erwin c8c160a551 Remove avatar from user cards 2017-01-27 10:16:09 -05:00
David Jay b6d8a90084 Updating style of UserActions and moving ActionButton to its own component. 2017-01-26 16:36:43 -05:00
David Jay 06331d3c07 Updating bio moderation to graphQL architecture. 2017-01-26 15:31:15 -05:00