Commit Graph

  • acc2e00c54 Merge pull request #1264 from coralproject/reply Wyatt Johnson 2018-01-10 11:55:05 -07:00
  • 7d6fd69a3b Merge branch 'next' into reply Belén Curcio 2018-01-10 15:53:39 -03:00
  • 75d1bb2f22 Merge branch 'next' into firefox-actionmenu-deselect Wyatt Johnson 2018-01-10 10:40:52 -07:00
  • 1e372b583a Merge pull request #1265 from coralproject/lodash-size-opt Wyatt Johnson 2018-01-10 10:40:35 -07:00
  • 1b373b5af4 Merge branch 'next' into lodash-size-opt Kiwi 2018-01-10 18:39:57 +01:00
  • d0d9a38177 Merge branch 'next' into firefox-actionmenu-deselect Kiwi 2018-01-10 18:39:54 +01:00
  • 9d8867be9d Merge branch 'next' into reply Kiwi 2018-01-10 18:39:45 +01:00
  • fb7ff249b8 Merge pull request #1266 from coralproject/circle-next Wyatt Johnson 2018-01-10 10:38:56 -07:00
  • bbdd69b2a0 removed debug... Wyatt Johnson 2018-01-10 10:34:11 -07:00
  • 3687fc1702 adjusted build script to build the next branch and release it Wyatt Johnson 2018-01-10 10:31:43 -07:00
  • caf2b88ee8 Fix typo Chi Vinh Le 2018-01-10 18:29:03 +01:00
  • 2ef3e29e7d Merge branch 'reply' of github.com:coralproject/talk into reply okbel 2018-01-10 14:08:58 -03:00
  • 6a3be92a4c Merge branch 'next' into reply Kiwi 2018-01-10 18:08:12 +01:00
  • 845c99de10 Updated tests okbel 2018-01-10 13:57:16 -03:00
  • 9c7b6e007a Merge branch 'reply' of github.com:coralproject/talk into reply okbel 2018-01-10 13:55:07 -03:00
  • 4c3d3fb4b0 Updated tests okbel 2018-01-10 13:54:43 -03:00
  • 7036aa5bad Use lodash with es modules Chi Vinh Le 2018-01-10 17:54:06 +01:00
  • 1898941097 Merge branch 'master' into reply Belén Curcio 2018-01-10 12:31:10 -03:00
  • 24f7405065 remove uncommitted okbel 2018-01-10 12:29:47 -03:00
  • e1ead8f500 Adding e2e for the stream - open and closed asset features okbel 2018-01-10 11:43:34 -03:00
  • 5db8209182 Removing replyButton in Stream is closed okbel 2018-01-10 11:21:24 -03:00
  • 9c75f3fa59 Adding missing proptypes okbel 2018-01-10 11:03:33 -03:00
  • 25ac66ec59 Merge branch 'next' into firefox-actionmenu-deselect Belén Curcio 2018-01-10 10:46:48 -03:00
  • bdcc9273f1 Add some margin to loadmore Chi Vinh Le 2018-01-10 12:22:23 +01:00
  • dca85ad127 Merge branch 'next' into firefox-actionmenu-deselect Kiwi 2018-01-10 12:19:58 +01:00
  • 36f7c31a03 Fix deselect bug of action menu in ff Chi Vinh Le 2018-01-10 12:16:28 +01:00
  • 63bd6309d3 Merge branch 'master' into next Kim Gardner 2018-01-09 17:22:47 -05:00
  • bf76f0453b Merge pull request #1261 from coralproject/losowsky-patch-1 Kim Gardner 2018-01-09 17:04:01 -05:00
  • 00677148b9 Merge branch 'master' into losowsky-patch-1 Kim Gardner 2018-01-09 16:53:15 -05:00
  • 7bdfb55a1c Merge pull request #1260 from coralproject/embed-events Wyatt Johnson 2018-01-09 14:53:04 -07:00
  • c43051c6dd Small grammar fixes Andrew Losowsky 2018-01-09 16:20:32 -05:00
  • 20453dfddd refactor to cleanup Wyatt Johnson 2018-01-09 13:47:50 -07:00
  • 20f9bba845 Merge branch 'master' into embed-events Wyatt Johnson 2018-01-09 11:25:22 -07:00
  • 25e29cb79a extracted asset url Wyatt Johnson 2018-01-09 11:01:10 -07:00
  • 7f25f46ac0 extracted more funcs Wyatt Johnson 2018-01-09 10:51:43 -07:00
  • d3c1286d1a extracted events from opts Wyatt Johnson 2018-01-09 10:47:58 -07:00
  • 13bf20daf0 Merge pull request #1259 from coralproject/fix-set-username Kim Gardner 2018-01-09 12:39:20 -05:00
  • e61c09f017 Merge branch 'next' into fix-set-username Kim Gardner 2018-01-09 11:52:29 -05:00
  • 395793445c Merge branch 'master' into next Kim Gardner 2018-01-09 11:52:20 -05:00
  • abc6cf6366 Merge pull request #1258 from coralproject/toxic-update Kim Gardner 2018-01-09 11:51:59 -05:00
  • eb33eb72d1 Merge branch 'master' into toxic-update Kim Gardner 2018-01-09 11:44:44 -05:00
  • 1a39635c0e Merge pull request #1257 from larrylizhao/feature/RefineTranslation Kim Gardner 2018-01-09 11:43:23 -05:00
  • 13347a6baf Merge branch 'next' into fix-set-username Kiwi 2018-01-09 15:07:56 +01:00
  • ff016e22fe Adding TALK_PERSPECTIVE_DO_NOT_STORE to the docs okbel 2018-01-09 10:42:28 -03:00
  • 579644c910 Adding doNotStore okbel 2018-01-09 10:34:24 -03:00
  • 54b504eb8e typo okbel 2018-01-09 10:24:58 -03:00
  • 4490ea5202 Merge branch 'next' of github.com:coralproject/talk into next okbel 2018-01-09 10:13:07 -03:00
  • fb26d67e42 updated tests okbel 2018-01-09 10:12:26 -03:00
  • 07052824d7 updated tests okbel 2018-01-09 10:10:37 -03:00
  • a2eb474a5c Fully implement SetUsername Chi Vinh Le 2018-01-09 12:25:44 +01:00
  • 2bcb324582 Merge branch 'next' into fix-set-username Chi Vinh Le 2018-01-09 11:41:56 +01:00
  • 37d1f3361c Translation update to make it more appropriate. liz 2018-01-09 16:54:13 +08:00
  • 6e8b28cc8a Translation for hide off topic comments liz 2018-01-09 14:03:09 +08:00
  • 9513502667 Merge pull request #1255 from coralproject/fix-live-status-changes Wyatt Johnson 2018-01-08 11:52:27 -07:00
  • 55c2c00b49 Merge branch 'next' into fix-live-status-changes Wyatt Johnson 2018-01-08 11:36:06 -07:00
  • 8545be307d removed snakecase Wyatt Johnson 2018-01-08 11:17:11 -07:00
  • 04991a9856 Merge branch 'master' into next Wyatt Johnson 2018-01-08 11:14:17 -07:00
  • 978e1c8d4c fix to optional required param Wyatt Johnson 2018-01-08 11:04:29 -07:00
  • 6700698e52 Merge branch 'next' into fix-live-status-changes Wyatt Johnson 2018-01-08 10:56:54 -07:00
  • c0f266dfa5 Merge pull request #1256 from coralproject/docs-typo Wyatt Johnson 2018-01-08 10:56:41 -07:00
  • a40b287226 Use correct mutation and show errors Chi Vinh Le 2018-01-08 18:52:00 +01:00
  • 615be40b45 refactored mailer service with lodash! Wyatt Johnson 2018-01-08 10:43:10 -07:00
  • 99d66fef52 Docs typo Kim Gardner 2018-01-08 11:27:25 -05:00
  • c3a5da3ae6 Fix live status updates Chi Vinh Le 2018-01-08 16:00:20 +01:00
  • ec852601a4 Move ChangeUsername to the appropiate tab Chi Vinh Le 2018-01-08 15:50:41 +01:00
  • 791025b153 Fix change username not displaying errors Chi Vinh Le 2018-01-08 15:48:49 +01:00
  • be72e2effd Remove defunct refetch detection workaround Chi Vinh Le 2018-01-08 15:01:09 +01:00
  • 717d5e6566 Rename UnBan and UnSuspend Chi Vinh Le 2018-01-08 14:43:14 +01:00
  • c07ec23a20 hardened configuration Wyatt Johnson 2018-01-05 16:06:36 -07:00
  • 6260339508 user cli patches Wyatt Johnson 2018-01-05 15:32:36 -07:00
  • 10754a65c6 don't apply configuration from dotfiles during testing Wyatt Johnson 2018-01-05 12:12:54 -07:00
  • c3970a46a2 applied rename to graph mutation edges Wyatt Johnson 2018-01-05 12:11:32 -07:00
  • c9bc9a4b10 reintroduced the errors.ErrSameUsernameProvided Wyatt Johnson 2018-01-05 11:31:40 -07:00
  • 7b5993bc60 fixed wrong query logic Wyatt Johnson 2018-01-05 11:17:04 -07:00
  • b42cce5747 resolving pr concerns Wyatt Johnson 2018-01-05 11:12:35 -07:00
  • 9c595b7f84 Merge branch 'master' into next Wyatt Johnson 2018-01-05 11:10:32 -07:00
  • acdaaffd4e Add proptype Chi Vinh Le 2018-01-05 19:03:40 +01:00
  • c01b192a73 Mark onClickOutside not required Chi Vinh Le 2018-01-05 19:02:35 +01:00
  • 7538e6e8fd Remove unused state Chi Vinh Le 2018-01-05 18:57:12 +01:00
  • 49c350376b Use null instead of boolean Chi Vinh Le 2018-01-05 18:56:44 +01:00
  • 4a259d09e4 Fix styling for new x button Chi Vinh Le 2018-01-05 18:56:13 +01:00
  • 918aa6988b Adding a UI reducer to manage UI state okbel 2018-01-05 14:50:35 -03:00
  • 7e4831e309 styles.css is de-pre-ca-ted okbel 2018-01-05 14:30:28 -03:00
  • 14034c1364 Using button in the Drawer okbel 2018-01-05 14:24:21 -03:00
  • 5a379b2cd8 Adding line back okbel 2018-01-05 14:24:06 -03:00
  • ad6a663179 Merge pull request #1237 from coralproject/admin-pages Kim Gardner 2018-01-05 12:20:46 -05:00
  • b185d61993 Adding clarifications okbel 2018-01-05 07:49:37 -03:00
  • 9f780a64cc Load more: Rejected Usernames -> Wrong name okbel 2018-01-05 07:46:21 -03:00
  • 88b44c3bf6 Moment settings based on users locale okbel 2018-01-05 07:34:17 -03:00
  • e83f99e389 Removing unused code okbel 2018-01-05 07:28:51 -03:00
  • ce4ab4e86c Merge branch 'master' into next Kim Gardner 2018-01-04 17:28:13 -05:00
  • 5cd6322284 Merge branch 'master' into admin-pages Kim Gardner 2018-01-04 17:26:33 -05:00
  • 0ab6cc3a0f Merge pull request #1230 from coralproject/safari-bs-changes Kim Gardner 2018-01-04 17:26:05 -05:00
  • c617a3446d Merge branch 'master' into safari-bs-changes Kim Gardner 2018-01-04 17:15:47 -05:00
  • d76fe5350e Merge pull request #1238 from MEL27/master Kim Gardner 2018-01-04 17:15:23 -05:00
  • 927aa54feb Merge branch 'master' into master Kim Gardner 2018-01-04 17:03:10 -05:00
  • fc272ed1e1 Merge branch 'master' into master Kim Gardner 2018-01-04 17:02:32 -05:00
  • 882251864a Merge pull request #1246 from coralproject/simplified-chinese-merge-fixes Kim Gardner 2018-01-04 17:01:42 -05:00
  • 4eaa234dd8 Merge branch 'master' into simplified-chinese-merge-fixes Kim Gardner 2018-01-04 16:48:46 -05:00
  • bf1fbfe03f Fix merge conflicts on master Kim Gardner 2018-01-04 16:43:51 -05:00