wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-04 12:15:25 +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
Wyatt Johnson cb768d3190 Merge branch 'master' into next 2017-11-09 14:59:32 -07:00
Chi Vinh Le 0b18bb06e7 More tests 2017-11-09 22:31:53 +01:00
Chi Vinh Le 9abb3d30da e2e fixes 2017-11-09 22:04:32 +01:00
Chi Vinh Le f0839c57df Change to allowed name 2017-11-09 21:52:08 +01:00
Chi Vinh Le b2929e9a83 Fail fast 2017-11-09 21:51:41 +01:00
Chi Vinh Le ca7b790962 Return this 2017-11-09 21:51:31 +01:00
Chi Vinh Le 42a477ae41 Fix firefox popup bug e2e 2017-11-09 21:51:03 +01:00
Chi Vinh Le 53461df287 Increase wait for iframe time 2017-11-09 19:30:22 +01:00
Kiwi 9b18a78ce0 Merge branch 'master' into user-status 2017-11-09 19:20:06 +01:00
Chi Vinh Le da35f39baf Set resolution 2017-11-09 19:19:47 +01:00
Chi Vinh Le e885178dfc Refactor 2 2017-11-09 19:03:01 +01:00
Kim Gardner 24e8aab0fe Merge branch 'master' into e2e-v2 2017-11-09 17:09:56 +00:00
Kim Gardner 44d6ad340d Merge pull request #1156 from coralproject/queue-fix 
Queue fix for custom assets
 2017-11-09 17:09:25 +00:00
Chi Vinh Le 63b6315435 Refactor #1 2017-11-09 17:50:47 +01:00
Kiwi 95ca43ff8c Merge branch 'master' into e2e-v2 2017-11-09 16:23:20 +01:00
Chi Vinh Le 55e4aed511 Merge branch 'master' into user-status 2017-11-09 15:53:42 +01:00
Kim Gardner 6d5adc8f54 Bump version number to 3.8.0 2017-11-09 13:19:05 +00:00
Kim Gardner 7be888bfa8 Bump release number for 4.0.0 2017-11-09 11:44:42 +00:00
Kim Gardner 247e05383e One more fix 2017-11-09 11:23:48 +00:00
Kim Gardner 3988fb9e93 Merge branch 'feature/fix-email-config-docs' of git+ssh://github.com/coralproject/talk into feature/fix-email-config-docs 2017-11-09 11:20:07 +00:00
Kim Gardner 7d524efaad Merge branch 'master' into feature/fix-email-config-docs 2017-11-09 11:19:57 +00:00
Kim Gardner d7a88cdc2a Fix config key 2017-11-09 11:18:58 +00:00
Wyatt Johnson 77c927ac59 added migration, migration tests 🎉 2017-11-08 16:35:38 -07:00
Wyatt Johnson 18f5b0cc5e queue fix for sometimes null settings 2017-11-08 14:24:48 -07:00
Wyatt Johnson 0257e09a40 Merge branch 'next' into user-status-refactor 2017-11-08 13:52:48 -07:00
Wyatt Johnson 61df0e1eeb Merge branch 'master' into next 2017-11-08 13:49:21 -07:00
Wyatt Johnson 1b7f78b562 user queries 2017-11-08 13:40:46 -07:00
Kiwi 2df18f07cb Merge pull request #1140 from coralproject/user-pending 
Users with PENDING status should not be allowed to post & E2E for User Status
 2017-11-08 19:27:41 +01:00
Chi Vinh Le 786e85686d Fix invalid regexp for ie 2017-11-08 18:57:06 +01:00
Belen Curcio 9a651880a2 Updated login 2017-11-08 14:00:01 -03:00
Belen Curcio 82e01eac00 Merge branch 'master' of github.com:coralproject/talk into user-status 2017-11-08 13:56:48 -03:00
Wyatt Johnson 9e84c72148 added more mutations 2017-11-08 09:41:38 -07:00
Belen Curcio 5efdc9865f refacotr 2017-11-08 12:59:08 -03:00
Belen Curcio 62d01cf2a0 perform login 2017-11-08 12:31:33 -03:00
Belen Curcio 81bf63836a tests 2017-11-08 12:23:40 -03:00
Belen Curcio 54ac2985ba Adding classes 2017-11-08 12:23:29 -03:00
Belen Curcio e9bd5703f1 refactor 2017-11-08 11:49:32 -03:00
Jeff Nelson a394ba29b3 Update 02-02-advanced-configuration.md 
Change TALK_SMTP_EMAIL to TALK_SMTP_FROM_EMAIL
 2017-11-08 07:11:03 -05:00
Belen Curcio a2470fa01b More 2017-11-07 16:43:58 -03:00
Belen Curcio 9b98e3cac9 missing classes 2017-11-07 15:20:14 -03:00
Chi Vinh Le 4f89c1e1c3 Add some comments and description 2017-11-07 17:50:56 +01:00
Chi Vinh Le c3e551deb5 Disable bs for branches 2017-11-07 17:48:12 +01:00
Chi Vinh Le 0678ea0344 Small tweak 2017-11-07 17:07:50 +01:00
Chi Vinh Le b09b56bd24 Temporarily enable browserstack 2017-11-07 16:52:27 +01:00
Chi Vinh Le 2a0f70f084 Clean DB before serve 2017-11-07 16:42:37 +01:00
Kiwi bf2e11ef9a Merge branch 'master' into e2e-v2 2017-11-07 16:29:51 +01:00
Chi Vinh Le 0fc810a7b1 e2e v2 2017-11-07 16:21:09 +01:00
Belen Curcio 918ad915b8 Tests 2017-11-06 23:53:33 -03:00
Belen Curcio d51b6b31f6 Adding missing classes and proptypes 2017-11-06 23:53:19 -03:00
Belén Curcio e88445beac Merge branch 'master' into user-pending 2017-11-06 13:48:26 -03:00