wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-05 10:34:56 +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
gaba eb916099bd Merge 2016-12-02 16:52:16 -08:00
gaba 60d4793111 Adds a variable to the possible translations. 2016-12-02 16:12:24 -08:00
gaba 07e3a935ab Show the Dialog. 2016-12-02 16:03:19 -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
David Erwin e6a32c91a2 Merge branch 'master' into wordlist 2016-12-02 16:02:44 -05:00
David Erwin 6990600c10 Merge pull request #124 from coralproject/like-login-prompt 
Like/Flag Login Prompt
 2016-12-02 16:02:34 -05:00
David Erwin f2273f1698 Merge branch 'master' into like-login-prompt 2016-12-02 15:58:54 -05:00
David Erwin 9f9e80e647 Merge pull request #123 from coralproject/info-box-fix 
Info box fix
 2016-12-02 15:50:40 -05:00
David Jay 0eca9eeadc Prompting login when a loggout out user likes or comments. 2016-12-02 15:45:26 -05:00
David Jay c387df55f3 Removing .env-test 2016-12-02 12:52:43 -05:00
David Jay b1d0f8443f Updating infobox styling. 2016-12-02 12:47:18 -05:00
David Jay 8dad90104d Returning infobox data in stream. 2016-12-02 12:26:31 -05:00
David Jay 94dd79b6a7 Updating test db logic. 2016-12-02 12:03:25 -05:00
gaba 1cda5b9099 Restrict content in the comment stream when banned. 2016-12-02 08:00:26 -08:00
gaba da7f39c9e9 Merge branch 'master' into ban-user 2016-12-02 07:58:46 -08:00
gaba 29f547d268 Trying to fix ban user dialog. 2016-12-02 06:35:55 -08:00
David Jay 0e75319c04 Moving banned wordlist text to translations. 2016-12-01 21:49:55 -05: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
David Jay a91b73e94a Fixing bug when writing settings to state. 2016-12-01 20:26:48 -05:00
David Jay 827b94001a Changing save button color when settings are changed 2016-12-01 20:24:34 -05:00
David Jay a16faddac6 Adding banned word list. 2016-12-01 20:11:33 -05:00
David Jay 957837169f Moving configuration sections to seperate files. 2016-12-01 19:35:35 -05:00
David Jay ef58c439f2 Adding banned word list menu option. 2016-12-01 18:46:02 -05:00
David Jay e5fe91af8b Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e 2016-12-01 18:25:08 -05:00
David Jay a118d263ea Cleaning url regex in commentstream. 2016-12-01 16:23:33 -05:00
gaba c83f8eb188 Onclick action. 2016-12-01 13:11:44 -08:00
gaba 15eb946f00 Trying to get the Dialog up. 2016-12-01 13:05:10 -08:00
David Jay d853b1f912 Merging master into stream-e2e 2016-12-01 14:36:47 -05:00
Belén Curcio e6b9cf4b7d Merge pull request #120 from coralproject/bio 
User Bio and Settings Tab
 2016-12-01 13:07:25 -03:00
Belen Curcio 647fb06c99 HandleSave on Submit 2016-12-01 12:58:37 -03:00
Belen Curcio 990782a542 Sign in a restricted rout 2016-12-01 11:17:07 -03:00
gaba 443cd031d5 Ban button. 2016-11-30 19:20:07 -08:00
David Erwin 17a8e4bb25 Merge branch 'master' into guides 2016-11-30 22:07:13 -05:00
Belen Curcio c38c556002 merge 2016-11-30 20:11:22 -03:00
David Jay b2b9b0ec42 Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e 2016-11-30 17:55:39 -05:00
David Jay 3f1f678fb2 Adding comment count test. 2016-11-30 17:49:08 -05:00
David Jay fe4e9c5ea9 All e2e tests passing. 2016-11-30 17:38:23 -05:00
gaba 2dd3359cb6 Merge branch 'master' into ban-user 2016-11-30 13:31:59 -08:00
David Jay c93bc67a40 Removing mocks from pree2e 2016-11-30 16:29:05 -05:00
David Jay 7503ba9ab3 Moving settings to mocks. 2016-11-30 16:27:03 -05:00
David Jay 2b0a503c6a Adding mock functions to tests. 2016-11-30 16:18:54 -05:00
Gabriela Rodríguez Berón d3ff89fd25 Merge pull request #113 from coralproject/mod-queue-fix 
Add user info to moderation queue
 2016-11-30 12:54:15 -08:00
David Jay 34671fb327 Fixing filter in moderation queue. 2016-11-30 15:38:43 -05:00
David Jay 03db1de41a Removing log statement. 2016-11-30 15:15:58 -05:00
Dan Zajdband bf3b028370 Close comments: WIP 2016-11-30 15:09:42 -05:00
Belen Curcio d90a158298 Bio Tooltips 2016-11-30 17:09:34 -03:00
gaba a30388682e Merge branch 'master' into ban-user 2016-11-30 11:26:44 -08:00
gaba ba47250933 Understanding reducers 2016-11-30 11:12:09 -08:00