wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-13 03:36:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 51c29e0c31 Merge branch 'master' into like-login-prompt Kim Gardner 2016-12-04 00:59:39 -05:00
  • d85d15a55a Merge pull request #84 from coralproject/guides Kim Gardner 2016-12-04 00:59:08 -05:00
  • e528e0678f Merge branch 'master' into stream-e2e Kim Gardner 2016-12-04 00:49:27 -05:00
  • ea604d54ac Merge branch 'master' into like-login-prompt Kim Gardner 2016-12-04 00:48:50 -05:00
  • 2f965f2009 Merge branch 'master' into guides Kim Gardner 2016-12-04 00:47:32 -05:00
  • 3463e09cab Setting the showuserdialog in the reducer for comments. gaba 2016-12-02 17:05:23 -08:00
  • eb916099bd Merge gaba 2016-12-02 16:52:16 -08:00
  • 60d4793111 Adds a variable to the possible translations. gaba 2016-12-02 16:12:24 -08:00
  • 07e3a935ab Show the Dialog. gaba 2016-12-02 16:03:19 -08:00
  • d12693ae47 Adds a variable to the translation. gaba 2016-12-02 16:02:37 -08:00
  • ead66520e2 Adjusting height of login button to match current comment. David Jay 2016-12-02 17:01:06 -05:00
  • e6a32c91a2 Merge branch 'master' into wordlist David Erwin 2016-12-02 16:02:44 -05:00
  • 6990600c10 Merge pull request #124 from coralproject/like-login-prompt David Erwin 2016-12-02 16:02:34 -05:00
  • f2273f1698 Merge branch 'master' into like-login-prompt David Erwin 2016-12-02 15:58:54 -05:00
  • 9f9e80e647 Merge pull request #123 from coralproject/info-box-fix David Erwin 2016-12-02 15:50:40 -05:00
  • 0eca9eeadc Prompting login when a loggout out user likes or comments. David Jay 2016-12-02 15:45:26 -05:00
  • c387df55f3 Removing .env-test David Jay 2016-12-02 12:52:43 -05:00
  • b1d0f8443f Updating infobox styling. David Jay 2016-12-02 12:47:18 -05:00
  • 8dad90104d Returning infobox data in stream. David Jay 2016-12-02 12:26:31 -05:00
  • 94dd79b6a7 Updating test db logic. David Jay 2016-12-02 12:03:25 -05:00
  • 1cda5b9099 Restrict content in the comment stream when banned. gaba 2016-12-02 08:00:26 -08:00
  • da7f39c9e9 Merge branch 'master' into ban-user gaba 2016-12-02 07:58:46 -08:00
  • 29f547d268 Trying to fix ban user dialog. gaba 2016-12-02 06:35:55 -08:00
  • 0e75319c04 Moving banned wordlist text to translations. David Jay 2016-12-01 21:49:55 -05:00
  • b5b0cd9b12 Adding banned word notification on post. David Jay 2016-12-01 21:32:08 -05:00
  • 2cb439ccf8 Reloading banned word list from settings. David Jay 2016-12-01 21:12:13 -05:00
  • a91b73e94a Fixing bug when writing settings to state. David Jay 2016-12-01 20:26:48 -05:00
  • 827b94001a Changing save button color when settings are changed David Jay 2016-12-01 20:24:34 -05:00
  • a16faddac6 Adding banned word list. David Jay 2016-12-01 20:11:33 -05:00
  • 957837169f Moving configuration sections to seperate files. David Jay 2016-12-01 19:35:35 -05:00
  • ef58c439f2 Adding banned word list menu option. David Jay 2016-12-01 18:46:02 -05:00
  • e5fe91af8b Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e David Jay 2016-12-01 18:25:08 -05:00
  • a118d263ea Cleaning url regex in commentstream. David Jay 2016-12-01 16:23:33 -05:00
  • c83f8eb188 Onclick action. gaba 2016-12-01 13:11:44 -08:00
  • 15eb946f00 Trying to get the Dialog up. gaba 2016-12-01 13:05:10 -08:00
  • d853b1f912 Merging master into stream-e2e David Jay 2016-12-01 14:36:47 -05:00
  • e6b9cf4b7d Merge pull request #120 from coralproject/bio Belén Curcio 2016-12-01 13:07:25 -03:00
  • 647fb06c99 HandleSave on Submit Belen Curcio 2016-12-01 12:58:37 -03:00
  • 990782a542 Sign in a restricted rout Belen Curcio 2016-12-01 11:17:07 -03:00
  • 443cd031d5 Ban button. gaba 2016-11-30 19:20:07 -08:00
  • 17a8e4bb25 Merge branch 'master' into guides David Erwin 2016-11-30 22:07:13 -05:00
  • c38c556002 merge Belen Curcio 2016-11-30 20:11:22 -03:00
  • b2b9b0ec42 Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e David Jay 2016-11-30 17:55:39 -05:00
  • 3f1f678fb2 Adding comment count test. David Jay 2016-11-30 17:49:08 -05:00
  • fe4e9c5ea9 All e2e tests passing. David Jay 2016-11-30 17:38:23 -05:00
  • 2dd3359cb6 Merge branch 'master' into ban-user gaba 2016-11-30 13:31:59 -08:00
  • c93bc67a40 Removing mocks from pree2e David Jay 2016-11-30 16:29:05 -05:00
  • 7503ba9ab3 Moving settings to mocks. David Jay 2016-11-30 16:27:03 -05:00
  • 2b0a503c6a Adding mock functions to tests. David Jay 2016-11-30 16:18:54 -05:00
  • d3ff89fd25 Merge pull request #113 from coralproject/mod-queue-fix Gabriela Rodríguez Berón 2016-11-30 12:54:15 -08:00
  • 34671fb327 Fixing filter in moderation queue. David Jay 2016-11-30 15:38:43 -05:00
  • 03db1de41a Removing log statement. David Jay 2016-11-30 15:15:58 -05:00
  • bf3b028370 Close comments: WIP Dan Zajdband 2016-11-30 15:09:42 -05:00
  • d90a158298 Bio Tooltips Belen Curcio 2016-11-30 17:09:34 -03:00
  • a30388682e Merge branch 'master' into ban-user gaba 2016-11-30 11:26:44 -08:00
  • ba47250933 Understanding reducers gaba 2016-11-30 11:11:01 -08:00
  • 17b79e1869 Adding user and action data to rejected and flagged comments. David Jay 2016-11-30 13:51:43 -05:00
  • 94d9f42aa5 Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix David Jay 2016-11-30 12:50:44 -05:00
  • ee03194a90 Merge branch 'master' into guides David Erwin 2016-11-30 11:00:42 -05:00
  • 6e7926ab30 Working bios Belen Curcio 2016-11-30 12:41:50 -03:00
  • 2607c608f5 D ividing userData from userAuth Belen Curcio 2016-11-30 10:20:03 -03:00
  • bd704bf2ce User Settings, Restricted User, Banned User, Bio and User actions and Reducers Belen Curcio 2016-11-30 08:42:25 -03:00
  • 4486d3f3e9 Merge pull request #119 from coralproject/fetch-helper David Jay 2016-11-29 18:11:21 -05:00
  • 3e86bfdceb false positive on user signed in Riley Davis 2016-11-29 15:58:05 -07:00
  • fb977da01d Adding mocks file. David Jay 2016-11-29 17:36:17 -05:00
  • 257ecd3328 Merge branch 'master' into fetch-helper Riley Davis 2016-11-29 15:34:30 -07:00
  • ef172cabfc Scroll to comment (#92) Riley Davis 2016-11-29 15:19:56 -07:00
  • a7f94fce83 implement coralApi fetch Riley Davis 2016-11-29 14:44:37 -07:00
  • b7ffd31ea4 Cleaning up tests after merge. David Jay 2016-11-29 16:37:39 -05:00
  • 9499e53021 Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix David Jay 2016-11-29 16:36:44 -05:00
  • 8af9e14971 Recovered community admin. gaba 2016-11-29 12:42:25 -08:00
  • 3033abaa88 Merge pull request #117 from coralproject/moderation-settings-were-backwards David Jay 2016-11-29 15:08:18 -05:00
  • a5f67e10d6 Reverts the work on ban in the coral-admin getting everything from master for it. gaba 2016-11-29 11:35:55 -08:00
  • 281d4f6552 Reverting gaba 2016-11-29 11:17:27 -08:00
  • 9fcd7b8d3a retreiving comments based on settings was backwards Riley Davis 2016-11-29 12:16:51 -07:00
  • 27eb341fa8 Fix users and comments as a merge was weird before. gaba 2016-11-29 10:56:44 -08:00
  • a375bf638a Merge branch 'master' into ban-user gaba 2016-11-29 10:42:46 -08:00
  • dafd849b0e Merge branch 'master' into stream-e2e Wyatt Johnson 2016-11-29 10:48:16 -07:00
  • 3c903ddd6d Merge branch 'master' into stream-e2e Wyatt Johnson 2016-11-29 10:41:50 -07:00
  • 5485a446f3 Merge pull request #101 from coralproject/bio Riley Davis 2016-11-29 10:41:40 -07:00
  • 8218d0c18e Merge branch 'master' into bio Riley Davis 2016-11-29 10:36:20 -07:00
  • cd61ae74b8 Merge pull request #108 from coralproject/asset-searching Wyatt Johnson 2016-11-29 10:06:00 -07:00
  • 7f1deffab4 Merge branch 'master' into asset-searching Wyatt Johnson 2016-11-29 10:02:41 -07:00
  • 20ef93c0af Test db clear (#116) David Jay 2016-11-29 11:44:54 -05:00
  • ac17fc2cc6 Added asset settings + improved tests for routes Wyatt Johnson 2016-11-28 17:13:11 -07:00
  • a5de52aeb9 merge Belen Curcio 2016-11-29 13:57:14 -03:00
  • 86faf504bb changes Belen Curcio 2016-11-29 13:56:26 -03:00
  • ea2ee68ed6 Test db clear (#116) David Jay 2016-11-29 11:44:54 -05:00
  • 9533aa59b6 Merge pull request #114 from coralproject/asset-settings David Jay 2016-11-29 11:37:08 -05:00
  • 735f2d09ad Merge branch 'master' into asset-searching Dan Zajdband 2016-11-29 11:36:18 -05:00
  • 7e7aa5ffb8 Merge branch 'master' into asset-settings David Jay 2016-11-29 11:24:14 -05:00
  • b36d905046 Merge pull request #104 from coralproject/fix/iframe-injection David Jay 2016-11-29 11:23:16 -05:00
  • 55afe36e3b Renaming Belen Curcio 2016-11-29 06:24:13 -03:00
  • cf93a48186 Merge branch 'master' into asset-searching Wyatt Johnson 2016-11-28 17:21:06 -07:00
  • 36e0e62471 Merge branch 'master' into fix/iframe-injection Wyatt Johnson 2016-11-28 17:21:03 -07:00
  • 29f378b863 Merge branch 'master' into bio Wyatt Johnson 2016-11-28 17:20:58 -07:00
  • ad4066407a Merge branch 'master' into guides Wyatt Johnson 2016-11-28 17:17:28 -07:00
  • fd9636dc9d Merge branch 'master' into asset-settings Wyatt Johnson 2016-11-28 17:16:39 -07:00
  • 3448752f6f Added asset settings + improved tests for routes Wyatt Johnson 2016-11-28 17:13:11 -07:00
  • abedb36791 Merge branch 'master' into ban-user gaba 2016-11-28 16:04:15 -08:00