Commit Graph

221 Commits

Author SHA1 Message Date
Chi Vinh Le 81f51b69ec Clear token before dispatching logout action 2017-05-16 17:13:19 +07:00
Belen Curcio d3252b8c87 Done :) 2017-05-15 23:47:29 -03:00
Belen Curcio 1eada688fe Prettier 2017-05-15 23:23:22 -03:00
Belen Curcio 2b7f545c2d lint 2017-05-15 17:31:53 -03: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
Chi Vinh Le def35f0a93 Fix login issues 2017-05-16 00:55:12 +07:00
Belen Curcio 843c3a16c8 Admin share same network interface, and unifying actions 2017-05-15 14:48:12 -03:00
Belen Curcio 4e86e4197c handling logout 2017-05-15 13:13:28 -03:00
Belen Curcio 292f758ac9 Comment history relies on authtokens 2017-05-15 12:17:30 -03:00
Belen Curcio 8754ade5a4 merge 2017-05-12 21:52:29 -03:00
Belen Curcio 964cc362e7 Login, logout with tokens. WIP 2017-05-12 18:26:24 -03:00
Belen Curcio 7fd5509490 Prettier 2017-05-12 15:48:19 -03:00
Wyatt Johnson ae5da93730 linting fixes 2017-05-11 17:44:51 -06:00
Kim Gardner 3bb994c562 Merge branch 'master' into profanity-verbiage 2017-04-27 11:35:47 -04:00
Chi Vinh Le 794cc0fc6c Support login on all IOS browsers 2017-04-27 19:28:54 +07:00
Riley Davis a793d63f65 Merge branch 'master' into profanity-verbiage 2017-04-26 11:45:20 -06:00
Riley Davis ccc512cddd if there is no available translation, do not show error.whatever in the UI 2017-04-26 11:43:34 -06:00
Chi Vinh Le 4dc3b0c2f4 Merge branch 'master' into query-composition-2
Conflicts:
	client/coral-embed-stream/src/Embed.js
	client/coral-embed-stream/src/components/Comment.js
	client/coral-embed-stream/src/index.js
	client/coral-framework/services/store.js
	client/coral-settings/containers/ProfileContainer.js
	graph/resolvers/root_query.js
2017-04-24 15:24:34 +07:00
Chi Vinh Le 4519a550a2 Fix fresh login on profile 2017-04-21 02:27:26 +07:00
Chi Vinh Le 8fc2d5e8aa Merge branch 'login-popup' of ssh://github.com/coralproject/talk into login-popup 2017-04-21 00:54:45 +07:00
Chi Vinh Le f3f1cc53fe Fix safari popup resizing 2017-04-21 00:27:26 +07:00
Belen Curcio c9207fd620 Merge branch 'login-popup' of github.com:coralproject/talk into login-popup 2017-04-20 14:19:04 -03:00
Belen Curcio 09cb518049 Merge branch 'master' of github.com:coralproject/talk into login-popup 2017-04-20 14:18:40 -03:00
Chi Vinh Le 5b7750f7a5 Reuse same store and action flows 2017-04-20 23:48:30 +07:00
Chi Vinh Le b12d4ef4a2 WIP 2017-04-20 21:30:24 +07:00
Chi Vinh Le 348c01ae80 Fix linting errors 2017-04-20 20:58:45 +07:00
Belen Curcio 6155a46e71 Sign up popup 2017-04-19 18:10:09 -03:00
Belen Curcio 13965e1111 Adding actions, routes and login popup 2017-04-19 17:04:49 -03:00
Chi Vinh Le 6fb2a95bf2 Move query logic to coral-embed-stream 2017-04-19 20:28:14 +07:00
Chi Vinh Le d5d424bfc5 Merge branch 'master' into embed-refactor 2017-04-19 16:16:14 +07:00
Chi Vinh Le 4ce4c74fd9 Return a value for notification actions 2017-04-19 01:09:59 +07:00
Chi Vinh Le af5be0469f Refactor embed 2017-04-18 23:20:39 +07:00
Belen Curcio 93ca0bf79d fixed flash messages 2017-04-11 16:14:02 -03:00
Chi Vinh Le e92fdc97bb Refetch Me after facebook login 2017-04-06 22:49:20 +07:00
Chi Vinh Le b0effe8731 Merge with 'master' 2017-04-06 01:26:48 +07:00
Chi Vinh Le 582f799b6c Revert "Merge"
This reverts commit d9835a17d3, reversing
changes made to 18d6846f4e.
2017-04-06 00:53:21 +07:00
Belen Curcio d9835a17d3 Merge 2017-04-05 12:08:07 -03:00
Chi Vinh Le b3d1053fd7 Get rid of plugin actions in the framework 2017-04-05 18:57:12 +07:00
Chi Vinh Le f6a5d9f721 Remove context for plugins 2017-04-05 18:46:54 +07:00
Chi Vinh Le 62c4072631 Lazy load all plugin parts 2017-04-03 14:25:06 +07:00
Chi Vinh Le 5a5f1bc508 Refractor plugins helper 2017-04-01 00:48:59 +07:00
Belen Curcio 1bb3ed2399 importer renamed, and properties changed 2017-03-30 14:52:17 -03:00
Belen Curcio cfb28c4c2a Merge 2017-03-29 16:42:59 -03:00
Belen Curcio 520392829b Stable Version with reducers and actions 2017-03-29 14:45:59 -03:00
Riley Davis e75663f5b9 Merge branch 'master' into change-permalink-behavior 2017-03-28 14:31:53 -06:00
Riley Davis 4e60689fa4 view a permalink thread in isolation 2017-03-28 14:31:43 -06:00
gaba a6fa9a22c3 It refresh the page after editing name. 2017-03-24 13:57:10 -07:00
Riley Davis 67e04bf156 Merge branch 'master' into reset-password-redirect 2017-03-23 10:29:05 -06:00
Riley Davis fb2f8ef074 redirect to the parent url when resetting your password 2017-03-22 16:49:34 -06:00