wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-11 14:25:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,354 Commits 10 Branches 125 Tags
096c9a4894de18713eb0a2e2de5b84a82b7d4152
Commit Graph

8354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Gardner 95e770aff8 Merge pull request #588 from coralproject/fix 
Fix for FB login.
 2017-05-15 22:57:30 -04: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 4b6e562492 Missing "" to send strings instead of objects 2017-05-15 23:22:36 -03:00
gaba 35c941d4d0 Add missing translations from commentbox. 2017-05-15 16:17:53 -07:00
gaba 61856c3cf6 Use timeago. 2017-05-15 16:04:10 -07:00
riley 4d3788e4c9 saving my place so i dont have too many threads 2017-05-15 16:25:32 -06:00
Wyatt Johnson 50db2d1dda Initial merge of trust functionality 2017-05-15 15:28:57 -06:00
gaba c0c6dd6252 The merge got back some code to the coral-framework. 2017-05-15 14:23:56 -07:00
Belen Curcio c59346eb0a tags, and assignedby nul 2017-05-15 18:13:45 -03:00
Belen Curcio d02412a734 Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags 2017-05-15 18:11:30 -03:00
Belen Curcio c3d02a14a0 Updated queries and hasRoles 2017-05-15 18:11:14 -03:00
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
Belén Curcio 820ffb14c1 Merge branch 'master' into 142993479-tags 2017-05-15 16:55:47 -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
Belén Curcio 3eea5e1a8a Merge branch 'master' into 142993479-tags 2017-05-15 14:53:54 -03: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
Chi Vinh Le a9207428fe Calculate "until" 2017-05-15 23:07:46 +07: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
Chi Vinh Le 63fa3c4de7 Implement suspend user components 2017-05-15 22:28:04 +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