summaryrefslogtreecommitdiffstats
path: root/lib/app.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1357 from owncloud/alternative-loging-masterThomas Müller2013-02-061-0/+9
|\ | | | | add support for apps to register alternative login methods
| * add support for apps to register alternative login methodsThomas Mueller2013-01-291-0/+9
| | | | | | | | below the standard login a list of icons/button will be displayed
* | add multiple domains reverse proxy supportStefan Herbrechtsmeier2013-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add support for a reverse proxy that handles multiple domains via different web roots (http[s]://proxy.tld/domain.tld/owncloud). As the reverse proxy web root is transparent for the web server the REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace the direct use of this _SERVER variables with function calls and extend this functions to overwrite the web root. Additionally it adds a Sabre request backend that extends the Sabre_HTTP_Request to use the same functions.
* | Merge pull request #1379 from owncloud/improved_appsmanagementLukas Reschke2013-01-311-8/+32
|\ \ | | | | | | Improved appsmanagement
| * | style fixesThomas Mueller2013-01-311-10/+11
| | |
| * | merge masterFrank Karlitschek2013-01-301-20/+90
| |\| | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php
| * | mark recommended apps. server part not yet fully implementedFrank Karlitschek2013-01-301-0/+7
| | |
| * | apps updater is now workingroot2013-01-301-3/+1
| | |
| * | we are getting closer. updating is not working yet.Frank Karlitschek2013-01-211-1/+15
| | |
* | | merge master into filesystemRobin Appelman2013-01-261-16/+82
|\ \ \ | | |/ | |/|
| * | Move to OC_AppLukas Reschke2013-01-211-0/+66
| | |
| * | IndentationLukas Reschke2013-01-211-16/+16
| | |
* | | merge master into filesytemRobin Appelman2013-01-201-1/+1
|\| |
| * | fix error message, add "appid" to the output to know which app caused the ↵Björn Schießle2013-01-181-1/+1
| | | | | | | | | | | | | | | | | | error if OC_App::getStorage() fails. Port of approved patch for stable45: https://github.com/owncloud/core/pull/1222
* | | merge master into filesystemRobin Appelman2013-01-161-1/+1
|\| |
| * | Whitespace cleanupBart Visscher2013-01-161-1/+1
| | |
* | | merge master into filesystemRobin Appelman2013-01-151-2/+2
|\| |
| * | Check if user is admin - boolLukas Reschke2013-01-141-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | There was no "isAdminUser()" function which returned bool. This is irritiating as there were a loooooooot of places in the code which checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not use a function for this? (Especially if you consider that we might change the group name in the future, which would lead to problems then) Additionally, @Raydiation needed such a method for his AppFramework :)
* | merge master into filesystemRobin Appelman2013-01-071-0/+18
|\|
| * Merge branch 'master' into update-progressMichael Gapczynski2013-01-051-0/+14
| |\
| | * Merge branch 'master' into ocs_apiTom Needham2012-12-161-10/+10
| | |\
| | * \ Merge master into ocs_api, fix conflicts.Tom Needham2012-12-141-15/+20
| | |\ \
| | * \ \ Merge master into ocs_apiTom Needham2012-10-281-37/+127
| | |\ \ \
| | * \ \ \ Fix merge conflictsTom Needham2012-09-131-104/+110
| | |\ \ \ \
| | * | | | | Make calling ocs/v1.php/config workBart Visscher2012-07-301-1/+1
| | | | | | |
| | * | | | | Add method to check if an app is shipped or notTom Needham2012-07-291-0/+14
| | | | | | |
| * | | | | | Tweak failure message and throw exceptions from updateDbFromStructure()Michael Gapczynski2013-01-051-1/+1
| | | | | | |
| * | | | | | Modify and include additional update messages from updating appsMichael Gapczynski2013-01-051-1/+4
| | | | | | |
| * | | | | | Use hooks to send updates from appsMichael Gapczynski2013-01-041-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | merge master into filesystemRobin Appelman2012-12-151-10/+10
|\| | | | |
| * | | | | More whitespace fixesBart Visscher2012-12-151-10/+10
| | |_|_|/ | |/| | |
* | | | | merge master into filesystemRobin Appelman2012-12-061-0/+2
|\| | | |
| * | | | Move loading of all the apps to setting the active navigation entry.Bart Visscher2012-11-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't do the loading before matching the route, because some routes need to do the loading after matching of the route. For example the navigation detection of the app settings page.
* | | | | merge master into filesystemRobin Appelman2012-11-041-6/+6
|\| | | |
| * | | | Checkstyle fixes: NoSpaceAfterCommaFelix Moeller2012-11-041-1/+1
| | | | |
| * | | | Checkstyle: many fixesFelix Moeller2012-11-021-5/+5
| | | | |
* | | | | merge master into filesystemRobin Appelman2012-10-301-3/+0
|\| | | |
| * | | | Remove subnavigation key, not usedBart Visscher2012-10-291-3/+0
| | | | |
* | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-271-6/+12
|\| | | |
| * | | | Merge branch 'routing'Bart Visscher2012-10-271-6/+12
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php
| | * | | Merge branch 'master' into routingBart Visscher2012-10-171-41/+35
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php
| | | * | | Check for file exists before loading app version fileBart Visscher2012-10-171-3/+2
| | | | | |
| | * | | | Convert menu entries of settings pages to use routerBart Visscher2012-09-281-6/+12
| | | | | |
* | | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-261-0/+4
|\| | | | |
| * | | | | add the possibility to add an preupdate.phpGeorg Ehrke2012-10-261-0/+4
| | | | | |
* | | | | | merge master into filesystemRobin Appelman2012-10-241-5/+2
|\| | | | |
| * | | | | Codestyle: FunctionCallArgumentSpacingFelix Moeller2012-10-231-1/+1
| | | | | |
| * | | | | Checkstyle: MultiLineConditionFelix Moeller2012-10-231-4/+1
| | | | | |
* | | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-211-3/+2
|\| | | | |
| * | | | | Check for file exists before loading app version fileBart Visscher2012-10-201-3/+2
| | |/ / / | |/| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-14 01:34:56 +0000