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

8345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chi Vinh Le 5c66009d84 Change to import 2017-05-24 00:30:34 +07:00
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
Kim Gardner 0007773b4d Merge branch 'master' into 142993479-tags 2017-05-23 13:02:29 -04:00
gaba adacafb586 Removed extra string. 2017-05-23 12:59:06 -04:00
Kim Gardner 4ad2cd76c0 Merge branch 'master' into coral-plugin-auth 2017-05-23 12:57:58 -04:00
Kim Gardner ac9e193c45 Merge branch 'master' into graphql-errors-handling 2017-05-23 12:57:53 -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
gaba 5757682732 Removes files that came from the merge and do not exist in master. 2017-05-23 11:57:51 -04:00
Gabriela Rodríguez Berón 6f7b8522c8 Merge branch 'master' into i18n-refactor 2017-05-23 11:47:58 -04:00
Riley Davis 3c4b510829 Merge pull request #605 from coralproject/missed-roles 
hasRoles is no longer a function
 2017-05-22 15:20:17 -06:00
riley add3cbf7b3 hasRoles is no longer a function 2017-05-22 15:10:56 -06: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 9d00a27f1d Auth as a plugin 2017-05-22 08:40:45 -03:00
Belen Curcio f364a1e0a1 Refactor 2017-05-22 08:23:58 -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 904aef0afc Adding coral-plugin-auth 2017-05-19 17:32:54 -03: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
Riley Davis f32208b35b Merge pull request #585 from coralproject/multiple-roles 
Multiple roles
 2017-05-19 13:12:20 -06:00
Wyatt Johnson 8f219c47a7 Tag server impl 2017-05-19 12:23:53 -06: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 04fbeededa Merge pull request #600 from coralproject/suspend-user 
Suspend user
 2017-05-19 23:29:13 +07: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 3688d3f970 Gracefully allow user with no email 2017-05-19 17:53:10 +07:00
Chi Vinh Le 1d6455058e Apply review suggestions 2017-05-19 17:51:58 +07: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
Kim Gardner f35a9ec8cd Merge pull request #602 from coralproject/content-type-fix 
added fix for chrome + content type negotiation
 2017-05-18 18:40:35 -04:00
gaba 1a7ad410f5 Loads timeago translation when loading translations. 2017-05-18 15:38:53 -07:00
Wyatt Johnson 25230f2e9d added fix for chrome + content type negotiation 2017-05-18 16:30:28 -06:00
gaba 3ca22bd101 Fix translation keys. 2017-05-18 15:14:37 -07:00
Kim Gardner f29df23c07 Merge pull request #601 from coralproject/read-only-inputs 
handle no-interaction input the correct way
 2017-05-18 17:21:12 -04:00