summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Cast object ids to integers.Thomas Tanghus2012-10-311-2/+2
|
* Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-314-1/+65
|\
| * Merge pull request #152 from scambra/webdav-quotaThomas Müller2012-10-311-0/+59
| |\ | | | | | | checking quota in webdav
| | * code style changesscambra2012-10-301-4/+6
| | |
| | * fix checking quota in webdav, adding a sabredav pluginscambra2012-10-301-0/+57
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-312-0/+2
| | |
| * | check for database error in userExistsJörn Friedrich Dreyer2012-10-301-1/+4
| |/
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-3039-555/+1145
|\| | | | | | | | | | | Fix conflicts: core/ajax/vcategories/add.php core/ajax/vcategories/delete.php
| * Merge pull request #147 from owncloud/htaccess-upgrade-checkSam Tuke2012-10-291-0/+10
| |\ | | | | | | Generate .htaccess when upgrading from old versions
| | * 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
| | | | | | | | | | | | | | | | | | | | | When upgrading from old ownCloud versions like 2.x the .htaccess is not generated - which exposes the data to the internet. This fix will generate a .htaccess when upgrading. (And no one exists) Fixes #127
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-302-0/+2
| | |
| * | Merge pull request #133 from fmms/checkstyle02Lukas Reschke2012-10-294-52/+52
| |\ \ | | |/ | |/| NoSpaceAfterComma -- checkstyle cleanup
| | * 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 ↵Michael Gapczynski2012-10-281-0/+3
| | | | | | | | | | | | e.g. the htaccesstext.txt fopen failing
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-294-2/+4
| |/
| * NoSpaceAfterCommaFelix Moeller2012-10-282-59/+59
| |
| * NoSpaceAfterCommaFelix Moeller2012-10-282-41/+41
| | | | | | | | first in new branch
| * 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 ↵Arthur Schiwon2012-10-281-0/+5
| | | | | | | | sure the emmited setup-hook is received. Fixes #89
| * 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
| |\ | | | | | | | | | | | | Conflicts: lib/base.php
| | * 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
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php
| | * | Change Symfony/Component/Routing from submodule to composer fetchingBart Visscher2012-10-271-2/+2
| | | |
| | * | Merge branch 'master' into routingBart Visscher2012-10-1738-171/+632
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |
| | * | | 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
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php
| | * | | | | 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
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js lib/base.php lib/helper.php lib/ocs.php