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

Commit Graph

  • 23833886bb missing tab name Belen Curcio 2017-03-23 09:51:26 -03:00
  • 464539d6a3 missing tab name Belen Curcio 2017-03-23 09:50:18 -03:00
  • 375ff08584 Merge branch 'master' into reset-password-redirect Riley Davis 2017-03-22 18:45:40 -06:00
  • 849be3d5fd Merge branch 'master' into translations Gabriela Rodríguez Berón 2017-03-22 17:31:28 -07:00
  • 35c8e1b5f9 Check spanish translations gaba 2017-03-22 17:27:43 -07:00
  • 4cbd6ebad2 Mooore translations. gaba 2017-03-22 16:21:40 -07:00
  • ae96cb1e44 Merge branch 'master' into my-comments-ux Gabriela Rodríguez Berón 2017-03-22 16:18:45 -07:00
  • 4b0d0fed53 unused variable Riley Davis 2017-03-22 17:10:11 -06:00
  • fb2f8ef074 redirect to the parent url when resetting your password Riley Davis 2017-03-22 16:48:28 -06:00
  • c6401a2d08 Merge pull request #434 from coralproject/asset-url Riley Davis 2017-03-22 15:51:08 -06:00
  • 7af16471cd if the asset_url is not present, attempt to find the canonical link tag. if not, warn the user and strip the query params. Riley Davis 2017-03-22 15:37:27 -06:00
  • 27a8c994a8 Fixing more translations gaba 2017-03-22 13:19:08 -07:00
  • 0bae6fe76c design tweaks Belen Curcio 2017-03-22 17:06:41 -03:00
  • 1e54a997d6 Merge branch 'master' into my-comments-ux Belén Curcio 2017-03-22 16:25:06 -03:00
  • 85d235bf37 Merge branch 'my-comments-ux' of github.com:coralproject/talk into my-comments-ux Belen Curcio 2017-03-22 16:23:00 -03:00
  • d8e92968a5 Merge branch 'master' into admin-ux Riley Davis 2017-03-22 13:22:21 -06:00
  • 4f50e8f19c Removing tests for now until we find a better solution for this Belen Curcio 2017-03-22 16:19:05 -03:00
  • 78e7951ad7 Merge branch 'master' into translations gaba 2017-03-22 12:11:52 -07:00
  • 82068cd20e Merge pull request #370 from coralproject/story-138187767-mod-flag-names Gabriela Rodríguez Berón 2017-03-22 12:10:43 -07:00
  • 72e714a42c Translations into json gaba 2017-03-22 11:59:33 -07:00
  • 54015691fe Merge branch 'master' into translations gaba 2017-03-22 11:46:09 -07:00
  • d9af09d2a3 Email templates gaba 2017-03-22 11:43:03 -07:00
  • ae672d038c Merge branch 'master' into my-comments-ux Belén Curcio 2017-03-22 15:37:48 -03:00
  • 5729b03656 my-comments-ux Belen Curcio 2017-03-22 15:35:40 -03:00
  • 046cea5043 Merge branch 'master' into story-138187767-mod-flag-names gaba 2017-03-22 11:33:25 -07:00
  • d7ccfa4eda Merge pull request #431 from coralproject/remove-express-dep Gabriela Rodríguez Berón 2017-03-22 11:32:36 -07:00
  • ac6a116896 Only the name for the template. gaba 2017-03-22 11:21:41 -07:00
  • 49e4486b75 Merge pull request #426 from coralproject/no-reply-closed-streams David Erwin 2017-03-22 10:53:15 -04:00
  • 555b4517d8 move email templates into services/mailer. remove express app dep to render files Riley Davis 2017-03-22 12:00:30 -06:00
  • 71415877b3 comment tweaks Belen Curcio 2017-03-22 14:04:08 -03:00
  • 9782cf0b9d Mail SendSimple will not use app in the future but render from ejs. gaba 2017-03-22 10:01:39 -07:00
  • cd27ffe86a wip Belen Curcio 2017-03-22 13:37:44 -03:00
  • 6a5f667336 hover, menu order Belen Curcio 2017-03-22 13:20:26 -03:00
  • b51cbebe1d Merge branch 'master' into story-138187767-mod-flag-names Riley Davis 2017-03-22 09:57:29 -06:00
  • 2016546ca3 Merge pull request #426 from coralproject/no-reply-closed-streams David Erwin 2017-03-22 10:53:15 -04:00
  • 63fca6ba4c Merge branch 'master' into no-reply-closed-streams David Erwin 2017-03-22 10:45:02 -04:00
  • 7522bd9cd6 Sends a mail to the suspended user. gaba 2017-03-21 15:06:02 -07:00
  • 9cf974d098 Merge pull request #427 from coralproject/view-more-no-worky David Erwin 2017-03-21 17:59:40 -04:00
  • 072d332027 Merge branch 'master' into view-more-no-worky David Erwin 2017-03-21 17:54:37 -04:00
  • 80ff090c45 better tracking of new/old comments Riley Davis 2017-03-21 15:52:26 -06:00
  • a61b784d2b Merge pull request #425 from coralproject/reCAPTCHA-docs Riley Davis 2017-03-21 15:03:42 -06:00
  • 8804b5b63f Merge branch 'master' into reCAPTCHA-docs Riley Davis 2017-03-21 14:59:59 -06:00
  • d7adf0c792 Merge pull request #423 from coralproject/stream-sorting David Erwin 2017-03-21 16:47:27 -04:00
  • 442e384298 Merge branch 'master' into no-reply-closed-streams Riley Davis 2017-03-21 13:21:01 -06:00
  • afaf9dd26d Merge branch 'master' into stream-sorting Riley Davis 2017-03-21 13:20:53 -06:00
  • 94619ca291 actually pass the asset_id instead of undefined Riley Davis 2017-03-21 12:30:27 -06:00
  • b9fc1a6186 Merge branch 'master' into view-more-no-worky Belén Curcio 2017-03-21 15:08:27 -03:00
  • 481c22b7dd Merge pull request #429 from coralproject/documentation-fix David Erwin 2017-03-21 13:44:57 -04:00
  • b9960c3cc7 Merge branch 'master' into story-138187767-mod-flag-names Gabriela Rodríguez Berón 2017-03-21 10:42:48 -07:00
  • a09d41053f It uses Button instead of FabButton from coral-ui. gaba 2017-03-21 10:36:21 -07:00
  • c8dc3c5ad2 disable replies too Riley Davis 2017-03-21 10:27:11 -06:00
  • e5a2d627df Fixed plugin examples Wyatt Johnson 2017-03-21 10:03:24 -06:00
  • ffc5379e11 Merge branch 'master' into stream-sorting Riley Davis 2017-03-21 09:12:04 -06:00
  • f5d1e0df8f Merge branch 'master' into no-reply-closed-streams Riley Davis 2017-03-21 09:11:54 -06:00
  • 894ea634c9 Merge branch 'master' into view-more-no-worky Riley Davis 2017-03-21 09:09:57 -06:00
  • 033502626c Merge pull request #428 from coralproject/load-more-fix Wyatt Johnson 2017-03-21 08:07:00 -06:00
  • 9bfc4b5815 how did this get duplicated? Riley Davis 2017-03-20 16:26:52 -06:00
  • 546dd63d8c why did only this get changed? Riley Davis 2017-03-20 16:21:01 -06:00
  • e5bac88bb5 Merge branch 'master' into story-138187767-mod-flag-names gaba 2017-03-20 15:02:38 -07:00
  • 20348d5f05 Fixed bug in loading more comments Wyatt Johnson 2017-03-20 15:58:33 -06:00
  • 0383d86021 load more replies if there are currently no replies Riley Davis 2017-03-20 15:09:45 -06:00
  • fb503798e8 use the reply id so we don't get weird behavior. fix a console warning riley 2017-03-20 14:46:59 -06:00
  • be2ecf0838 Adds user and message to flagaction to display in FE. gaba 2017-03-20 13:38:11 -07:00
  • 9e76ca5d27 Fix CSS. gaba 2017-03-20 12:37:21 -07:00
  • d7e554a055 hide reply button if stream is closed riley 2017-03-20 13:01:38 -06:00
  • eceddf109a Added reCAPTCHA docs Wyatt Johnson 2017-03-20 12:35:22 -06:00
  • ac8c73c4e9 Merge branch 'master' into story-138187767-mod-flag-names gaba 2017-03-20 07:21:29 -07:00
  • 9ccdaec063 Merge pull request #422 from coralproject/plugin-patch David Erwin 2017-03-17 12:50:17 -04:00
  • 69ad11adf5 Update Dockerfile Wyatt Johnson 2017-03-17 10:46:45 -06:00
  • af93953b17 Merge pull request #421 from coralproject/plugins David Erwin 2017-03-17 12:35:51 -04:00
  • 17deea5b96 Merge branch 'master' into plugins David Erwin 2017-03-17 12:31:40 -04:00
  • a7908f3399 Merge pull request #418 from coralproject/recaptcha-fix Riley Davis 2017-03-17 10:24:22 -06:00
  • 09ec2dba94 combine destructuring Riley Davis 2017-03-17 10:18:07 -06:00
  • 46ecf0c06f Renamed pageData -> config Wyatt Johnson 2017-03-17 08:37:58 -06:00
  • b35170484e Merge branch 'master' into recaptcha-fix Wyatt Johnson 2017-03-17 08:01:47 -06:00
  • 8eac8d6890 Merge branch 'master' into recaptcha-fix Wyatt Johnson 2017-03-16 11:59:56 -06:00
  • dfffbbe619 bug fix Wyatt Johnson 2017-03-16 11:11:24 -06:00
  • 5768d30a7a Added new pageData action/reducer Wyatt Johnson 2017-03-16 11:07:38 -06:00
  • 2fff47c753 Merge branch 'master' into plugins gaba 2017-03-20 10:46:30 -07:00
  • 74a561a770 Merge pull request #420 from coralproject/view-more-bug Kim Gardner 2017-03-17 09:05:24 -04:00
  • 9d64639f8e differentiate between top- and comment-level LoadMore Riley Davis 2017-03-16 15:35:38 -06:00
  • 316aa12481 add spanish translations Riley Davis 2017-03-16 14:54:09 -06:00
  • 73c59cb137 show different copy per # of replies Riley Davis 2017-03-16 14:37:29 -06:00
  • 369d867e77 Merge pull request #419 from coralproject/dashboard-reload-bugfix Kim Gardner 2017-03-16 13:55:17 -04:00
  • 517ede1977 dashboard reload fix Riley Davis 2017-03-16 11:45:10 -06:00
  • 5514f45ab3 Merge pull request #412 from coralproject/recaptcha-support Kim Gardner 2017-03-16 12:16:50 -04:00
  • 2a66a78d41 Merge branch 'master' into recaptcha-support gaba 2017-03-20 10:37:18 -07:00
  • 61a2f1ed36 Merge pull request #417 from coralproject/dashboard-bug Kim Gardner 2017-03-16 12:07:49 -04:00
  • d2e2eef046 do a null check. Riley Davis 2017-03-16 09:28:17 -06:00
  • a2833538a7 move CountdownTimer to its own component gaba 2017-03-20 10:26:12 -07:00
  • ecb1c51a9f Merge pull request #415 from coralproject/config-shuffle Kim Gardner 2017-03-15 14:12:24 -04:00
  • 1a83ffe482 Merge branch 'master' into config-shuffle Kim Gardner 2017-03-15 13:30:43 -04:00
  • 2c2cbb720b Merge pull request #416 from coralproject/login-error-fix Kim Gardner 2017-03-15 13:28:45 -04:00
  • 92055c7814 correctly handle error when not logged in Riley Davis 2017-03-15 11:16:13 -06:00
  • e975d6d809 move pre-mod links riley 2017-03-15 10:15:47 -06:00
  • 8459c31b42 Merge pull request #414 from coralproject/streams-to-stories Kim Gardner 2017-03-15 11:28:11 -04:00
  • 63c3d02329 change Stream > Story sometimes Riley Davis 2017-03-14 16:30:02 -06:00
  • dedcb87435 Merge branch 'master' into recaptcha-support Riley Davis 2017-03-14 15:56:20 -06:00
  • 22753e1e14 Merge pull request #411 from coralproject/remove-like-widget Kim Gardner 2017-03-14 17:45:26 -04:00
  • 7232d09eb3 Merge branch 'master' into remove-like-widget gaba 2017-03-20 07:47:37 -07:00