Commit Graph

8775 Commits

Author SHA1 Message Date
Kim Gardner f2e63b7621 Merge branch 'next' into fix-scrollbars 2018-01-11 14:41:32 -05:00
Kim Gardner 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
Kiwi 8cdc881f3d Merge branch 'next' into flags-enh 2018-01-11 18:47:05 +01:00
Belén Curcio 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 Gardner eb5b736484 Merge branch 'next' into fix-no-status-history 2018-01-11 12:27:37 -05:00
Kim Gardner 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
Kim Gardner d922761f85 Merge branch 'next' into firefox-actionmenu-deselect 2018-01-11 09:51:40 -05:00
Kim Gardner 737b77a6ac Merge pull request #1269 from larrylizhao/feature/pluginTranslation
Translations refinement for plugins
2018-01-11 09:36:35 -05:00
Chi Vinh Le 11b38f7ea0 Fix no status history error 2018-01-11 13:55:09 +01:00
Bart Stroeken e5c3474455 dutch translation was not added yet without adding it to i18n.js - and refined a few translations. 2018-01-11 11:56:30 +01:00
Kiwi f89a5013d2 Merge branch 'next' into suspect-label 2018-01-11 11:20:04 +01:00
Kiwi 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
liz 6e813e9663 Translations refinement for plugins 2018-01-11 17:16:26 +08:00
Bart Stroeken 1f2caada3f Finished drafting translations. Let's spin it up for a test run 2018-01-11 09:04:45 +01:00
Wyatt Johnson 14dd9acd3b changed copy for error 2018-01-10 16:49:40 -07:00
Wyatt Johnson d35d0e354e Merge branch 'next' into firefox-actionmenu-deselect 2018-01-10 15:35:27 -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 Johnson 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 Curcio 7d6fd69a3b Merge branch 'next' into reply 2018-01-10 15:53:39 -03:00
Wyatt Johnson 75d1bb2f22 Merge branch 'next' into firefox-actionmenu-deselect 2018-01-10 10:40:52 -07:00
Wyatt Johnson 1e372b583a Merge pull request #1265 from coralproject/lodash-size-opt
Use lodash with es modules
2018-01-10 10:40:35 -07:00
Kiwi 1b373b5af4 Merge branch 'next' into lodash-size-opt 2018-01-10 18:39:57 +01:00
Kiwi d0d9a38177 Merge branch 'next' into firefox-actionmenu-deselect 2018-01-10 18:39:54 +01:00
Kiwi 9d8867be9d Merge branch 'next' into reply 2018-01-10 18:39:45 +01:00
Wyatt Johnson 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
Kiwi 6a3be92a4c Merge branch 'next' into reply 2018-01-10 18:08:12 +01:00
okbel 845c99de10 Updated tests 2018-01-10 13:57:16 -03:00
okbel 9c7b6e007a Merge branch 'reply' of github.com:coralproject/talk into reply
* 'reply' of github.com:coralproject/talk:
  Small grammar fixes
  refactor to cleanup
  extracted asset url
  extracted more funcs
  extracted events from opts
  Adding TALK_PERSPECTIVE_DO_NOT_STORE to the docs
  Adding doNotStore
  Translation update to make it more appropriate.
  Translation for hide off topic comments
2018-01-10 13:55:07 -03:00
okbel 4c3d3fb4b0 Updated tests 2018-01-10 13:54:43 -03:00
Chi Vinh Le 7036aa5bad Use lodash with es modules 2018-01-10 17:54:06 +01:00
Belén Curcio 1898941097 Merge branch 'master' into reply 2018-01-10 12:31:10 -03:00
okbel 24f7405065 remove uncommitted 2018-01-10 12:29:47 -03:00
okbel e1ead8f500 Adding e2e for the stream - open and closed asset features 2018-01-10 11:43:34 -03:00
okbel 5db8209182 Removing replyButton in Stream is closed 2018-01-10 11:21:24 -03:00