summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable6' of https://github.com/owncloud/core into stable6v6.0.2RC1Frank Karlitschek2014-02-254-5/+144
|\
| * add test case if a file gets moved out from the shared folderBjoern Schiessle2014-02-252-1/+129
| * don't overwrite keys if rename was done by a stream copyBjoern Schiessle2014-02-252-4/+15
* | 6.0.2 RC1Frank Karlitschek2014-02-251-2/+2
|/
* Merge pull request #7386 from owncloud/stable6-fixhostnamewithportVincent Petry2014-02-251-1/+1
|\
| * Fix case where port is missingVincent Petry2014-02-251-1/+1
|/
* Merge pull request #7369 from owncloud/stable6-smbmissingfilesicewind19912014-02-241-1/+1
|\
| * Fixed missing files on SMB storageVincent Petry2014-02-241-1/+1
|/
* Added extra checks for ext storage classVincent Petry2014-02-222-1/+32
* Adjust version for stable6Lukas Reschke2014-02-221-1/+1
* Add overwritehost config on setup and upgradeLukas Reschke2014-02-224-15/+50
* fix test so that it doesn't depend on the array orderBjoern Schiessle2014-02-211-14/+25
* fix usersPath and add unit testsBjoern Schiessle2014-02-212-10/+110
* Updated submoduleVincent Petry2014-02-211-0/+0
* fix sharing unit testsBjoern Schiessle2014-02-212-7/+7
* add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935Bjoern Schiessle2014-02-211-0/+34
* Merge pull request #7349 from owncloud/backport-7347Thomas Müller2014-02-212-1/+1
|\
| * Fix "headers are already sent" introduced with #6519Lukas Reschke2014-02-212-1/+1
* | LDAP: fix and extend testsArthur Schiwon2014-02-212-3/+169
* | LDAP: improve compilation of filtersArthur Schiwon2014-02-212-0/+14
|/
* Test if $url is already prefixed by '/'Thomas Tanghus2014-02-201-1/+2
* Add missing slash in URLGenerator::getAbsoluteURL(). Refs. #6840Thomas Tanghus2014-02-201-1/+1
* LDAP: prevent other configuration from being deleted when deleting the first ...Arthur Schiwon2014-02-201-0/+6
* Update user.php to fix duplicate session-duplicatenhirokinet2014-02-201-1/+0
* Security Update: session fixationNARUKAWA Hiroki2014-02-201-0/+1
* Check whether the app is setLukas Reschke2014-02-201-1/+4
* Check whether the Key is setLukas Reschke2014-02-201-1/+1
* An admin should not be able to add remote and public services on its own. Thi...Lukas Reschke2014-02-201-6/+18
* Make google drive client secret and dropbox api secret a password fieldJoas Schilling2014-02-181-2/+2
* External FTP Storage should request hostname instead of URLJoas Schilling2014-02-181-1/+1
* Use the proper content-typeLukas Reschke2014-02-181-0/+2
* Now using PHP session lifetime as default value for the JS configVincent Petry2014-02-181-1/+1
* Merge pull request #7225 from owncloud/enc_improved_error_handling_oc6Vincent Petry2014-02-178-53/+184
|\
| * don't block login forever if we are stuck in the middle of the initial encryp...Bjoern Schiessle2014-02-175-10/+24
| * catch errors during decryptionBjoern Schiessle2014-02-173-17/+113
| * catch errors during initial encryptionBjoern Schiessle2014-02-172-26/+47
|/
* Send correct path on file upload when using public appJoas Schilling2014-02-141-4/+12
* Also clean up the filecache table when deleting a storage entryRobin Appelman2014-02-121-0/+6
* Also remove the user's home storage from the storage table when deleting a userRobin Appelman2014-02-122-0/+16
* Load authentication apps to get users from all backends - fixes #7019Thomas Müller2014-02-111-0/+1
* Merge pull request #7157 from owncloud/stable6-xsendfilequotacheckVincent Petry2014-02-111-0/+3
|\
| * Fix xsendfile local storage detection with quotaVincent Petry2014-02-111-0/+3
* | Merge pull request #6778 from owncloud/fix_6430blizzz2014-02-113-0/+110
|\ \ | |/ |/|
| * intendationArthur Schiwon2014-02-101-5/+5
| * fix DIArthur Schiwon2014-02-102-5/+8
| * Inject loggerArthur Schiwon2014-02-102-3/+13
| * wrong tldArthur Schiwon2014-02-101-1/+1
| * test for share dialoge sorterArthur Schiwon2014-02-101-0/+40
| * sort following entries in alphabetical orderArthur Schiwon2014-02-101-3/+4
| * move sorter into a classArthur Schiwon2014-02-102-24/+56