wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-22 13:00:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,026 Commits 10 Branches 125 Tags
8d35e65cba25ca1aaa38d00a37ed39b12439ec32
Commit Graph
71 Commits
Author SHA1 Message Date
David JayandGitHub 409c9c3eb5 Merge branch 'master' into fix-signup-bug 2016-12-12 15:56:26 -05:00
David Jay cb576dca8f Updating signup endpoint to reflect current api. 2016-12-12 15:52:34 -05:00
Belen Curcio a872128a55 logOut Stae 2016-12-11 22:52:47 -03:00
David Jay d229d5a96f Updating route to davidjay. 2016-12-09 19:28:19 -05:00
David Jay 90ef16e111 Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-09 15:51:13 -05:00
Gabriela Rodríguez BerónandGitHub 1fefd3c8b4 Merge branch 'master' into wordlist 2016-12-09 10:26:39 -10:00
David Jay bf01543a88 Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-09 13:26:48 -05:00
David Jay e032a5521e Merge branch 'master' of github.com:coralproject/talk into wordlist 2016-12-09 13:05:11 -05:00
Belen Curcio 3ef8f295c3 newConfig update 2016-12-09 12:59:17 -03:00
Dan Zajdband 09ba535d68 Merge with master 2016-12-09 10:17:55 -05:00
Belen Curcio acbd465636 merge 2016-12-08 16:37:11 -03:00
David Jay b3d84d724f Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-08 14:36:02 -05:00
David Jay fc96c1ee91 Compressing variables from postAction into single object. 2016-12-08 14:27:31 -05:00
Belen Curcio 74e4771e17 new config 2016-12-08 16:21:07 -03:00
Riley DavisandGitHub be2d9838e6 Merge branch 'master' into wordlist 2016-12-08 09:13:48 -10:00
David Jay e91564f706 Merge branch 'master' of github.com:coralproject/talk into like-login-prompt 2016-12-08 13:49:15 -05:00
Dan Zajdband fb392422ea Added textarea for closed message on admin 2016-12-08 12:44:02 -05:00
David Jay dd85fbb3e0 Adding other field. 2016-12-07 22:16:41 -05:00
David Jay 18f7b07198 Addressing setting bug caused by open thread feature. 2016-12-07 21:12:31 -05:00
David Jay 713cc0cda1 Posting actions to comment and user endpoints. 2016-12-07 19:01:02 -05:00
David Jay 507e89a301 Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-06 18:19:45 -05:00
David Jay 13d0dec84a Updating postAction to send reasons to backend. 2016-12-06 18:11:44 -05:00
Belen Curcio 8036b4790d Notifications 2016-12-06 14:09:36 -03:00
David JayandGitHub 3562d9f235 Merge branch 'master' into wordlist 2016-12-05 17:44:23 -05:00
Belen Curcio 03b6ec4fe4 Lint 2016-12-05 19:18:29 -03:00
Dan Zajdband 62cc489c21 Merge with master 2016-12-05 16:39:00 -05:00
Dan Zajdband 4be258c63d Added simple open/close flow 2016-12-05 11:02:39 -05:00
David Jay ead66520e2 Adjusting height of login button to match current comment. 2016-12-02 17:01:06 -05:00
David Jay b5b0cd9b12 Adding banned word notification on post. 2016-12-01 21:32:08 -05:00
Belen Curcio 990782a542 Sign in a restricted rout 2016-12-01 11:17:07 -03:00
Belen Curcio c38c556002 merge 2016-11-30 20:11:22 -03:00
Belen Curcio 6e7926ab30 Working bios 2016-11-30 12:41:50 -03:00
Belen Curcio 2607c608f5 D 
ividing userData from userAuth
 2016-11-30 10:20:03 -03:00
Belen Curcio bd704bf2ce User Settings, Restricted User, Banned User, Bio and User actions and Reducers 2016-11-30 08:42:25 -03:00
Riley Davis 3e86bfdceb false positive on user signed in 2016-11-29 15:58:05 -07:00
Riley Davis a7f94fce83 implement coralApi fetch 2016-11-29 14:44:37 -07:00
David JayandDan Zajdband ea2ee68ed6 Test db clear (#116) 
* Adding headers to stream request.

* Switching mongodb when node_env === test.
 2016-11-29 11:44:54 -05:00
riley 0e3cd001e9 merge master 2016-11-28 16:38:25 -07:00
Riley Davis d5ff0f8f28 keep it DRY. add getInit all over the place. update tests 2016-11-28 16:18:19 -07:00
David Jay 7cf05bbdca Merge branch 'master' of https://github.com/coralproject/talk into settings-in-stream 2016-11-28 17:25:07 -05:00
David Jay 823c223cf1 Adding settings to redux store from stream. 2016-11-28 17:11:37 -05:00
Riley DavisandGitHub 98c6ef5162 Merge branch 'master' into config-auth-fix 2016-11-28 11:30:28 -07:00
Wyatt JohnsonandDan Zajdband b0f01cf00f Initial commit of asset queuing (#97) 
* Initial commit of asset queuing

* Addresssing comments
 2016-11-28 13:29:39 -05:00
Riley Davis c0eb202858 small refactor on items actions 2016-11-28 10:57:15 -07:00
David Jay 5c532dab5e Merge branch 'master' of https://github.com/coralproject/talk into user-integration 2016-11-22 11:11:52 -05:00
Wyatt JohnsonandGitHub 00a8c59c96 Merge branch 'master' into admin 2016-11-22 08:31:21 -07:00
David Jay 1931c85d67 Merging 2016-11-21 19:23:29 -05:00
David JayandGitHub 06686105c4 Merge branch 'master' into connect-reset-to-fe 2016-11-21 19:06:04 -05:00
David Jay 2b9caf8daf Updating frontend to utilize new action delete endpoint. 2016-11-21 18:00:50 -05:00
David Jay 1a648ca20e Simplifying item references in CommentStream. 2016-11-21 17:12:55 -05:00