Sebastian Gierlinger
1db0431e4d
User API changes
...
closes #2822
- added destroy user method
- added remove user permission
- added API end point for get reset token
- added API end point for reset password
- added API end point for change password
2014-06-20 11:15:01 +02:00
Hannah Wolfe
c746a88b2e
Merge branch 'master' into ember
...
Conflicts:
Gruntfile.js
core/client/assets/lib/showdown/extensions/ghostdown.js
core/client/views/editor.js
core/clientold/assets/lib/showdown/extensions/ghostdown.js
core/shared/lib/showdown/extensions/ghostimagepreview.js
core/test/unit/showdown_client_integrated_spec.js
core/test/unit/showdown_ghostimagepreview_spec.js
2014-04-07 22:26:53 +01:00
Hannah Wolfe
31f41822e0
Merge branch 'master' into ember
...
Conflicts:
.gitignore
Gruntfile.js
bower.json
core/client/assets/lib/showdown/extensions/ghostdown.js
core/client/assets/vendor/showdown/extensions/ghostdown.js
core/client/router.js
core/clientold/assets/vendor/chart.min.js
core/clientold/assets/vendor/codemirror/addon/mode/overlay.js
core/clientold/assets/vendor/codemirror/codemirror.js
core/clientold/assets/vendor/codemirror/mode/gfm/gfm.js
core/clientold/assets/vendor/codemirror/mode/gfm/index.html
core/clientold/assets/vendor/codemirror/mode/gfm/test.js
core/clientold/assets/vendor/codemirror/mode/markdown/index.html
core/clientold/assets/vendor/codemirror/mode/markdown/markdown.js
core/clientold/assets/vendor/codemirror/mode/markdown/test.js
core/clientold/assets/vendor/countable.js
core/clientold/assets/vendor/fastclick.js
core/clientold/assets/vendor/icheck/jquery.icheck.min.js
core/clientold/assets/vendor/jquery.hammer.min.js
core/clientold/assets/vendor/nprogress.js
core/clientold/assets/vendor/packery.pkgd.min.js
core/clientold/assets/vendor/showdown/extensions/ghostdown.js
core/clientold/assets/vendor/showdown/showdown.js
core/clientold/assets/vendor/validator-client.js
core/test/unit/client_ghostdown_spec.js
core/test/unit/client_showdown_int_spec.js
2014-03-05 23:10:44 +00:00
Hannah Wolfe
bee58922b2
Rename client -> clientold
...
issue #2271
- should allow development of new admin UI whilst still having access to the old ui
2014-02-27 00:52:04 +00:00
