wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-03 13:20:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
939 Commits 10 Branches 125 Tags
7bfd9e2e714db5ee2cfb59fd9e6734d5f3600988
Commit Graph
121 Commits
Author SHA1 Message Date
Gabriela Rodríguez BerónandGitHub f29c0a3a09 Merge branch 'master' into ban-user 2016-12-09 10:43:55 -10:00
Gabriela Rodríguez BerónandGitHub ba169147e7 Merge branch 'master' into ban-user 2016-12-09 10:28:32 -10:00
Gabriela Rodríguez BerónandGitHub 1fefd3c8b4 Merge branch 'master' into wordlist 2016-12-09 10:26:39 -10:00
gaba 15557c16e2 Merge branch 'master' into ban-user 2016-12-09 08:28:46 -10: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
gaba 50afa3d190 Merge branch 'master' into ban-user 2016-12-08 09:22:22 -10: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
gaba 23c67b4a49 It fix the status change after merging master in. 2016-12-07 16:37:11 -10:00
Riley DavisandGitHub 6247510cd7 Merge branch 'master' into wordlist 2016-12-07 16:15:23 -10:00
Riley Davis f2ded3f2a7 replace things multiple times 2016-12-06 14:34:27 -10:00
Riley Davis 31c87cb93f make the translation function accept n arguments. ninja bugfix to permalink 2016-12-06 14:17:01 -10:00
Riley DavisandGitHub f2c751f9f0 Merge branch 'master' into i18n-var 2016-12-06 13:41:44 -10:00
Belen Curcio e751d91794 typo 2016-12-06 14:21:02 -03:00
Belen Curcio 8036b4790d Notifications 2016-12-06 14:09:36 -03:00
Belen Curcio 623c32a002 Configure Stream Ready, Checkbox Coral UI 2016-12-06 12:18:29 -03:00
David JayandGitHub 3562d9f235 Merge branch 'master' into wordlist 2016-12-05 17:44:23 -05:00
Belen Curcio 08e232c4fe User Should still be able to see sign info even if its closed // moving comp 2016-12-05 19:28:47 -03: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
gaba 60d4793111 Adds a variable to the possible translations. 2016-12-02 16:12:24 -08:00
gaba d12693ae47 Adds a variable to the translation. 2016-12-02 16:02:50 -08:00
David Jay ead66520e2 Adjusting height of login button to match current comment. 2016-12-02 17:01:06 -05:00
gaba 1cda5b9099 Restrict content in the comment stream when banned. 2016-12-02 08:00:26 -08:00
David Jay b5b0cd9b12 Adding banned word notification on post. 2016-12-01 21:32:08 -05:00
David Jay 2cb439ccf8 Reloading banned word list from settings. 2016-12-01 21:12:13 -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 d90a158298 Bio Tooltips 2016-11-30 17:09:34 -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
Riley DavisandGitHub 8218d0c18e Merge branch 'master' into bio 2016-11-29 10:36:20 -07:00
Belen Curcio a5de52aeb9 merge 2016-11-29 13:57:14 -03:00
Belen Curcio 86faf504bb changes 2016-11-29 13:56:26 -03: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
Wyatt JohnsonandGitHub 29f378b863 Merge branch 'master' into bio 2016-11-28 17:20:58 -07: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
Belen Curcio 613a165325 merge 2016-11-28 17:40:22 -03:00