Commit Graph

1954 Commits

Author SHA1 Message Date
Wyatt Johnson c202042cda Revert "Revert "Adjusted circle""
This reverts commit 832d1f6763.
2017-02-09 18:04:31 -07:00
Wyatt Johnson 832d1f6763 Revert "Adjusted circle"
This reverts commit 229ddb11f2.
2017-02-09 18:02:25 -07:00
Wyatt Johnson 229ddb11f2 Adjusted circle 2017-02-09 17:37:39 -07:00
Wyatt Johnson 7db3da5fdd Added fix for facebook 2017-02-09 17:03:41 -07:00
Wyatt Johnson 3cd2b28bc2 Inital rename of displayName -> username 2017-02-09 16:48:59 -07:00
Wyatt Johnson 646f6040ac Merge pull request #291 from coralproject/recent-items
Added new recentComments, recentReplies
2017-02-09 14:24:04 -07:00
Wyatt Johnson 91e94e8400 Merge branch 'master' into recent-items 2017-02-09 14:11:03 -07:00
Gabriela Rodríguez Berón a825d29b60 Merge pull request #298 from coralproject/bugfix-9000
Bugfix 9000
2017-02-09 12:22:59 -08:00
David Erwin cd7d683fe2 Fixing for default url case 2017-02-09 15:16:02 -05:00
David Erwin 81e050214d fix js error 2017-02-09 15:03:29 -05:00
Riley Davis d4d1f088cd Merge branch 'master' into recent-items 2017-02-08 14:50:06 -07:00
Riley Davis ddc26f0cec Merge pull request #296 from coralproject/admin-apollo
Using GraphQL and Apollo in Talk Admin. [Don't Merge]
2017-02-08 14:17:09 -07:00
Riley Davis 0d141e7472 explicit return for clarity 2017-02-08 14:12:17 -07:00
Riley Davis a3f99f76e2 Merged branch master into admin-apollo 2017-02-08 13:42:37 -07:00
David Erwin 2352a21826 Merge pull request #295 from coralproject/story-138524853-domain-whitelist
Story 138524853 domain whitelist
2017-02-08 15:38:38 -05:00
Gabriela Rodríguez Berón f014338083 Merge branch 'master' into story-138524853-domain-whitelist 2017-02-07 15:38:09 -08:00
gaba 1176a94bec Update tests 2017-02-07 15:36:10 -08:00
Belen Curcio a4d62f78f2 Apollo config ready 2017-02-07 20:10:18 -03:00
Belén Curcio 604a3a42b9 Merge pull request #293 from coralproject/install-admin
Install Talk
2017-02-07 19:43:37 -03:00
Gabriela Rodríguez Berón 5b609ceb86 Merge branch 'master' into story-138524853-domain-whitelist 2017-02-07 14:20:48 -08:00
gaba 3effd11ad2 Adding test. 2017-02-07 13:57:46 -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 fd40135f1b Merge branch 'master' of github.com:coralproject/talk into install-admin 2017-02-07 17:46:45 -03:00
Belen Curcio a3e1bd972c Redirect if its initialized, funtionallity of finalStep 2017-02-07 17:44:27 -03:00
David Erwin f188df162c Merge pull request #294 from coralproject/wrong-error-proptype
fix a warning in the console when you're signed out
2017-02-07 13:02:18 -05:00
David Erwin fcd431dc21 Merge branch 'master' into wrong-error-proptype 2017-02-07 12:51:20 -05:00
Riley Davis ca2c55f643 Merge pull request #292 from coralproject/bugfix-tiny-mobile-fonts
Fixing mobile viewport width.
2017-02-07 10:50:30 -07:00
Riley Davis 9d3960fd7b fix a warning in the console when you're signed out 2017-02-07 10:37:38 -07:00
Wyatt Johnson 5cdfc7bd1b Merge branch 'master' into install-admin 2017-02-07 10:05:31 -07:00
Riley Davis cd3d08c6f9 Merge branch 'master' into bugfix-tiny-mobile-fonts 2017-02-07 10:05:20 -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
Kim Gardner ba450a0166 Merge pull request #283 from coralproject/username-ban
Username banning flow
2017-02-06 23:04:43 -05: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
David Jay 586537084b Merge branch 'master' into bugfix-tiny-mobile-fonts 2017-02-06 18:29:34 -08: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 Jay 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
Kim Gardner f19e0134db Merge pull request #286 from coralproject/more-email-verify
Cleanup on email verification
2017-02-06 20:26:07 -05:00
David Jay ecb72b036d Fixing mobile viewport width. 2017-02-06 16:49:31 -08:00
David Jay 80ea100fc5 Making username update services atomic. 2017-02-06 15:49:48 -08:00
Riley Davis 8c8a8eb3b8 define more propTypes. add a second button so tests work 2017-02-06 16:23:00 -07:00
gaba d93dfe55af Merge branch 'master' into story-138524853-domain-whitelist 2017-02-06 14:53:46 -08:00
David Jay b22895b908 Switching displayname update to account endpoint. 2017-02-06 14:38:14 -08:00
Riley Davis fe6d6f611d pause suddenly not a function? 2017-02-06 14:59:23 -07:00
Riley Davis 93ee5bfc4a just throwing stuff at the wall to see what sticks 2017-02-06 14:42:40 -07:00