gaba
71fcf9cd3f
FE for the Staff Tag. Modifed typedfs graphql.
2017-02-10 10:20:34 -08:00
gaba
10937cf717
Tag.name as string. Debuging comment.tag in Embed stream.
2017-02-09 15:28:09 -08:00
gaba
3be4fea8ad
Merge branch 'master' into story-137818425-tag-staff
2017-02-09 12:32:26 -08:00
gaba
1c26e64c71
Adds Tags to the graphql.
2017-02-09 12:23:40 -08:00
gaba
f2341ca9d3
Adds tag label plugin.
2017-02-09 09:17:56 -08: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
Gabriela Rodríguez Berón
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ón
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
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
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
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 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
Riley Davis
8c8a8eb3b8
define more propTypes. add a second button so tests work
2017-02-06 16:23:00 -07:00
David Jay
b22895b908
Switching displayname update to account endpoint.
2017-02-06 14:38:14 -08:00
David Jay
1901592780
Switching displayname edit after facebook auth to account endpoint.
2017-02-06 11:07:35 -08:00
David Jay
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
Riley Davis
a0c03605b9
Merge branch 'master'
...
Conflicts:
client/coral-embed-stream/src/Embed.js
client/coral-framework/constants/auth.js
client/coral-framework/reducers/auth.js
client/coral-sign-in/components/SignUpContent.js
2017-02-03 13:12:32 -07:00
Riley Davis
3441ec36c6
re-direct to sign in when email verification is off. add proptypes
2017-02-03 12:50:01 -07:00
Benjamin Goering
5614b9781e
Merge branch 'master' into 20170203_futureproof_embed_code
2017-02-04 03:31:33 +08:00
Benjamin Goering
838e2a66e3
trivial change to trigger CircleCI (wyatt asked me to)
2017-02-04 02:35:58 +08:00
David Jay
2dacb72341
Updating reload code.
2017-02-03 10:27:17 -08:00
Benjamin Goering
1e8a363205
remove use of template strings in coral-embed script as some browsers will throw exceptions on them
2017-02-04 02:18:54 +08:00
David Jay
d92c2d9744
Updating user queue routes.
2017-02-03 10:18:29 -08:00
Benjamin Goering
bbdd9f22c1
re-copypaste pym.js into coral-embed, as eslint-fix had changed it to use template strings
2017-02-04 02:11:59 +08:00
Benjamin Goering
160fb6e4d4
Add async attribute to coral-embed scripts
2017-02-04 02:03:31 +08:00
Riley Davis
8f374852ac
hide social stuff after sign up
2017-02-03 10:49:52 -07:00
Benjamin Goering
841d6add45
Rename /Coral.js to /embed.js
2017-02-04 01:48:57 +08:00
Benjamin Goering
b9c918eb88
Add pym.js LICENSE to coral-embed
2017-02-04 01:29:24 +08:00
Riley Davis
5c365b1a79
YOU. SHALL. NOT. PASS
2017-02-03 10:19:56 -07:00
Benjamin Goering
f1010462ec
Dont' use const/let in coral-embed so it works in all browsers
2017-02-04 01:19:47 +08:00
Riley Davis
c4b934a542
whoops. commited to the wrong branch
2017-02-03 10:19:18 -07:00
Riley Davis
a6f7cf258b
attempt to make e2e tests pass
2017-02-03 10:15:51 -07:00
Benjamin Goering
fb60b088b3
Rename coral-embd-api to coral-embed
2017-02-04 01:15:35 +08:00
Benjamin Goering
e376e19c2c
remove console.log from coral-embed-api
2017-02-04 01:00:46 +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