Commit Graph
7828 Commits
Author SHA1 Message Date
Kim GardnerandGitHub ca49b373bf Merge branch 'next' into email-send-fix 2018-01-11 17:23:42 -05:00
Kim GardnerandGitHub 4c6ec75cd7 Merge pull request #1277 from coralproject/hide-user-status-auth
Hide user status auth
2018-01-11 17:23:23 -05:00
Belén CurcioandGitHub 7e465f7317 Merge branch 'next' into email-send-fix 2018-01-11 19:11:33 -03:00
Belén CurcioandGitHub 943c3e93a4 Merge branch 'next' into hide-user-status-auth 2018-01-11 19:11:16 -03:00
Kim GardnerandGitHub f070d47c2d Merge pull request #1267 from coralproject/perm-fix
Permission fix
2018-01-11 16:40:10 -05:00
Kim GardnerandGitHub 838083e76d Merge branch 'next' into perm-fix 2018-01-11 16:10:41 -05:00
Wyatt Johnson 4d65052eef allow moderators to view role 2018-01-11 14:00:26 -07:00
Wyatt Johnson eec7d0fb63 Merge branch 'next' into hide-user-status-auth 2018-01-11 13:57:21 -07:00
Wyatt Johnson d837562089 hides the user status histories and tokens from the auth endpoints, which were resulting in errors 2018-01-11 13:56:23 -07:00
Kim GardnerandGitHub fddba1e059 Merge branch 'next' into email-send-fix 2018-01-11 15:49:44 -05:00
Kim GardnerandGitHub 1e85894a0c Merge pull request #1274 from coralproject/account-history
Suspension duration, fixes and wording for Account History
2018-01-11 15:49:26 -05:00
Kim GardnerandGitHub 9b4dcd8d32 Merge branch 'next' into account-history 2018-01-11 15:34:50 -05:00
Kim GardnerandGitHub 54ec9ea9a6 Merge pull request #1275 from coralproject/flags-enh
Change Flags to Reports and make font a bit bigger
2018-01-11 15:34:18 -05:00
Kim GardnerandGitHub f51eda4f5e Merge branch 'next' into flags-enh 2018-01-11 15:24:24 -05:00
Kim GardnerandGitHub be40594ecf Merge pull request #1273 from coralproject/selected-bug
Restore shortcut functionality
2018-01-11 15:24:09 -05:00
Kim GardnerandGitHub f340cdd4b7 Merge branch 'next' into selected-bug 2018-01-11 15:10:09 -05:00
Kim GardnerandGitHub 24b6a4f16f Merge pull request #1272 from coralproject/fix-scrollbars
Fix scrollbars issues
2018-01-11 15:05:34 -05:00
Kim GardnerandGitHub f2e63b7621 Merge branch 'next' into fix-scrollbars 2018-01-11 14:41:32 -05:00
Kim GardnerandGitHub 6d3d717ab3 Merge pull request #1271 from coralproject/fix-no-status-history
Fix no status history error
2018-01-11 14:41:17 -05:00
Wyatt Johnson 1dcf297a45 added email fixes 2018-01-11 10:58:43 -07:00
KiwiandGitHub 8cdc881f3d Merge branch 'next' into flags-enh 2018-01-11 18:47:05 +01:00
Belén CurcioandGitHub 9187231737 Merge branch 'next' into account-history 2018-01-11 14:45:23 -03:00
okbel 2bc60b1211 fixes 2018-01-11 14:44:53 -03:00
Chi Vinh Le 90f1ef050b Change Flags to Reports and make a bit bigger 2018-01-11 18:41:53 +01:00
Kim GardnerandGitHub eb5b736484 Merge branch 'next' into fix-no-status-history 2018-01-11 12:27:37 -05:00
Kim GardnerandGitHub 92b506c85a Merge pull request #1270 from coralproject/suspect-label
Fix suspect label
2018-01-11 12:17:38 -05:00
Chi Vinh Le 2269c91244 Restore shortcut functionality 2018-01-11 16:54:54 +01:00
Chi Vinh Le 210b0ab907 Only show scrollbars when necessary 2018-01-11 16:05:20 +01:00
Chi Vinh Le 1337873adf Remove unwanted scroll in configure 2018-01-11 16:05:02 +01:00
Chi Vinh Le 11b38f7ea0 Fix no status history error 2018-01-11 13:55:09 +01:00
KiwiandGitHub f89a5013d2 Merge branch 'next' into suspect-label 2018-01-11 11:20:04 +01:00
KiwiandGitHub 139d319965 Merge branch 'next' into perm-fix 2018-01-11 11:19:13 +01:00
Chi Vinh Le 89c929f970 Fix suspect label 2018-01-11 11:16:30 +01:00
Wyatt Johnson 14dd9acd3b changed copy for error 2018-01-10 16:49:40 -07:00
Wyatt Johnson ec38b837aa Merge branch 'next' into perm-fix 2018-01-10 14:48:08 -07:00
okbel d055e0b28b Feature Button 2018-01-10 17:51:21 -03:00
okbel 1f6d38c4ad Updating copy 2018-01-10 17:43:55 -03:00
okbel eef2578e61 ignore user box over flow, fixed 2018-01-10 17:41:18 -03:00
okbel 7127aeaa87 Icon User Drawer 2018-01-10 17:35:50 -03:00
Wyatt Johnson 44648fa901 fixed perms issue 2018-01-10 13:04:56 -07:00
Wyatt JohnsonandGitHub acc2e00c54 Merge pull request #1264 from coralproject/reply
Hide reply button when comment stream is closed
2018-01-10 11:55:05 -07:00
Belén CurcioandGitHub 7d6fd69a3b Merge branch 'next' into reply 2018-01-10 15:53:39 -03:00
Wyatt JohnsonandGitHub 1e372b583a Merge pull request #1265 from coralproject/lodash-size-opt
Use lodash with es modules
2018-01-10 10:40:35 -07:00
KiwiandGitHub 1b373b5af4 Merge branch 'next' into lodash-size-opt 2018-01-10 18:39:57 +01:00
KiwiandGitHub 9d8867be9d Merge branch 'next' into reply 2018-01-10 18:39:45 +01:00
Wyatt JohnsonandGitHub fb7ff249b8 Merge pull request #1266 from coralproject/circle-next
Circle + Docker next
2018-01-10 10:38:56 -07:00
Wyatt Johnson bbdd69b2a0 removed debug... 2018-01-10 10:34:11 -07:00
Wyatt Johnson 3687fc1702 adjusted build script to build the next branch and release it 2018-01-10 10:31:43 -07:00
Chi Vinh Le caf2b88ee8 Fix typo 2018-01-10 18:29:03 +01:00
okbel 2ef3e29e7d Merge branch 'reply' of github.com:coralproject/talk into reply
* 'reply' of github.com:coralproject/talk: (193 commits)
  Add some margin to loadmore
  typo
  updated tests
  updated tests
  Fully implement SetUsername
  removed snakecase
  fix to optional required param
  Use correct mutation and show errors
  refactored mailer service with lodash!
  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
  ...
2018-01-10 14:08:58 -03:00