wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-06-30 22:04:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,615 Commits 10 Branches 125 Tags
cf93727f736fcdaad5390ccaf239405e1d32ffdd
Commit Graph

279 Commits

Author SHA1 Message Date
Chi Vinh Le 853c1e407e Simplify args 2017-06-19 21:08:12 +07:00
Belen Curcio 89cf13b4cf Updates 2017-06-16 15:05:22 -03:00
David Erwin 4536d218d2 Merge branch 'master' into asset-improvements 2017-06-13 17:18:47 -04:00
Chi Vinh Le 7d8f2aa876 More robust reactions 2017-06-13 22:02:54 +07:00
Wyatt Johnson f929059daf added asset merging + url updates 2017-06-09 13:23:16 -06:00
Wyatt Johnson 140f980c14 Merge branch 'master' into subscription-fixes 2017-06-08 15:09:37 -06:00
Wyatt Johnson 32708e9098 submscription fixes 2017-06-08 15:08:18 -06:00
Wyatt Johnson 80900a98fd perform migrations during web install 2017-06-08 11:19:43 -06:00
Belen Curcio 63a35cbceb Merge issues 2017-06-07 16:38:36 -03:00
Wyatt Johnson 4cbc8b2226 Updates to setup process 2017-06-07 11:08:39 -06:00
Wyatt Johnson 6827ff2f1f Added support for version enforcing 2017-06-07 10:27:42 -06:00
Wyatt Johnson 1e904584e7 Added model migrations 2017-06-06 17:31:52 -06:00
Wyatt Johnson 71ff1c31f8 moved plugin to lazy load 2017-06-06 16:49:51 -06:00
Wyatt Johnson 2f77842072 Merge branch 'master' into safari-cookie-time 2017-06-05 16:32:29 -06:00
Wyatt Johnson e8143aea14 Added new tokenUserNotFound plugin hook 2017-06-05 15:52:32 -06:00
Chi Vinh Le c20df65ebc Use same lifespan for cookies as for tokens 2017-06-05 18:21:40 +07:00
gaba e98b9ff9bc Some translations missing and a folder that should not be there. 2017-06-02 13:50:48 -07:00
gaba b9b62e5764 Use accepts library. 2017-06-02 08:24:21 -07:00
gaba 27e6372fe2 Get language from the header. 2017-06-01 16:24:15 -07:00
gaba 686dc96c5f An attempt to guess language. In process. 2017-06-01 15:44:44 -07:00
gaba 276b2c7591 Merge branch 'master' into i18n-emails 2017-05-31 15:31:14 -07:00
gaba a126c94aa4 Adds service for translations in the backend. Clean yaml. 2017-05-31 13:55:27 -07:00
Kiwi d28ba0028d Merge branch 'master' into integrate-admin-graphql-framework 2017-05-30 20:48:53 +07:00
Chi Vinh Le a598bca12b Allow domains with ports 2017-05-29 22:10:16 +07:00
Chi Vinh Le 9a6532ecea Merge branch 'master' into integrate-admin-graphql-framework 
Conflicts:
	client/coral-embed-stream/src/index.js
 2017-05-29 20:09:03 +07:00
Chi Vinh Le ee2068f5f1 Merge branch 'master' into auth-flow 
Conflicts:
	client/coral-admin/src/actions/auth.js
 2017-05-27 01:07:19 +07:00
Chi Vinh Le d4569b5f51 Set cookie for facebook login on safari 2017-05-26 21:37:11 +07:00
Chi Vinh Le 6a9f216c0f Detect mobile & desktop safari server side 2017-05-26 20:58:48 +07:00
Belen Curcio 8edc16ed85 Removing logs 2017-05-25 20:06:49 -03:00
Belen Curcio 8171cb53e1 Ádding another extractor 2017-05-25 20:04:32 -03:00
Belen Curcio cbf7cc67f4 Extracting token from cookie if safari 2017-05-25 18:30:01 -03:00
Belen Curcio a8c361e2f7 by hostname 2017-05-25 16:53:12 -03:00
Belen Curcio 75080cfe30 Password reset and valid locations 2017-05-25 16:19:19 -03:00
Belen Curcio e510553d9a Sending cookies if safari 2017-05-25 13:55:03 -03:00
Belen Curcio bb6be9a734 BE implementation 2017-05-25 11:53:40 -03:00
gaba 09bd0a6735 Move templates to a folder for translations. 2017-05-25 10:43:34 -04:00
Chi Vinh Le 0231358075 Correctly set roles 2017-05-24 21:00:05 +07:00
Chi Vinh Le 8ab7047cfa Refactor admin 2017-05-24 17:09:21 +07:00
riley ec03c6b48c merge master 2017-05-22 13:10:43 -06:00
Wyatt Johnson 8f219c47a7 Tag server impl 2017-05-19 12:23:53 -06: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
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
riley 6deee7cb80 add a perms utils file 2017-05-18 14:28:43 -06: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 0040bc4c01 Remove remaining debug msgs 2017-05-19 02:12:27 +07:00
Chi Vinh Le f641a3ec40 Complete suspend user implementation 2017-05-19 01:52:03 +07:00
riley ff75b9474a merge master 2017-05-18 12:18:00 -06:00