Merge branch 'routing'
Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php
No related branches found
No related tags found
Showing
- .gitignore 4 additions, 0 deletions.gitignore
- apps/files/appinfo/routes.php 12 additions, 0 deletionsapps/files/appinfo/routes.php
- apps/files/index.php 2 additions, 2 deletionsapps/files/index.php
- apps/files/js/fileactions.js 1 addition, 1 deletionapps/files/js/fileactions.js
- apps/files/js/filelist.js 1 addition, 1 deletionapps/files/js/filelist.js
- composer.json 18 additions, 0 deletionscomposer.json
- core/ajax/appconfig.php 0 additions, 1 deletioncore/ajax/appconfig.php
- core/ajax/requesttoken.php 0 additions, 1 deletioncore/ajax/requesttoken.php
- core/ajax/share.php 0 additions, 1 deletioncore/ajax/share.php
- core/ajax/translations.php 0 additions, 3 deletionscore/ajax/translations.php
- core/ajax/vcategories/add.php 0 additions, 1 deletioncore/ajax/vcategories/add.php
- core/ajax/vcategories/delete.php 0 additions, 1 deletioncore/ajax/vcategories/delete.php
- core/ajax/vcategories/edit.php 0 additions, 1 deletioncore/ajax/vcategories/edit.php
- core/js/js.js 8 additions, 3 deletionscore/js/js.js
- core/js/router.js 73 additions, 0 deletionscore/js/router.js
- core/lostpassword/controller.php 83 additions, 0 deletionscore/lostpassword/controller.php
- core/lostpassword/index.php 0 additions, 35 deletionscore/lostpassword/index.php
- core/lostpassword/resetpassword.php 0 additions, 27 deletionscore/lostpassword/resetpassword.php
- core/lostpassword/templates/lostpassword.php 3 additions, 3 deletionscore/lostpassword/templates/lostpassword.php
- core/lostpassword/templates/resetpassword.php 2 additions, 2 deletionscore/lostpassword/templates/resetpassword.php
Loading
Please register or sign in to comment