summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | Fix OC_Files::get() to not return the first character of the filename if only one file is requested.
* Merge pull request #2254 from ↵Thomas Müller2013-03-122-3/+8
|\ | | | | | | | | owncloud/fixing-mssql-utf8-and-insert-empty-string-master Fixing mssql utf8 and insert empty string master
| * enable UTF-8 charset on mssqlThomas Mueller2013-03-121-2/+4
| | | | | | | | disable MDB2_PORTABILITY_EMPTY_TO_NULL for mssql to allow insert of empty string to no null fields
| * write error message to log file in case insert to file cache failed - took ↵Thomas Mueller2013-03-121-1/+4
| | | | | | | | hours to find that the insert failed :-(
* | Merge pull request #2253 from owncloud/fixing-windows-file-mapper-masterThomas Müller2013-03-122-12/+15
|\ \ | | | | | | Fixing windows file mapper master
| * | fixing various filesystem/storage unit tests on windowsThomas Mueller2013-03-122-6/+11
| | | | | | | | | | | | fixing copy operation on mapper
| * | 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 ↵Thomas Mueller2013-03-121-4/+2
| | | | | | | | | | | | valid character
| * | 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 writes
| * 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 #2141
| * | 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 #357
| * | | 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
|\ \ \ \ | | | | | | | | | | Include etags for the root of the shared folder
| * | | | use pre_unshare hook, otherwise the share is already removed. Which means ↵Björn Schießle2013-03-081-0/+1
| | | | | | | | | | | | | | | | | | | | that we have no chance to determine which folder has to be updated
| * | | | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-0710-26/+70
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php
| * | | | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-0536-61/+150
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/appinfo/app.php
| * | | | | Fix group post_shared hookMichael Gapczynski2013-03-041-14/+14
| | | | | |
| * | | | | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-02-2842-350/+1000
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php
| * | | | | | Correct parent folders' ETags for all users with access to a shared fileMichael Gapczynski2013-02-261-0/+23
| | | | | | |
* | | | | | | Merge pull request #2217 from owncloud/mountconfig-locationLukas Reschke2013-03-101-3/+8
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Store the global mount configuration file in the datadir
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
| * \ \ \ \ \ \ 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
| | | | | | | | | |
| * | | | | | | | | Fix api result merging.Tom Needham2013-02-091-3/+3
| | | | | | | | | |
| * | | | | | | | | Merge in masterTom Needham2013-02-0918-46/+217
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use OC_User::isAdminUser() in lib/api.phpTom Needham2013-02-091-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'ocs_capabilities' into ocs_multiple_methodsTom Needham2013-02-0976-3514/+4942
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Change strucutre of cloud/capabilities responseTom Needham2013-02-091-1/+6
| | | | | | | | | | | |
| | * | | | | | | | | | Merge masterTom Needham2013-02-0499-3483/+5078
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Remove app related values and change structure of /cloud/capabilties callTom Needham2013-02-041-9/+9
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add <syncpollinterval> and order the result for /cloud/capabilitiesTom Needham2013-01-161-5/+6
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add new /cloud/capabilities route and remove unused methodsTom Needham2013-01-161-43/+11
| | | | | | | | | | | | |
| * | | | | | | | | | | | API: Remove api response structure from OC_OCS_Result, handle multiple ↵Tom Needham2013-01-252-45/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | registered methods for api calls
* | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-101-0/+15
| | | | | | | | | | | | |
* | | | | | | | | | | | | fixed typo that broke xsendfileValerio Ponte2013-03-091-1/+1
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | remove remaining br-tags that do not belong hereArthur Schiwon2013-03-091-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-091-3/+10
| |_|_|_|_|/ / / / / / |/| | | | | | | | | |