summaryrefslogtreecommitdiffstats
path: root/lib/app.php
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1577 from owncloud/typo_catagoryLukas Reschke2013-02-101-3/+3
|\
| * TypoLukas Reschke2013-02-091-3/+3
* | Merge pull request #1546 from owncloud/fix-loading-hooksThomas Müller2013-02-091-0/+17
|\ \
| * | Better way of getting the navigation entries for an appBart Visscher2013-02-081-0/+17
| |/
* / Remove invalid characters from app id to prevent loading of invalid resourcesBart Visscher2013-02-091-0/+9
|/
* Merge pull request #1357 from owncloud/alternative-loging-masterThomas Müller2013-02-061-0/+9
|\
| * add support for apps to register alternative login methodsThomas Mueller2013-01-291-0/+9
* | add multiple domains reverse proxy supportStefan Herbrechtsmeier2013-01-311-1/+1
* | Merge pull request #1379 from owncloud/improved_appsmanagementLukas Reschke2013-01-311-8/+32
|\ \
| * | style fixesThomas Mueller2013-01-311-10/+11
| * | merge masterFrank Karlitschek2013-01-301-20/+90
| |\|
| * | 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 err...Björn Schießle2013-01-181-1/+1
* | | 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
| |/
* | 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
* | | | | 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
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'master' into routingBart Visscher2012-10-171-41/+35
| | |\ \ \
| | | * | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 23:56:59 +0000