summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6065 from owncloud/l10n-updateThomas Müller2013-11-261-1/+1
|\
| * Translate reload message after updateMorris Jobke2013-11-261-1/+1
|/
* Merge pull request #6008 from owncloud/extstorage-smb-webdav-renamefixVincent Petry2013-11-263-3/+25
|\
| * Improved unit test for "overwrite on move"Vincent Petry2013-11-251-3/+5
| * Added unit test for "overwrite file on rename/move"Vincent Petry2013-11-251-0/+6
| * Fixed SMB rename function to overwrite target fileVincent Petry2013-11-252-2/+16
* | Merge pull request #6059 from owncloud/occ-repairMorris Jobke2013-11-264-1/+68
|\ \
| * | Add a (currently) empty system for running common repair stepsRobin Appelman2013-11-264-1/+68
|/ /
* | Merge pull request #6053 from owncloud/remove_passwords_from_logMorris Jobke2013-11-261-0/+2
|\ \
| * | remove passwords from logfileBjoern Schiessle2013-11-261-0/+2
* | | Merge pull request #6056 from owncloud/check_loginMorris Jobke2013-11-261-0/+3
|\ \ \
| * | | check if user is logged inBjoern Schiessle2013-11-261-0/+3
| |/ /
* | | Merge pull request #6054 from owncloud/extstorage-dropboxfixesMorris Jobke2013-11-262-12/+60
|\ \ \
| * | | Fixed various Dropbox issues + unit testsVincent Petry2013-11-262-12/+60
| |/ /
* | | Merge pull request #6057 from owncloud/extstorage-touchoperationMorris Jobke2013-11-263-1/+8
|\ \ \ | |/ / |/| |
| * | Updated unit tests for SMBVincent Petry2013-11-262-1/+7
| * | Return true when touch succeedsVincent Petry2013-11-261-0/+1
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-26260-1783/+2525
* | Merge pull request #5937 from owncloud/calc_version_sizeMorris Jobke2013-11-251-12/+11
|\ \
| * \ Merge branch 'master' into calc_version_sizeBjoern Schiessle2013-11-26792-11808/+13458
| |\ \ | |/ / |/| |
* | | Merge pull request #6044 from owncloud/extstorage-ftpunittestfixVincent Petry2013-11-251-4/+4
|\ \ \
| * | | Fixed FTP storage unit tests to use the correct classVincent Petry2013-11-251-4/+4
* | | | Merge pull request #6036 from owncloud/single-user-modeMorris Jobke2013-11-256-1/+84
|\ \ \ \
| * \ \ \ merge master into single-user-modeRobin Appelman2013-11-2546-62/+530
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #6034 from owncloud/fix-api-documentationOwen Winkler2013-11-2529-25/+231
|\ \ \ \ \
| * | | | | fix some capital lettersMorris Jobke2013-11-255-5/+14
| * | | | | page level doc blocks and class descriptionsMorris Jobke2013-11-2515-0/+95
| * | | | | AppFramework(Controller|HTTP|HTTP-Responses|Middleware), IContainer API fixesMorris Jobke2013-11-257-4/+58
| * | | | | fix defaults.php docMorris Jobke2013-11-251-10/+18
| * | | | | fix defaults.php docMorris Jobke2013-11-251-6/+44
| * | | | | fix db.php docMorris Jobke2013-11-251-0/+2
* | | | | | Merge pull request #6038 from owncloud/occ-app-enableicewind19912013-11-254-0/+126
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add occ command to list all appsRobin Appelman2013-11-252-0/+48
| * | | | | rename app_id to app-idRobin Appelman2013-11-252-4/+4
| * | | | | add occ commands for enabling and disabling appsRobin Appelman2013-11-253-0/+78
* | | | | | Merge pull request #6035 from owncloud/fixing-rawpath-reverseproxy-oc6Jörn Friedrich Dreyer2013-11-252-1/+54
|\ \ \ \ \ \
| * | | | | | in case uri and script name don't match we better throw an exceptionThomas Müller2013-11-252-2/+32
| * | | | | | handle duplicate slashes in case of reverse proxy configurationThomas Müller2013-11-252-1/+24
| |/ / / / /
* | | | | | Merge pull request #6037 from owncloud/fix-6007-oc6Thomas Müller2013-11-251-0/+12
|\ \ \ \ \ \
| * | | | | | adding chunked upload handlingThomas Müller2013-11-251-0/+12
* | | | | | | Merge pull request #6040 from owncloud/fix-navbar-cssRaghu Nayyar2013-11-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix navbar issueMorris Jobke2013-11-251-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #6030 from owncloud/cli-errorsicewind19912013-11-251-6/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | provide more cli friendly error messagesRobin Appelman2013-11-251-6/+21
| |/ / / / /
* | | | | | Merge pull request #5641 from owncloud/filestrash-emptytrashBjörn Schießle2013-11-255-26/+77
|\ \ \ \ \ \
| * | | | | | Deleting all files in trash now only sends a single flagVincent Petry2013-11-115-26/+77
* | | | | | | Merge pull request #6028 from owncloud/extstorage-touchoperationreturnvalueVincent Petry2013-11-253-3/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fixed ext storage touch function to return true on successVincent Petry2013-11-253-3/+8
| | |_|_|_|/ | |/| | | |
| | | | * | add documentation for single user config option to config.sample.phpRobin Appelman2013-11-251-0/+3
| | | | * | Add template for single user mode messageRobin Appelman2013-11-251-0/+10