wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-06 05:17:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,345 Commits 10 Branches 125 Tags
74d38f16edccf3104e4952c26fcefcb94dea7445
Commit Graph

4030 Commits

Author SHA1 Message Date
Chi Vinh Le 8ae497366b Move locales to top level 2017-05-24 00:28:47 +07:00
Chi Vinh Le 48bef95a4d Simplify yaml loading 2017-05-24 00:26:55 +07:00
gaba adacafb586 Removed extra string. 2017-05-23 12:59:06 -04:00
gaba 259b24faaa A few strings where using -. 2017-05-23 12:53:48 -04:00
gaba a184837ff8 Goes back to load all translations... 2017-05-23 12:46:53 -04:00
riley ec03c6b48c merge master 2017-05-22 13:10:43 -06:00
Chi Vinh Le 947ea66a77 Remove obsolete errors checking 2017-05-22 20:25:24 +07:00
Chi Vinh Le d1307eb5cd Handle response errors in the graphql framework 2017-05-22 20:11:16 +07:00
Belen Curcio 8266c65043 Merge Conflicts 2017-05-22 09:39:04 -03:00
Belen Curcio 317f7134f2 linting 2017-05-22 09:03:10 -03:00
Belen Curcio 9936b6ec47 Prettier 2017-05-22 08:59:34 -03:00
Belen Curcio 1d96f67db6 Merge branch 'master' of github.com:coralproject/talk into coral-plugin-auth 2017-05-22 08:58:33 -03:00
Belen Curcio 1aacb565d4 linting 2017-05-19 20:10:49 -03:00
Belen Curcio 801a6f8a53 External plugin auth fully working, now refactor 2017-05-19 20:00:33 -03:00
gaba f525af4c6e Added a few more translations that were missing. 2017-05-19 15:42:56 -07:00
Belen Curcio dbfd2aff7c SignInButton 2017-05-19 19:29:50 -03:00
Belen Curcio 3af49de0ce New login slots and auth plugins 2017-05-19 18:04:54 -03:00
gaba 97e9419f02 Missing translations. 2017-05-19 13:34:56 -07:00
Belen Curcio 87ada30eff Ádding Stream Slot 2017-05-19 17:32:16 -03:00
gaba 67fb829717 A few more issues from the merge. 2017-05-19 13:29:23 -07:00
gaba 625362d51e Merge branch 'master' into i18n-refactor 2017-05-19 12:44:34 -07:00
gaba 9be443eda8 Moves i18n into coral-framework. 2017-05-19 12:28:44 -07:00
gaba 88b5a4169d Remove promise 2017-05-19 10:48:47 -07:00
riley 2c620c868d merge master 2017-05-19 11:05:46 -06:00
Kiwi 8cb9945e25 Merge branch 'master' into multiple-roles 2017-05-19 23:26:45 +07:00
riley 17ceadd8c9 move client-side perms to services 2017-05-19 09:18:24 -06:00
Chi Vinh Le 1374217680 Merge branch 'master' into suspend-user 2017-05-19 17:46:06 +07:00
gaba 8dddff25f9 Update es translation and add link to transifex. 2017-05-18 16:01:12 -07:00
gaba 12cb59ce30 Merge branch 'master' into i18n-refactor 2017-05-18 15:44:14 -07:00
gaba 1a7ad410f5 Loads timeago translation when loading translations. 2017-05-18 15:38:53 -07:00
gaba 3ca22bd101 Fix translation keys. 2017-05-18 15:14:37 -07:00
Kim Gardner b3e494d279 Merge branch 'master' into read-only-inputs 2017-05-18 17:14:48 -04:00
Kim Gardner 12ec058588 Merge branch 'master' into edit-comment-settings 2017-05-18 17:07:37 -04:00
Riley Davis c772cffc92 handle no-interaction input the correct way 2017-05-18 13:51:48 -06:00
Chi Vinh Le 89b7918e41 Tiny renaming 2017-05-19 02:29:59 +07:00
Chi Vinh Le b521934ee2 Remove unneeded refetch 2017-05-19 02:24:47 +07:00
Chi Vinh Le 061c18670b Merge branch 'master' into suspend-user 
Conflicts:
	client/coral-admin/src/constants/moderation.js
	client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
 2017-05-19 02:19:24 +07:00
Chi Vinh Le 0588a8ab66 Use async / await :-) 2017-05-19 02:07:38 +07:00
Chi Vinh Le f641a3ec40 Complete suspend user implementation 2017-05-19 01:52:03 +07:00
Kim Gardner e80e79f267 Merge branch 'master' into edit-comment-settings 2017-05-18 14:23:14 -04:00
riley ff75b9474a merge master 2017-05-18 12:18:00 -06:00
riley 056ba9a04c do the same thing for the Drawer 2017-05-18 12:11:11 -06:00
riley d98ce38bf5 show config tab to admins. hide menu items from users that can't access admin 2017-05-18 12:06:07 -06:00
Benjamin Goering 1d322d8c70 Merge branch 'master' into fix-ignore-user 2017-05-18 10:50:00 -07:00
Benjamin Goering aaa2da6c23 Stream container refetch then setCommentCountCache to asset.commentCount instead of silly zero 2017-05-18 10:43:38 -07:00
Wyatt Johnson 12713dae86 Removed unused assets 2017-05-18 11:18:08 -06:00
Benjamin Goering fb33eefe8e trivial changes requested by review 2017-05-18 08:19:52 -07:00
Benjamin Goering cfc6d4bfea Merge branch 'fix-ignore-user' of github.com:gobengo/talk into fix-ignore-user 2017-05-18 08:12:40 -07:00
Benjamin Goering 6bbeee3a6b StopIgnoringUser does not refetch EmbedQuery 2017-05-18 08:11:39 -07:00
Benjamin Goering 340d3cea62 contains/Stream setCommentCountCache waits for refetch promise 2017-05-18 08:10:20 -07:00