summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Rewrite query for numRows function for SELECT queriesBart Visscher2013-03-171-1/+8
* Use the correct property for connection objectBart Visscher2013-03-172-7/+7
* Change var_dumps to exceptionsBart Visscher2013-03-172-14/+7
* Merge branch 'master' into doctrineBart Visscher2013-03-1719-77/+199
|\
| * Merge pull request #2204 from owncloud/chache_updater_renameFrank Karlitschek2013-03-171-10/+33
| |\
| | * Cache: better rename hook for cache updaterRobin Appelman2013-03-081-10/+33
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-03-161-0/+1
| * | Merge pull request #2383 from owncloud/error-handling-upgradeBernhard Posselt2013-03-161-16/+24
| |\ \
| | * | Add error handling to the file cache upgradeMichael Gapczynski2013-03-161-16/+24
| * | | Filter display of blacklisted filesAndreas Schönebeck2013-03-151-0/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-152-6/+29
| * | | Return unknown freespace if the free_space call failedRobin Appelman2013-03-141-1/+5
| * | | replace \MDB with \OC_DB, approved in #2278Björn Schießle2013-03-141-1/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-141-0/+13
| * | | Fix file sharing via public link for one particular file.Olivier Tétard2013-03-121-1/+1
| * | | Merge pull request #2254 from owncloud/fixing-mssql-utf8-and-insert-empty-str...Thomas Müller2013-03-122-3/+8
| |\ \ \
| | * | | enable UTF-8 charset on mssqlThomas Mueller2013-03-121-2/+4
| | * | | write error message to log file in case insert to file cache failed - took ho...Thomas Mueller2013-03-121-1/+4
| * | | | Merge pull request #2253 from owncloud/fixing-windows-file-mapper-masterThomas Müller2013-03-122-12/+15
| |\ \ \ \
| | * | | | fixing various filesystem/storage unit tests on windowsThomas Mueller2013-03-122-6/+11
| | * | | | adding //IGNORE to iconv to prevent nasty php warningsThomas Mueller2013-03-121-1/+1
| | * | | | slug generates uniqid in case the file/folder name contains not one single va...Thomas Mueller2013-03-121-4/+2
| | * | | | indexed slug should be created based on logic pathThomas Mueller2013-03-121-1/+1
| | |/ / /
| * | | | Merge pull request #2145 from eMerzh/preserve_debugJan-Christoph Borchardt2013-03-121-1/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Preserve Debug flag accross config writesBrice Maron2013-03-061-1/+5
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-121-2/+2
| * | | | this is now 6.0 pre alphaFrank Karlitschek2013-03-091-2/+2
| * | | | 5.0.0v5.0.0Frank Karlitschek2013-03-091-2/+2
| * | | | Check if username is valid and remove slashes from filenameLukas Reschke2013-03-111-0/+9
| * | | | Merge pull request #2183 from owncloud/fix-shared-statuses-againBernhard Posselt2013-03-111-10/+15
| |\ \ \ \
| | * | | | Fix #2080 and fix #2141Michael Gapczynski2013-03-071-10/+15
| * | | | | Merge pull request #2218 from owncloud/fix-mounting-allBernhard Posselt2013-03-111-1/+1
| |\ \ \ \ \
| | * | | | | Fix variable for mounting for all users, fix #357Michael Gapczynski2013-03-091-1/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #1786 from owncloud/shared-folder-etagsBernhard Posselt2013-03-111-14/+38
| |\ \ \ \ \
| | * | | | | use pre_unshare hook, otherwise the share is already removed. Which means tha...Björn Schießle2013-03-081-0/+1
| | * | | | | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-0710-26/+70
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-0536-61/+150
| | |\ \ \ \ \
| | * | | | | | Fix group post_shared hookMichael Gapczynski2013-03-041-14/+14
| | * | | | | | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-02-2842-350/+1000
| | |\ \ \ \ \ \
| | * | | | | | | Correct parent folders' ETags for all users with access to a shared fileMichael Gapczynski2013-02-261-0/+23
* | | | | | | | | Fix mssql connection parameters and correct driver for pgsqlBart Visscher2013-03-101-8/+9
* | | | | | | | | Merge branch 'master' into doctrineBart Visscher2013-03-1068-505/+1341
|\| | | | | | | |
| * | | | | | | | Merge pull request #2217 from owncloud/mountconfig-locationLukas Reschke2013-03-101-3/+8
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Store the global mount configuration file in the datadirRobin Appelman2013-03-101-3/+8
| * | | | | | | | Merge pull request #1584 from owncloud/ocs_multiple_methodsTom Needham2013-03-093-92/+166
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge in masterTom Needham2013-03-0920-54/+123
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Rebase to current masterTom Needham2013-03-05105-838/+3506
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | more code styleTom Needham2013-02-101-1/+1
| | * | | | | | | | | | Code style and remove OAuth codeTom Needham2013-02-101-11/+3
| | * | | | | | | | | | Remove debug call, correct app identifierTom Needham2013-02-101-2/+0