summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-1433-473/+617
* Merge pull request #2277 from owncloud/fix_sharing_hooksBernhard Posselt2013-03-131-1/+1
|\
| * we need to listen to the pre delete hook, otherwise the file is already goneBjörn Schießle2013-03-131-1/+1
* | Merge pull request #2265 from owncloud/no_share_option_for_shared_folderBjörn Schießle2013-03-131-1/+1
|\ \ | |/ |/|
| * only prevent shared action for the Shared folder in the root dirBjörn Schießle2013-03-131-1/+1
| * don't add share action to the Shared folderBjörn Schießle2013-03-121-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-1326-129/+143
* | 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-125-14/+20
|\ \
| * | fixing various filesystem/storage unit tests on windowsThomas Mueller2013-03-123-8/+12
| * | skip archive tests for nowThomas Mueller2013-03-122-0/+4
| * | 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
* | | Merge pull request #2234 from owncloud/fix_ldap_edirectoryFrank Karlitschek2013-03-121-2/+2
|\ \ \ | |_|/ |/| |
| * | LDAP: compatibility with Novell eDirectory UUIDArthur Schiwon2013-03-111-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-1228-277/+311
* | | this is now 6.0 pre alphaFrank Karlitschek2013-03-091-2/+2
* | | 5.0.0v5.0.0Frank Karlitschek2013-03-091-2/+2
* | | Merge pull request #2236 from owncloud/fix-migrationBernhard Posselt2013-03-111-0/+9
|\ \ \ | |/ / |/| |
| * | 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-112-62/+51
|\ \
| * | Update share.jsBernhard Posselt2013-03-081-2/+2
| * | Fix #2080 and fix #2141Michael Gapczynski2013-03-072-62/+51
* | | 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-116-53/+219
|\ \ \ \
| * | | | Fix correctFolders and retrieve the correct storage cacheMichael Gapczynski2013-03-082-17/+17
| * | | | not only files can be reshared but also foldersBjörn Schießle2013-03-081-1/+1
| * | | | Fix share hook for updaterMichael Gapczynski2013-03-081-2/+14
| * | | | use pre_unshare hook, otherwise the share is already removed. Which means tha...Björn Schießle2013-03-082-1/+2
| * | | | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-0761-456/+632
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | itemSource parameter should be fileSourceMichael Gapczynski2013-03-071-2/+2
| * | | | Update Shared folders ETags of users with resharesMichael Gapczynski2013-03-061-5/+11
| * | | | Move hook connectors from shared storage to app.php, add post_unshare hookMichael Gapczynski2013-03-052-4/+5
| * | | | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-05540-7851/+9785
| |\ \ \ \
| * | | | | Fix group post_shared hookMichael Gapczynski2013-03-041-14/+14
| * | | | | Fix variable name in Shared_UpdaterMichael Gapczynski2013-03-021-1/+1
| * | | | | Update ETag when file is sharedMichael Gapczynski2013-03-022-0/+11
| * | | | | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-02-28857-16126/+24650
| |\ \ \ \ \
| * | | | | | Fix target path and reuse mtimeMichael Gapczynski2013-02-261-4/+4
| * | | | | | Correct parent folders' ETags for all users with access to a shared fileMichael Gapczynski2013-02-265-2/+106
| * | | | | | Fix variableMichael Gapczynski2013-02-231-1/+1
| * | | | | | Return unknown free space for shared root folder so we can still upload parti...Michael Gapczynski2013-02-231-1/+1
| * | | | | | Fix WebDAV uploading of partial shared filesMichael Gapczynski2013-02-231-27/+46