 gaba
|
423cb3cade
|
Merge branch 'master' into i18n-refactor
|
2017-05-15 14:02:34 -07:00 |
|
|
Kim Gardner
|
297dee6da8
|
Merge pull request #587 from coralproject/edit-changes
Edit Consistency
|
2017-05-15 16:47:33 -04:00 |
|
|
gaba
|
54e103b55a
|
Change a few translations that had wrong key.
|
2017-05-15 13:44:46 -07:00 |
|
|
Belen Curcio
|
2b7f545c2d
|
lint
|
2017-05-15 17:31:53 -03:00 |
|
|
gaba
|
0ead2cb610
|
Adds sign in translations.
|
2017-05-15 13:25:09 -07:00 |
|
|
Belen Curcio
|
b789a8e107
|
Removing kiwis fix since this was fixed in auth tokens branch
|
2017-05-15 17:23:57 -03:00 |
|
|
Belen Curcio
|
b2e5c0452a
|
The merge conficts
|
2017-05-15 17:13:48 -03:00 |
|
|
gaba
|
f32eac4eab
|
Lint YAML and notations
|
2017-05-15 12:53:28 -07:00 |
|
|
Belén Curcio
|
afa3123829
|
Merge pull request #578 from coralproject/auth-tokens
JWT Auth
|
2017-05-15 16:51:10 -03:00 |
|
|
Wyatt Johnson
|
5aca83993b
|
fixed build process
|
2017-05-15 13:35:51 -06:00 |
|
|
Wyatt Johnson
|
8ff0c3db51
|
Merge branch 'auth-tokens' of github.com:coralproject/talk into auth-tokens
|
2017-05-15 13:14:10 -06:00 |
|
|
Chi Vinh Le
|
74e1436ae4
|
Use correct error key
|
2017-05-16 01:09:33 +07:00 |
|
|
Chi Vinh Le
|
def35f0a93
|
Fix login issues
|
2017-05-16 00:55:12 +07:00 |
|
|
Chi Vinh Le
|
06001763ff
|
Remove unused files
|
2017-05-16 00:52:37 +07:00 |
|
|
Belen Curcio
|
75aa8d79df
|
linting
|
2017-05-15 14:50:26 -03:00 |
|
|
Belen Curcio
|
843c3a16c8
|
Admin share same network interface, and unifying actions
|
2017-05-15 14:48:12 -03:00 |
|
|
Kiwi
|
963827204e
|
Merge branch 'master' into edit-changes
|
2017-05-15 23:22:30 +07:00 |
|
|
Belen Curcio
|
4e86e4197c
|
handling logout
|
2017-05-15 13:13:28 -03:00 |
|
|
Belen Curcio
|
5dae7bf4ac
|
Merge branch 'master' of github.com:coralproject/talk into auth-tokens
|
2017-05-15 13:12:11 -03:00 |
|
|
Belen Curcio
|
48370db09a
|
Merge branch 'auth-tokens' of github.com:coralproject/talk into auth-tokens
|
2017-05-15 13:11:32 -03:00 |
|
|
Wyatt Johnson
|
9bee31198e
|
Added logout routes
|
2017-05-15 10:03:09 -06:00 |
|
|
Kim Gardner
|
2a95c1eee2
|
Merge pull request #583 from coralproject/hooks-docs
[DOCS] - Hooks and Reactions
|
2017-05-15 11:55:41 -04:00 |
|
|
Belen Curcio
|
57ced201eb
|
WebStorage events
|
2017-05-15 12:52:54 -03:00 |
|
|
Belen Curcio
|
370cdf8c09
|
Ádding middlewares to our network interface
|
2017-05-15 12:51:07 -03:00 |
|
|
Kim Gardner
|
cb64d599fe
|
Merge branch 'master' into hooks-docs
|
2017-05-15 11:50:46 -04:00 |
|
|
gaba
|
b31212f847
|
Second run of notation change for translations.
|
2017-05-15 08:35:55 -07:00 |
|
|
Belen Curcio
|
292f758ac9
|
Comment history relies on authtokens
|
2017-05-15 12:17:30 -03:00 |
|
|
Belen Curcio
|
76b96a66a2
|
Adding Bearer token to the Graph Client
|
2017-05-15 11:41:36 -03:00 |
|
|
gaba
|
633086cfa3
|
Fix a few more strings and translations.
|
2017-05-15 07:11:11 -07:00 |
|
|
Belen Curcio
|
8754ade5a4
|
merge
|
2017-05-12 21:52:29 -03:00 |
|
|
Wyatt Johnson
|
e218de811b
|
removed csrf reference
|
2017-05-12 15:53:25 -06:00 |
|
|
Wyatt Johnson
|
9403280c56
|
Merge branch 'master' into edit-changes
|
2017-05-12 15:44:19 -06:00 |
|
|
Belen Curcio
|
964cc362e7
|
Login, logout with tokens. WIP
|
2017-05-12 18:26:24 -03:00 |
|
|
Wyatt Johnson
|
a5c9a8e4b0
|
cleaned up graph, standardised mutation
|
2017-05-12 14:04:09 -06:00 |
|
|
David Erwin
|
7c5e04e820
|
Merge pull request #584 from coralproject/prevent-empty-edit
Prevent empty edit on the Front-End
|
2017-05-12 15:44:14 -04:00 |
|
|
Belen Curcio
|
7fd5509490
|
Prettier
|
2017-05-12 15:48:19 -03:00 |
|
|
Belen Curcio
|
5e8a02c461
|
Removing CSRF
|
2017-05-12 15:40:53 -03:00 |
|
|
Wyatt Johnson
|
ffd96f57e9
|
Comment too short fixes
|
2017-05-12 11:16:52 -06:00 |
|
|
Wyatt Johnson
|
e3017efebf
|
Front end edits to accomedate ignoredUsers
|
2017-05-12 10:25:59 -06:00 |
|
|
Wyatt Johnson
|
ed27209de9
|
More edit changes
|
2017-05-12 10:09:25 -06:00 |
|
|
Chi Vinh Le
|
072437b0fd
|
Prevent empty edit
|
2017-05-12 22:45:33 +07:00 |
|
|
Belen Curcio
|
674ac50035
|
Ádding reaction docs
|
2017-05-12 12:29:02 -03:00 |
|
|
Belen Curcio
|
0eb88b30eb
|
Merge branch 'master' of github.com:coralproject/talk into hooks-docs
|
2017-05-12 12:19:26 -03:00 |
|
|
Wyatt Johnson
|
f4dfb21e15
|
reverted pagination work
|
2017-05-12 09:14:25 -06:00 |
|
|
Belen Curcio
|
e5a4fbc1cd
|
DOCS Hooks
|
2017-05-12 12:07:55 -03:00 |
|
|
David Erwin
|
ce583142ef
|
Merge pull request #567 from coralproject/query-mutation-api
Extendable GraphQL framework
|
2017-05-12 09:43:50 -04:00 |
|
|
Chi Vinh Le
|
95a7a1ca47
|
Rename registry
|
2017-05-12 20:15:04 +07:00 |
|
|
Chi Vinh Le
|
7857cadef5
|
Merge branch 'master' into query-mutation-api
Conflicts:
client/coral-embed-stream/src/components/Comment.js
client/coral-embed-stream/src/containers/Embed.js
client/coral-embed-stream/src/containers/Stream.js
client/coral-embed-stream/src/index.js
client/coral-framework/graphql/fragments/commentView.graphql
client/coral-framework/graphql/mutations/index.js
client/coral-framework/hocs/index.js
client/coral-framework/hocs/withFragments.js
|
2017-05-12 19:50:36 +07:00 |
|
|
Wyatt Johnson
|
47186c4eac
|
some changes to loaders
|
2017-05-11 17:52:07 -06:00 |
|
|
Wyatt Johnson
|
ae5da93730
|
linting fixes
|
2017-05-11 17:44:51 -06:00 |
|