summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8151 from owncloud/backport-8137-stable6Bernhard Posselt2014-04-102-5/+38
|\
| * add requirements to routingBernhard Posselt2014-04-102-5/+38
* | Merge pull request #8119 from Raydiation/stable6Bernhard Posselt2014-04-101-7/+15
|\ \
| * | Update controller.phpBernhard Posselt2014-04-101-1/+9
| * | Remove dependency on container, removing service locator antipatternBernhard Posselt2014-04-081-7/+7
* | | Fixed Sabre Node implementation to correctly return timestamps as intVincent Petry2014-04-101-3/+6
* | | Merge pull request #8148 from owncloud/backport-6676-stable6Vincent Petry2014-04-101-0/+5
|\ \ \ | |_|/ |/| |
| * | Disabled internet checking as mentioned when in proxy modeJoan2014-04-101-0/+5
|/ /
* | Merge pull request #8123 from owncloud/fix_filename_closing_tagMorris Jobke2014-04-091-5/+3
|\ \
| * | fix double closing </a> for filenamesJörn Friedrich Dreyer2014-04-091-5/+3
| |/
* / Backport of PR #7837 to stable6Arthur Schiwon2014-04-092-7/+235
|/
* Fixed chunking and insufficient storage checkVincent Petry2014-04-072-2/+50
* Do not expire chunks while checking for their existenceVincent Petry2014-04-041-5/+0
* Merge pull request #8038 from owncloud/fix_8028blizzz2014-04-041-2/+1
|\
| * Meanwhile, the quota value is stored human-readable in the DBArthur Schiwon2014-04-031-2/+1
* | Add bindParam to statement wrapperRobin Appelman2014-04-041-0/+14
* | fix unit testsRobin Appelman2014-04-041-5/+5
* | Merge pull request #8037 from owncloud/fix-7216Thomas Müller2014-04-031-1/+1
|\ \ | |/ |/|
| * authentication apps need to be loaded in any case - fixes #7216Thomas Müller2014-04-031-1/+1
|/
* use a non-recursive chmod on the datadirRobin Appelman2014-04-032-30/+1
* Improve phpdocRobin Appelman2014-04-032-1/+10
* Implement getPath for shared filesRobin Appelman2014-04-032-8/+82
* Give storages the option to implement the getById behaviour for View->getPathRobin Appelman2014-04-032-6/+29
* Merge pull request #7931 from owncloud/fix_7785_stable6blizzz2014-04-022-33/+61
|\
| * more precise php docArthur Schiwon2014-04-021-2/+4
| * add PHP docsArthur Schiwon2014-04-011-1/+12
| * LDAP: Read email and quota when mapping user, fixes #7785Arthur Schiwon2014-03-282-33/+48
* | Fix admin-dir_permissions redirection when cannot write warningVolkan Gezer2014-04-021-1/+1
* | general styles for the content areaJan-Christoph Borchardt2014-04-011-3/+19
* | Correction: failure on sharing when user ID was prefixed by zeroRodrigo Hjort2014-04-011-3/+3
* | Merge pull request #7976 from owncloud/fix-7973-stable6-2Vincent Petry2014-04-0115-2569/+0
|\ \
| * | remove pl_PL - fixes #7973Thomas Müller2014-03-3115-2569/+0
* | | Revert "remove Sabre_DAV_Browser_Plugin"Thomas Müller2014-04-011-0/+1
|/ /
* / don't write file if opening a stream to encrypt the data failsBjoern Schiessle2014-03-281-0/+2
|/
* don't block php session while download is in progressJörn Friedrich Dreyer2014-03-281-0/+3
* Merge pull request #7901 from owncloud/fixed_position_ocdialogdimMorris Jobke2014-03-281-1/+1
|\
| * prevent dimmed ocdialog div from scrollingJörn Friedrich Dreyer2014-03-261-1/+1
* | Fix swift touch operationVincent Petry2014-03-271-1/+1
* | Fixed mtime reading from OpenStack APIVincent Petry2014-03-271-0/+4
|/
* Fix 'Undefined variable: message' in OCP\Util::logExceptionThomas Tanghus2014-03-251-5/+2
* add test for cloning and keeping configuration seperateArthur Schiwon2014-03-211-0/+54
* Use array_key_exists instead of isset, because the latter returns false if th...Arthur Schiwon2014-03-211-2/+2
* On clone create a new instance of the ConfigurationArthur Schiwon2014-03-211-0/+2
* Fixed warning when browsing Shared folderVincent Petry2014-03-211-1/+1
* Merge pull request #7840 from owncloud/fix/7839Thomas Müller2014-03-214-4/+4
|\
| * fixing wrong html close tagsThomas Müller2014-03-214-4/+4
* | Merge pull request #7834 from owncloud/stable6-quota-usequotaevenwhenfreespac...Vincent Petry2014-03-212-1/+26
|\ \ | |/ |/|
| * Still return quota value when free space is unknownVincent Petry2014-03-212-1/+26
* | Fix duplicate ipauniqueidRobin McCorkell2014-03-211-1/+1
* | Add FreeIPA UUID compatibility, fixes #7796Robin McCorkell2014-03-211-2/+2
|/