Commit Graph

8775 Commits

Author SHA1 Message Date
okbel 9c75f3fa59 Adding missing proptypes 2018-01-10 11:03:33 -03:00
Belén Curcio 25ac66ec59 Merge branch 'next' into firefox-actionmenu-deselect 2018-01-10 10:46:48 -03:00
Chi Vinh Le bdcc9273f1 Add some margin to loadmore 2018-01-10 12:22:23 +01:00
Kiwi dca85ad127 Merge branch 'next' into firefox-actionmenu-deselect 2018-01-10 12:19:58 +01:00
Chi Vinh Le 36f7c31a03 Fix deselect bug of action menu in ff 2018-01-10 12:16:28 +01:00
Kim Gardner 63bd6309d3 Merge branch 'master' into next 2018-01-09 17:22:47 -05:00
Kim Gardner bf76f0453b Merge pull request #1261 from coralproject/losowsky-patch-1
Small grammar fixes
2018-01-09 17:04:01 -05:00
Kim Gardner 00677148b9 Merge branch 'master' into losowsky-patch-1 2018-01-09 16:53:15 -05:00
Wyatt Johnson 7bdfb55a1c Merge pull request #1260 from coralproject/embed-events
Embed events
2018-01-09 14:53:04 -07:00
Andrew Losowsky c43051c6dd Small grammar fixes 2018-01-09 16:20:32 -05:00
Wyatt Johnson 20453dfddd refactor to cleanup 2018-01-09 14:13:02 -07:00
Wyatt Johnson 20f9bba845 Merge branch 'master' into embed-events 2018-01-09 11:25:22 -07:00
Wyatt Johnson 25e29cb79a extracted asset url 2018-01-09 11:01:10 -07:00
Wyatt Johnson 7f25f46ac0 extracted more funcs 2018-01-09 10:51:43 -07:00
Wyatt Johnson d3c1286d1a extracted events from opts 2018-01-09 10:47:58 -07:00
Kim Gardner 13bf20daf0 Merge pull request #1259 from coralproject/fix-set-username
Make Facebook login work again in next
2018-01-09 12:39:20 -05:00
Kim Gardner e61c09f017 Merge branch 'next' into fix-set-username 2018-01-09 11:52:29 -05:00
Kim Gardner 395793445c Merge branch 'master' into next 2018-01-09 11:52:20 -05:00
Kim Gardner abc6cf6366 Merge pull request #1258 from coralproject/toxic-update
Adding doNotStore param to our Toxic Comments Plugin
2018-01-09 11:51:59 -05:00
Kim Gardner eb33eb72d1 Merge branch 'master' into toxic-update 2018-01-09 11:44:44 -05:00
Kim Gardner 1a39635c0e Merge pull request #1257 from larrylizhao/feature/RefineTranslation
Feature/refine translation
2018-01-09 11:43:23 -05:00
Kiwi 13347a6baf Merge branch 'next' into fix-set-username 2018-01-09 15:07:56 +01:00
okbel ff016e22fe Adding TALK_PERSPECTIVE_DO_NOT_STORE to the docs 2018-01-09 10:42:28 -03:00
okbel 579644c910 Adding doNotStore 2018-01-09 10:34:24 -03:00
okbel 54b504eb8e typo 2018-01-09 10:24:58 -03:00
okbel 4490ea5202 Merge branch 'next' of github.com:coralproject/talk into next
* 'next' of github.com:coralproject/talk: (26 commits)
  removed snakecase
  fix to optional required param
  refactored mailer service with lodash!
  Docs typo
  Fix live status updates
  Move ChangeUsername to the appropiate tab
  Fix change username not displaying errors
  Remove defunct refetch detection workaround
  Rename UnBan and UnSuspend
  hardened configuration
  user cli patches
  don't apply configuration from dotfiles during testing
  applied rename to graph mutation edges
  reintroduced the errors.ErrSameUsernameProvided
  fixed wrong query logic
  resolving pr concerns
  Add proptype
  Mark onClickOutside not required
  Remove unused state
  Use null instead of boolean
  ...
2018-01-09 10:13:07 -03:00
okbel fb26d67e42 updated tests 2018-01-09 10:12:26 -03:00
okbel 07052824d7 updated tests 2018-01-09 10:10:37 -03:00
Chi Vinh Le a2eb474a5c Fully implement SetUsername 2018-01-09 12:25:44 +01:00
Chi Vinh Le 2bcb324582 Merge branch 'next' into fix-set-username 2018-01-09 11:41:56 +01:00
liz 37d1f3361c Translation update to make it more appropriate. 2018-01-09 16:54:13 +08:00
liz 6e8b28cc8a Translation for hide off topic comments 2018-01-09 14:03:09 +08:00
Wyatt Johnson 9513502667 Merge pull request #1255 from coralproject/fix-live-status-changes
Fix live status updates
2018-01-08 11:52:27 -07:00
Wyatt Johnson 55c2c00b49 Merge branch 'next' into fix-live-status-changes 2018-01-08 11:36:06 -07:00
Wyatt Johnson 8545be307d removed snakecase 2018-01-08 11:17:11 -07:00
Wyatt Johnson 04991a9856 Merge branch 'master' into next 2018-01-08 11:14:17 -07:00
Wyatt Johnson 978e1c8d4c fix to optional required param 2018-01-08 11:04:29 -07:00
Wyatt Johnson 6700698e52 Merge branch 'next' into fix-live-status-changes 2018-01-08 10:56:54 -07:00
Wyatt Johnson c0f266dfa5 Merge pull request #1256 from coralproject/docs-typo
Docs typo
2018-01-08 10:56:41 -07:00
Chi Vinh Le a40b287226 Use correct mutation and show errors 2018-01-08 18:52:54 +01:00
Wyatt Johnson 615be40b45 refactored mailer service with lodash! 2018-01-08 10:43:10 -07:00
Kim Gardner 99d66fef52 Docs typo 2018-01-08 11:27:25 -05:00
Chi Vinh Le c3a5da3ae6 Fix live status updates 2018-01-08 16:00:20 +01:00
Chi Vinh Le ec852601a4 Move ChangeUsername to the appropiate tab 2018-01-08 15:50:41 +01:00
Chi Vinh Le 791025b153 Fix change username not displaying errors 2018-01-08 15:48:49 +01:00
Chi Vinh Le be72e2effd Remove defunct refetch detection workaround 2018-01-08 15:01:09 +01:00
Chi Vinh Le 717d5e6566 Rename UnBan and UnSuspend 2018-01-08 14:43:14 +01:00
Wyatt Johnson c07ec23a20 hardened configuration
- moved env rewrite + dotenv code to single location
- fixed bug with system flag on user
2018-01-05 16:06:36 -07:00
Wyatt Johnson 6260339508 user cli patches
- removed unused user actions
- added system side graph context
- added user cli search
2018-01-05 15:32:36 -07:00
Wyatt Johnson 10754a65c6 don't apply configuration from dotfiles during testing 2018-01-05 12:12:54 -07:00