Commit Graph

222 Commits

Author SHA1 Message Date
Wyatt Johnson 44f187dafa added plugin directory 2018-03-08 19:58:48 -07:00
Kim Gardner ccefffb7fa Merge branch 'master' into docs 2018-03-08 15:31:26 -05:00
Kim Gardner 40a3a24ba0 Fix merge conflict 2018-03-07 14:08:19 -05:00
Kiwi 033c6464e9 Merge branch 'master' into notification-digests 2018-03-07 12:03:44 +01:00
Wyatt Johnson 9cc9969320 Notification Digesting 2018-03-06 16:20:15 -07:00
okbel 1d31099c9d Passing down root data 2018-03-05 08:49:59 -03:00
okbel 5f5bc631b6 Merge branch 'master' of github.com:coralproject/talk into rte-plugin
* 'master' of github.com:coralproject/talk: (103 commits)
  Implement new permlink view for real
  fixes to ci for deploy
  fixed deploy
  changed max retries on unreliable tests
  always save test results
  fixed workspace error
  implemented staff replies
  adjusted client tests
  seperated tests
  more fixes to translation
  fixed translation
  review
  object propery typo
  added safari to integration jobs
  added develop filter
  added deeper cache support
  added dist cache support
  fixed firefox support
  removed headless
  ammended browserstack test
  ...
2018-03-02 12:30:22 -03:00
Wyatt Johnson 11687b06d0 upped versions of hexo 2018-02-28 16:30:07 -07:00
Wyatt Johnson cf87b52177 Merge branch 'master' into docs 2018-02-28 16:29:25 -07:00
Wyatt Johnson 2451d4b6d6 adjusted client tests 2018-02-28 14:00:56 -07:00
Wyatt Johnson 744348dee5 seperated tests 2018-02-28 13:50:36 -07:00
Wyatt Johnson b8ddfe4ae4 added dist cache support 2018-02-27 21:45:29 -07:00
Wyatt Johnson f0572d1e34 Merge branch 'master' into events 2018-02-23 15:09:32 -07:00
Wyatt Johnson 37dc3a27dc updated yarn.lock after merge conflict 2018-02-23 13:58:42 -07:00
Wyatt Johnson 12a1ed0de3 Merge branch 'master' into rte-plugin 2018-02-23 13:58:21 -07:00
Wyatt Johnson 025c82a6cc migrated pregit linting 2018-02-23 11:48:44 -07:00
Wyatt Johnson 627170a970 Updated server version 2018-02-23 11:31:20 -07:00
okbel e45b09b32a Adding support for links! 2018-02-23 14:52:20 -03:00
Wyatt Johnson fa3373ec94 added docs to workspace 2018-02-23 10:34:52 -07:00
okbel 907ffea1f9 Adding strict and secure rules for html injection and jsom config 2018-02-23 13:06:56 -03:00
okbel d6818366ec yarn locks 2018-02-23 12:40:44 -03:00
Belén Curcio 322740bda0 Merge branch 'master' into rte-plugin 2018-02-22 21:15:27 -03:00
Wyatt Johnson 9ce94c97d0 merged lockfiles 2018-02-22 16:03:28 -07:00
Wyatt Johnson 31c643e4eb Merge branch 'master' into events 2018-02-22 16:02:07 -07:00
Wyatt Johnson 2485386b45 moved lock file 2018-02-22 14:29:56 -07:00
okbel bf1bae8999 Support for both htmlBody and original body 2018-02-21 16:37:19 -03:00
Wyatt Johnson e5f6188bd2 replaced custom loading with yarn workspaces 2018-02-20 21:39:32 -07:00
Wyatt Johnson 634da8012f Merge branch 'master' into events 2018-02-16 15:47:37 -07:00
Kim Gardner e71bcbe58d Yarn install 2018-02-16 17:14:54 -05:00
Wyatt Johnson 36e855237f replaced json -> hjson loader 2018-02-15 10:47:36 -07:00
Kiwi b8e340c471 Merge branch 'master' into auth-refactor 2018-02-13 21:19:50 +01:00
Wyatt Johnson 5f5f0ffa14 patched pym 2018-02-13 12:32:57 -07:00
Wyatt Johnson 5221ebbe9a added docs, added new logger 2018-02-12 16:51:39 -07:00
Chi Vinh Le f4fc8915e3 Refactor talk-plugin-auth part 1 2018-02-09 20:12:02 +01:00
Wyatt Johnson ef7693afa5 fixed error in migration 2018-01-25 11:25:32 -07:00
Wyatt Johnson b36c70acc1 replaced pre-git with pre-commit 2018-01-22 16:16:04 -07:00
Wyatt Johnson a402817cc9 Merge branch 'master' into user-json 2018-01-19 10:12:36 -07:00
Wyatt Johnson 7258c3dd08 added performance updates to webpack build 2018-01-18 17:19:19 -07:00
Wyatt Johnson 49d20db26f replaced homegrown with package 2018-01-18 14:22:19 -07:00
Wyatt Johnson 0abc2ca243 replaced eslint:recommended with prettier 2018-01-11 20:00:34 -07:00
Chi Vinh Le 7036aa5bad Use lodash with es modules 2018-01-10 17:54:06 +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
Kim Gardner ce4ab4e86c Merge branch 'master' into next 2018-01-04 17:28:13 -05:00
Wyatt Johnson c0f8fce442 fixed graphql error 2017-12-21 11:48:16 -07:00
okbel f67f1e3b52 Adding role, instead of roles. And disable banning and suspending for the user thats logged in 2017-12-20 18:10:13 -03:00
okbel 570c0edfb3 merge conficts 2017-12-20 16:06:55 -03:00
Chi Vinh Le 7d71452ab5 Add ip package 2017-12-20 17:45:03 +01:00
Chi Vinh Le f25cc56ddb Use Portal to put dialogs to the end of the document 2017-12-19 19:15:45 +01:00
Kiwi 9cb6ff3847 Merge branch 'master' into virtualized 2017-12-18 16:59:31 +01:00