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

Commit Graph

  • d228b30f36 Merge branch 'master' into asset-status gaba 2016-12-12 10:34:05 -08:00
  • 8da59c166e Merge branch 'master' of github.com:coralproject/talk gaba 2016-12-12 10:33:57 -08:00
  • 749a5d9853 Merge branch 'master' into use-js-while-rendering Riley Davis 2016-12-12 07:34:36 -10:00
  • 55df0f3036 Merge branch 'master' into configure-bug Belén Curcio 2016-12-12 14:08:32 -03:00
  • 7fba082c02 Merge branch 'master' into asset-status Gabriela Rodríguez Berón 2016-12-11 18:56:07 -10:00
  • 93183015e0 Merge pull request #158 from coralproject/simplify-community-page Belén Curcio 2016-12-11 23:29:53 -03:00
  • 42ff3ae4a2 filter restricted tabs Belen Curcio 2016-12-11 23:10:25 -03:00
  • a872128a55 logOut Stae Belen Curcio 2016-12-11 22:52:47 -03:00
  • 5e21102c2f Fix routes and tests for asset status change. gaba 2016-12-10 14:01:24 -10:00
  • 81071eacd6 It adds a status field and change the name of the closedAt and closedMessage to record changes from the status from closed to open too. gaba 2016-12-10 14:00:46 -10:00
  • c18f885277 Merge branch 'master' into use-js-while-rendering Riley Davis 2016-12-09 15:06:51 -10:00
  • 9e353eaae8 Merge branch 'master' into simplify-community-page Riley Davis 2016-12-09 15:06:43 -10:00
  • 116368dcd3 Merge pull request #156 from coralproject/update-users-api Riley Davis 2016-12-09 15:06:09 -10:00
  • 84453ef7bd Merge branch 'master' into use-js-while-rendering Riley Davis 2016-12-09 14:53:56 -10:00
  • 0f7e4bd239 simplify Community page Riley Davis 2016-12-09 14:52:17 -10:00
  • 7bfd9e2e71 remove lodash implementation Riley Davis 2016-12-09 14:48:29 -10:00
  • 74c4d812cd less changes Riley Davis 2016-12-09 14:39:16 -10:00
  • 7186c2b060 have moderation queue use proper mapStateToProps Riley Davis 2016-12-09 14:38:29 -10:00
  • faca09dbd2 Merge branch 'master' of github.com:coralproject/talk into update-users-api David Jay 2016-12-09 19:35:09 -05:00
  • 1c670835d1 Merge pull request #151 from coralproject/flag-bio Kim Gardner 2016-12-09 14:30:19 -10:00
  • d229d5a96f Updating route to davidjay. David Jay 2016-12-09 19:28:19 -05:00
  • 02015bc5c3 Merge branch 'master' into flag-bio Gabriela Rodríguez Berón 2016-12-09 14:26:28 -10:00
  • b05f4cfb16 remove logs Riley Davis 2016-12-09 14:25:24 -10:00
  • 2f5505c5f3 Merge pull request #152 from coralproject/fix-spelling Riley Davis 2016-12-09 14:24:48 -10:00
  • 7732aa4abe typo Riley Davis 2016-12-09 14:20:46 -10:00
  • ffc2d0c86a Spanish translations. gaba 2016-12-09 14:16:27 -10:00
  • 04462482c9 Merged update-comment-list into use-js-while-rendering riley 2016-12-09 14:14:20 -10:00
  • a80dd953c8 update ModerationQueue and CommentStream to not use immutable.js deep in the stack Riley Davis 2016-12-09 14:13:48 -10:00
  • 5279ad3305 Typo Kim Gardner 2016-12-09 13:01:54 -10:00
  • c27c379b36 Merge branch 'master' into flag-bio David Jay 2016-12-09 17:50:28 -05:00
  • 787486bccf Posting bio flags to backend. David Jay 2016-12-09 17:46:45 -05:00
  • be760bd9d7 Merge pull request #133 from coralproject/flag-username David Jay 2016-12-09 16:58:50 -05:00
  • 9375d8b47d Merge branch 'flag-username' into flag-bio David Jay 2016-12-09 16:46:56 -05:00
  • 1c2ef760ef remove cruft by pulling out some immutable.js stuff Riley Davis 2016-12-09 11:46:04 -10:00
  • ecbdc5d0b4 Making itemType consistent on backend. David Jay 2016-12-09 16:43:04 -05:00
  • f5ac576187 Merge branch 'master' of github.com:coralproject/talk into flag-username David Jay 2016-12-09 16:33:06 -05:00
  • acd57e4f68 Avoiding double-posting. David Jay 2016-12-09 16:15:33 -05:00
  • 403838b983 Merge pull request #121 from coralproject/ban-user Gabriela Rodríguez Berón 2016-12-09 10:55:45 -10:00
  • 90ef16e111 Merge branch 'master' of github.com:coralproject/talk into flag-username David Jay 2016-12-09 15:51:13 -05:00
  • 8e432aad46 Adding Done button to last step of flagging menu. David Jay 2016-12-09 15:47:38 -05:00
  • f29c0a3a09 Merge branch 'master' into ban-user Gabriela Rodríguez Berón 2016-12-09 10:43:55 -10:00
  • 8ea61c3a05 Merge pull request #122 from coralproject/wordlist Gabriela Rodríguez Berón 2016-12-09 10:29:23 -10:00
  • ba169147e7 Merge branch 'master' into ban-user Gabriela Rodríguez Berón 2016-12-09 10:28:32 -10:00
  • 922fc630a4 Addressing null item_id in user flagging. David Jay 2016-12-09 15:27:11 -05:00
  • 1fefd3c8b4 Merge branch 'master' into wordlist Gabriela Rodríguez Berón 2016-12-09 10:26:39 -10:00
  • 78448b85c1 Updating to reflect new comment api. David Jay 2016-12-09 15:11:13 -05:00
  • 14cd482608 Merge pull request #129 from coralproject/asset-comment-settings Gabriela Rodríguez Berón 2016-12-09 10:09:51 -10:00
  • 44ae886af7 put some space between buttons on the banuserdialog Riley Davis 2016-12-09 10:08:55 -10:00
  • 8b850a8d33 Fix the message. gaba 2016-12-09 09:29:27 -10:00
  • d9b778fa74 A few translations for the spanish for this feature. gaba 2016-12-09 09:19:08 -10:00
  • 01dc4e4144 fix merge. gaba 2016-12-09 08:30:30 -10:00
  • 15557c16e2 Merge branch 'master' into ban-user gaba 2016-12-09 08:28:46 -10:00
  • bf01543a88 Merge branch 'master' of github.com:coralproject/talk into flag-username David Jay 2016-12-09 13:26:48 -05:00
  • b1018823d3 Updating tests and removing unecessary log statement. David Jay 2016-12-09 13:24:36 -05:00
  • bfe188eb5c Cleaning up from merge. David Jay 2016-12-09 13:17:50 -05:00
  • e032a5521e Merge branch 'master' of github.com:coralproject/talk into wordlist David Jay 2016-12-09 13:05:11 -05:00
  • ee187469e0 Moving FlagComment to seperate file. David Jay 2016-12-09 12:54:15 -05:00
  • 3ef8f295c3 newConfig update Belen Curcio 2016-12-09 12:59:17 -03:00
  • a3cae4a608 Merge branch 'master' of github.com:coralproject/talk into asset-comment-settings Belen Curcio 2016-12-09 12:55:32 -03:00
  • 47da346e13 Merge pull request #134 from coralproject/close-comments Belén Curcio 2016-12-09 12:55:08 -03:00
  • b33713e723 Changes to master Belen Curcio 2016-12-09 12:32:59 -03:00
  • e4df3bcafc Merge branch 'master' of github.com:coralproject/talk into asset-comment-settings Belen Curcio 2016-12-09 12:28:40 -03:00
  • 72ab489e61 Merge branch 'close-comments' of github.com:coralproject/talk into close-comments Dan Zajdband 2016-12-09 10:20:06 -05:00
  • 09ba535d68 Merge with master Dan Zajdband 2016-12-09 10:17:55 -05:00
  • c096c61302 Merge pull request #146 from coralproject/smtp-madness Kim Gardner 2016-12-08 18:39:32 -10:00
  • dd5c114dc2 don't use well-known email settings Riley Davis 2016-12-08 18:36:20 -10:00
  • 71d6b90993 SMall changes for PR. gaba 2016-12-08 18:29:15 -10:00
  • ecd3f5c347 IT removes duplicated code. gaba 2016-12-08 18:19:00 -10:00
  • a46ffe8ea6 It removes duplicated code. gaba 2016-12-08 18:16:37 -10:00
  • 9bfac3872e Moves banUser to users actions instead of comments actions. gaba 2016-12-08 18:16:17 -10:00
  • 0df1b9a498 Remove file that is not being used anymore. gaba 2016-12-08 16:37:05 -10:00
  • 82e3d73d2d Merge pull request #143 from coralproject/format-readme Kim Gardner 2016-12-08 13:38:03 -10:00
  • 1eb204f822 Merge branch 'master' into ban-user gaba 2016-12-08 13:28:12 -10:00
  • 0bbefa071e Merge branch 'master' into format-readme Riley Davis 2016-12-08 13:17:23 -10:00
  • cfb1b75b39 Merge pull request #137 from coralproject/payload-filtering Gabriela Rodríguez Berón 2016-12-08 13:08:12 -10:00
  • be632ada47 Merge branch 'master' into payload-filtering Gabriela Rodríguez Berón 2016-12-08 13:05:14 -10:00
  • 7ce44ccd8c More formatting Kim Gardner 2016-12-08 12:53:39 -10:00
  • b129d91e9f Merged branch payload-filtering into payload-filtering Riley Davis 2016-12-08 12:51:58 -10:00
  • 500dafbafa riley being anal Riley Davis 2016-12-08 12:51:45 -10:00
  • c8d0fae097 Fix formatting Kim Gardner 2016-12-08 12:50:12 -10:00
  • 26e3f1d851 Merge pull request #136 from coralproject/update-talk-docs Kim Gardner 2016-12-08 12:41:50 -10:00
  • 501df52cf8 Merge branch 'master' into update-talk-docs Kim Gardner 2016-12-08 12:37:05 -10:00
  • fa4ef2cab0 Merge branch 'master' of github.com:coralproject/talk into asset-comment-settings Belen Curcio 2016-12-08 19:34:10 -03:00
  • 77ae7f1329 Merge branch 'asset-comment-settings' of github.com:coralproject/talk into asset-comment-settings Belen Curcio 2016-12-08 19:33:39 -03:00
  • d95d9aa8e3 Merge branch 'master' into payload-filtering Wyatt Johnson 2016-12-08 17:28:50 -05:00
  • 7ee4f3c7cb Merge pull request #142 from coralproject/create-user-w-role Jeff Nelson 2016-12-08 12:27:45 -10:00
  • c90c125dbd Merge branch 'master' into create-user-w-role Wyatt Johnson 2016-12-08 17:24:47 -05:00
  • bc88cd1e9d Adjusted promise Wyatt Johnson 2016-12-08 17:23:31 -05:00
  • 4572d8e68e filter by premod status Riley Davis 2016-12-08 12:20:54 -10:00
  • a86b5f84ac Adds a role option when creating the user. gaba 2016-12-08 12:18:53 -10:00
  • 413db123c4 Type on comment. gaba 2016-12-08 12:18:19 -10:00
  • fed41e1fba Linted code Dan Zajdband 2016-12-08 16:59:29 -05:00
  • f0108e1434 Fixing bug in addItem in commentStream. David Jay 2016-12-08 16:55:42 -05:00
  • 104a00a22f Merge branch 'master' into update-talk-docs Kim Gardner 2016-12-08 11:52:35 -10:00
  • df712e4efe Merge branch 'master' into payload-filtering Wyatt Johnson 2016-12-08 16:15:32 -05:00
  • 42b2b5fd82 Merge pull request #139 from coralproject/revert-138-revert-128-status-history Wyatt Johnson 2016-12-08 16:15:24 -05:00
  • aaebbabef9 Revert "Revert "Status history"" Wyatt Johnson 2016-12-08 16:12:44 -05:00
  • a81125ae09 Merge pull request #138 from coralproject/revert-128-status-history Riley Davis 2016-12-08 11:09:17 -10:00
  • 9ea6c66744 Revert "Status history" David Erwin 2016-12-08 10:59:56 -10:00
  • aa7892ede7 Merge branch 'master' into payload-filtering Wyatt Johnson 2016-12-08 15:58:51 -05:00