summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-3039-555/+1145
|\
| * Merge pull request #147 from owncloud/htaccess-upgrade-checkSam Tuke2012-10-291-0/+10
| |\
| | * Don't use OC_Setup as it will show up the installerLukas Reschke2012-10-291-1/+5
| | * Generate .htaccess when upgrading from old versionsLukas Reschke2012-10-291-0/+6
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-302-0/+2
| * | Merge pull request #133 from fmms/checkstyle02Lukas Reschke2012-10-294-52/+52
| |\ \ | | |/ | |/|
| | * NoSpaceAfterCommaFelix Moeller2012-10-284-52/+52
| * | Generate only one CSRF tokenLukas Reschke2012-10-291-31/+19
| * | Fix a typoLukas Reschke2012-10-291-1/+1
| * | Move loading setting routing to OC_RouterBart Visscher2012-10-291-1/+3
| * | Remove subnavigation key, not usedBart Visscher2012-10-291-3/+0
| * | Add ETag caching for Javascript routesBart Visscher2012-10-291-11/+36
| * | Move generating cache key from files from OC_Minimizer to OC_CacheBart Visscher2012-10-292-6/+12
| * | Fix MySQL install, bug fix for issue 132Michael Gapczynski2012-10-281-2/+2
| * | Check if error_report() is equal to 0, so suppressed errors aren't logged e.g...Michael Gapczynski2012-10-281-0/+3
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-294-2/+4
| |/
| * NoSpaceAfterCommaFelix Moeller2012-10-282-59/+59
| * NoSpaceAfterCommaFelix Moeller2012-10-282-41/+41
| * add svg mimetype to default htaccessRobin Appelman2012-10-281-0/+4
| * check if RUNTIME_NOAPPS is set before using itArthur Schiwon2012-10-281-1/+1
| * deny the usage of dots in database nameGeorg Ehrke2012-10-281-0/+3
| * make sure all filesystem apps are loaded when setupFS is proceeded, to make s...Arthur Schiwon2012-10-281-0/+5
| * remove whitespaces, no code changeArthur Schiwon2012-10-281-4/+4
| * added functions for printing escaped and unescaped valuesBernhard Posselt2012-10-281-0/+16
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-281-0/+1
| * Fix introduced style errorsBart Visscher2012-10-274-35/+43
| * Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'Bart Visscher2012-10-272-12/+15
| |\
| | * Update Sabre to version 1.7.1Susinthiran Sithamparanathan2012-10-172-12/+17
| * | fix function documentationBjörn Schießle2012-10-271-2/+1
| * | Merge branch 'routing'Bart Visscher2012-10-277-87/+452
| |\ \
| | * | Change Symfony/Component/Routing from submodule to composer fetchingBart Visscher2012-10-271-2/+2
| | * | Merge branch 'master' into routingBart Visscher2012-10-1738-171/+632
| | |\ \
| | | * | Check for file exists before loading app version fileBart Visscher2012-10-171-3/+2
| | * | | Add API description to OC_Route and OC_RouterBart Visscher2012-10-052-0/+71
| | * | | Implement routing on javascript sideBart Visscher2012-10-052-0/+19
| | * | | fix actionincludeBart Visscher2012-09-291-1/+1
| | * | | Convert menu entries of settings pages to use routerBart Visscher2012-09-281-6/+12
| | * | | Implement route for download in OC_Search_Provider_FileBart Visscher2012-09-282-2/+6
| | * | | Merge branch 'master' into routingBart Visscher2012-09-287-25/+58
| | |\ \ \
| | * \ \ \ Merge branch 'master' into routingBart Visscher2012-09-2868-1145/+1765
| | |\ \ \ \
| | * | | | | Add linkToRoute functionalityBart Visscher2012-09-122-6/+37
| | * | | | | Remove redundant loadAppsBart Visscher2012-09-071-1/+0
| | * | | | | Merge branch 'master' into routingBart Visscher2012-09-07116-1879/+2265
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into routingBart Visscher2012-08-3071-448/+662
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master' into routingBart Visscher2012-08-2945-242/+1903
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into routingBart Visscher2012-08-1520-80/+155
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Routing: And start using them from phpBart Visscher2012-08-121-2/+2
| | * | | | | | | | | Routing: Add some core routesBart Visscher2012-08-122-1/+4
| | * | | | | | | | | Routing: Prepare load funtions to be called from OC_RouterBart Visscher2012-08-121-11/+14
| | * | | | | | | | | Add router match to OC::handleRequestBart Visscher2012-08-111-0/+9