Commit Graph

7742 Commits

Author SHA1 Message Date
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
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
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
Wyatt Johnson c3970a46a2 applied rename to graph mutation edges 2018-01-05 12:11:32 -07:00
Wyatt Johnson c9bc9a4b10 reintroduced the errors.ErrSameUsernameProvided 2018-01-05 11:31:40 -07:00
Wyatt Johnson 7b5993bc60 fixed wrong query logic 2018-01-05 11:17:04 -07:00
Wyatt Johnson b42cce5747 resolving pr concerns 2018-01-05 11:12:35 -07:00
Wyatt Johnson 9c595b7f84 Merge branch 'master' into next 2018-01-05 11:10:32 -07:00
Chi Vinh Le acdaaffd4e Add proptype 2018-01-05 19:03:40 +01:00
Chi Vinh Le c01b192a73 Mark onClickOutside not required 2018-01-05 19:02:35 +01:00
Chi Vinh Le 7538e6e8fd Remove unused state 2018-01-05 18:57:12 +01:00
Chi Vinh Le 49c350376b Use null instead of boolean 2018-01-05 18:56:44 +01:00
Chi Vinh Le 4a259d09e4 Fix styling for new x button 2018-01-05 18:56:13 +01:00
okbel 918aa6988b Adding a UI reducer to manage UI state 2018-01-05 14:50:35 -03:00
okbel 7e4831e309 styles.css is de-pre-ca-ted 2018-01-05 14:30:28 -03:00
okbel 14034c1364 Using button in the Drawer 2018-01-05 14:24:21 -03:00
okbel 5a379b2cd8 Adding line back 2018-01-05 14:24:06 -03:00
Kim Gardner ad6a663179 Merge pull request #1237 from coralproject/admin-pages
CSS Customization and i18n fixes
2018-01-05 12:20:46 -05:00
okbel b185d61993 Adding clarifications 2018-01-05 07:49:37 -03:00
okbel 9f780a64cc Load more: Rejected Usernames -> Wrong name 2018-01-05 07:46:21 -03:00
okbel 88b44c3bf6 Moment settings based on users locale 2018-01-05 07:34:17 -03:00
okbel e83f99e389 Removing unused code 2018-01-05 07:28:51 -03:00
Kim Gardner ce4ab4e86c Merge branch 'master' into next 2018-01-04 17:28:13 -05:00
Kim Gardner 5cd6322284 Merge branch 'master' into admin-pages 2018-01-04 17:26:33 -05:00
Kim Gardner 0ab6cc3a0f Merge pull request #1230 from coralproject/safari-bs-changes
Safari Browserstack changes
2018-01-04 17:26:05 -05:00
Kim Gardner c617a3446d Merge branch 'master' into safari-bs-changes 2018-01-04 17:15:47 -05:00
Kim Gardner d76fe5350e Merge pull request #1238 from MEL27/master
Add initial Simplified Chinese translation
2018-01-04 17:15:23 -05:00
Kim Gardner 927aa54feb Merge branch 'master' into master 2018-01-04 17:03:10 -05:00
Kim Gardner fc272ed1e1 Merge branch 'master' into master 2018-01-04 17:02:32 -05:00
Kim Gardner 882251864a Merge pull request #1246 from coralproject/simplified-chinese-merge-fixes
Simplified Chinese merge fixes
2018-01-04 17:01:42 -05:00
Kim Gardner 4eaa234dd8 Merge branch 'master' into simplified-chinese-merge-fixes 2018-01-04 16:48:46 -05:00
Kim Gardner bf1fbfe03f Fix merge conflicts on master 2018-01-04 16:43:51 -05:00
Kim Gardner d3f93644db Merge branch 'master' into master 2018-01-04 16:07:18 -05:00