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

Commit Graph

  • 5f2f70fd51 Fixing bug when adding users to redux. David Jay 2016-11-28 18:59:27 -05:00
  • aa048365bd Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix David Jay 2016-11-28 18:43:20 -05:00
  • 00858e467b Merge pull request #112 from coralproject/more-getinit David Jay 2016-11-28 18:43:06 -05:00
  • 0e3cd001e9 merge master riley 2016-11-28 16:38:25 -07:00
  • 6cd3d679d3 Merge pull request #111 from coralproject/return-all-settings Riley Davis 2016-11-28 16:30:46 -07:00
  • 01e7150dd1 Merge branch 'master' into return-all-settings Riley Davis 2016-11-28 16:26:00 -07:00
  • ce9d1e6c2d Merge pull request #109 from coralproject/settings-in-stream Riley Davis 2016-11-28 16:23:27 -07:00
  • c0a9ea9905 Returning all settings from api/v1/settings. David Jay 2016-11-28 18:19:07 -05:00
  • d5ff0f8f28 keep it DRY. add getInit all over the place. update tests Riley Davis 2016-11-28 16:18:19 -07:00
  • 461e80e260 Removing switch in steam endpoint. David Jay 2016-11-28 17:43:24 -05:00
  • 79cda54be2 Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix David Jay 2016-11-28 17:28:41 -05:00
  • 7cf05bbdca Merge branch 'master' of https://github.com/coralproject/talk into settings-in-stream David Jay 2016-11-28 17:25:07 -05:00
  • 823c223cf1 Adding settings to redux store from stream. David Jay 2016-11-28 17:11:37 -05:00
  • ab46c020d9 Added asset searching Wyatt Johnson 2016-11-28 15:01:13 -07:00
  • ca5049feeb Adding settings to stream. David Jay 2016-11-28 16:52:00 -05:00
  • 1110cd9582 Merge pull request #106 from coralproject/kue-redis-fix Wyatt Johnson 2016-11-28 14:14:15 -07:00
  • d882e4965e Merge branch 'master' into kue-redis-fix Wyatt Johnson 2016-11-28 14:06:47 -07:00
  • 616dd534d9 Moved kue redis connector Wyatt Johnson 2016-11-28 14:05:06 -07:00
  • 144e716db9 Merge branch 'master' into ban-user gaba 2016-11-28 13:00:56 -08:00
  • 8af300a9ec Adding users, comments, and actions to endpoint and moving to store. David Jay 2016-11-28 15:51:15 -05:00
  • 9c3edd2ed5 merge Belen Curcio 2016-11-28 17:41:26 -03:00
  • 613a165325 merge Belen Curcio 2016-11-28 17:40:22 -03:00
  • 0cdc010124 Merge pull request #103 from coralproject/logout Belén Curcio 2016-11-28 17:39:37 -03:00
  • 67d9bc2e3a Disable selection Belen Curcio 2016-11-28 17:36:35 -03:00
  • 31b0453e82 Merge branch 'master' into logout Gabriela Rodríguez Berón 2016-11-28 12:33:42 -08:00
  • a9e2217e29 Merged branch master into bio Riley Davis 2016-11-28 13:21:53 -07:00
  • 6974f30c73 Merge branch 'master' into ban-user gaba 2016-11-28 12:11:46 -08:00
  • 109b35951e Merge pull request #102 from coralproject/config-auth-fix David Erwin 2016-11-28 15:11:19 -05:00
  • 67d54be0d9 Remove space. gaba 2016-11-28 12:11:05 -08:00
  • f6e423e945 Fixed linting issues Dan Zajdband 2016-11-28 15:09:26 -05:00
  • bd6bc62733 Merged master into bio riley 2016-11-28 12:49:43 -07:00
  • 25d53116f7 remove unused var Riley Davis 2016-11-28 12:49:29 -07:00
  • 1ec7435ef4 Merge branch 'master' into ban-user gaba 2016-11-28 11:41:31 -08:00
  • 552e174b0d fix(embed): Disabled framing middleware enabling placing the comment box in third-party sites. In the future we will count with a whitelist so we can adjust the middleware Dan Zajdband 2016-11-28 14:23:22 -05:00
  • d384a69111 Main Tabs Belen Curcio 2016-11-28 15:56:14 -03:00
  • 0d7014f77a add helpers to talk-adapter Riley Davis 2016-11-28 11:50:25 -07:00
  • 98c6ef5162 Merge branch 'master' into config-auth-fix Riley Davis 2016-11-28 11:30:28 -07:00
  • b0f01cf00f Initial commit of asset queuing (#97) Wyatt Johnson 2016-11-28 11:29:39 -07:00
  • ee0e0ea9ed import belen's fetch helpers Riley Davis 2016-11-28 11:17:41 -07:00
  • 6714082b99 master merge Belen Curcio 2016-11-28 14:57:16 -03:00
  • c0eb202858 small refactor on items actions Riley Davis 2016-11-28 10:57:15 -07:00
  • d10870c6bb dispatch update for adding comemnts Riley Davis 2016-11-28 10:54:10 -07:00
  • 979b55180e Merge branch 'master' into guides David Erwin 2016-11-28 12:45:25 -05:00
  • 1dc7db9081 Structure Belen Curcio 2016-11-28 14:43:43 -03:00
  • c1a7b95705 Merge pull request #99 from coralproject/upsertting-actions David Erwin 2016-11-28 12:34:24 -05:00
  • 5bb386e16a Structure Belen Curcio 2016-11-28 14:25:30 -03:00
  • b22a76536c Merge branch 'master' into upsertting-actions Wyatt Johnson 2016-11-28 10:21:03 -07:00
  • d34cbc7870 Moved the action insert into the action model. Wyatt Johnson 2016-11-28 10:19:33 -07:00
  • 9d8968f1ce Corrected action upserting functionality Wyatt Johnson 2016-11-28 10:14:13 -07:00
  • 4d916be170 Working tabs Belen Curcio 2016-11-27 20:54:41 -03:00
  • 3ebdca33f3 Logout func Belen Curcio 2016-11-27 19:37:17 -03:00
  • 2d39dd81e4 Merge pull request #95 from coralproject/deprecate-stream-preview David Erwin 2016-11-25 12:00:51 -05:00
  • cb31caed4b Update comments David Erwin 2016-11-25 11:47:00 -05:00
  • a022ef8a52 Restore embed/stream.ejs David Erwin 2016-11-25 10:50:30 -05:00
  • 93cd4ea74c Remove non-standard stream embed template David Erwin 2016-11-25 10:43:32 -05:00
  • 7a6ea34468 Remove the preview link David Erwin 2016-11-25 10:42:38 -05:00
  • bb8570a3d4 Merge pull request #94 from coralproject/issue-89 David Erwin 2016-11-25 10:39:44 -05:00
  • 6663e59fb3 Merge branch 'master' into issue-89 David Erwin 2016-11-25 10:36:36 -05:00
  • ec746f1ba1 Merge pull request #93 from coralproject/authorization David Erwin 2016-11-25 10:36:17 -05:00
  • c0de7a40c3 Merge branch 'master' into issue-89 David Erwin 2016-11-25 10:31:55 -05:00
  • 28520bfd4a add get comments by user endpoint. refactor getStream to be functional programming Riley Davis 2016-11-23 17:14:51 -07:00
  • 66de272c56 typos and such Riley Davis 2016-11-23 13:38:24 -07:00
  • 71d4ddf030 create comment history class Riley Davis 2016-11-23 13:28:20 -07:00
  • e9fdb2cc00 Merge branch 'issue-89' into ban-user gaba 2016-11-22 17:20:53 -08:00
  • 8166ae90c9 Merge branch 'master' into ban-user gaba 2016-11-22 17:16:59 -08:00
  • e5c02c4274 The field is action_type and not action. gaba 2016-11-22 17:14:24 -08:00
  • 29a8b686b3 Merge branch 'master' into authorization Wyatt Johnson 2016-11-22 17:23:14 -07:00
  • 325162cb3e Added authorization pieces + test functions Wyatt Johnson 2016-11-22 17:15:14 -07:00
  • 78f751344a Update PULL_REQUEST_TEMPLATE.md Wyatt Johnson 2016-11-22 17:01:48 -07:00
  • a06d1d4bbb Merge branch 'master' into stream-e2e David Jay 2016-11-22 18:58:54 -05:00
  • 9a98ccc846 Commenting out blocked tests and log statements. David Jay 2016-11-22 18:48:45 -05:00
  • 5ab3fba818 Setting env variables properly in tests. David Jay 2016-11-22 18:45:11 -05:00
  • a192c08496 Merge branch 'master' into ban-user gaba 2016-11-22 14:53:13 -08:00
  • ef2eef8b7f Merge branch 'ban-user' of github.com:coralproject/talk into ban-user gaba 2016-11-22 14:52:52 -08:00
  • 822e13914a Fix changeStatus gaba 2016-11-22 12:32:33 -08:00
  • 30547ad2ff Merge pull request #88 from coralproject/reply-update Kim Gardner 2016-11-22 17:18:12 -05:00
  • 6e6ba89706 Hiding reply box on post. David Jay 2016-11-22 16:51:22 -05:00
  • dea62d8895 Fixing bug with reply author name. David Jay 2016-11-22 16:16:10 -05:00
  • 0d4a029529 Merge pull request #87 from coralproject/add-https-to-script David Jay 2016-11-22 16:13:53 -05:00
  • d04812fd36 Adding https and accessability to embed code. David Jay 2016-11-22 16:09:36 -05:00
  • 18bfabfd43 Moving configuration setting to shared function David Jay 2016-11-22 16:02:57 -05:00
  • 2a19399b81 Moving configuration setting to shared function David Jay 2016-11-22 16:01:50 -05:00
  • 32d715e784 Merge pull request #86 from coralproject/fix-icon Gabriela Rodríguez Berón 2016-11-22 12:44:23 -08:00
  • e40d5312da Adding premod off reply test. David Jay 2016-11-22 15:36:52 -05:00
  • 1eb2d04136 Icon was missing gaba 2016-11-22 12:35:43 -08:00
  • ff6ee76d3d Fix changeStatus gaba 2016-11-22 12:32:33 -08:00
  • 4035ed02c2 Adding test env variables. David Jay 2016-11-22 15:29:45 -05:00
  • 3030bf4f22 Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e David Jay 2016-11-22 15:04:36 -05:00
  • 25c40fc212 Applying client.perform consistently. David Jay 2016-11-22 14:29:11 -05:00
  • 654e3580e7 Adding second test. David Jay 2016-11-22 13:49:21 -05:00
  • f7c4e8bf24 Merge branch 'master' into ban-user gaba 2016-11-22 09:35:06 -08:00
  • 7dc7df2601 Merge branch 'master' into ban-user gaba 2016-11-22 09:30:52 -08:00
  • d5d02aef32 Merge pull request #79 from coralproject/user-integration Gabriela Rodríguez Berón 2016-11-22 09:30:27 -08:00
  • 2e54a51678 Merge branch 'master' into user-integration David Jay 2016-11-22 12:09:29 -05:00
  • 5ff27be160 Add CONTRIBUTING.md first draft David Erwin 2016-11-22 11:59:54 -05:00
  • ed6a421609 Merge pull request #83 from coralproject/fixes Wyatt Johnson 2016-11-22 09:32:51 -07:00
  • 8eacb01484 Added fixes for prod Wyatt Johnson 2016-11-22 09:31:54 -07:00
  • 5c532dab5e Merge branch 'master' of https://github.com/coralproject/talk into user-integration David Jay 2016-11-22 11:11:52 -05:00
  • 9ecb95dc71 Merge pull request #82 from coralproject/admin Wyatt Johnson 2016-11-22 08:36:10 -07:00
  • 00a8c59c96 Merge branch 'master' into admin Wyatt Johnson 2016-11-22 08:31:21 -07:00