summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13332 from oparoz/fix-download-buttonThomas Müller2015-01-141-1/+6
|\
| * Download the current public folder onlyOlivier Paroz2015-01-141-1/+6
* | Merge pull request #13286 from owncloud/sharing_upgradeBjörn Schießle2015-01-144-1/+131
|\ \
| * | set accept to 1 (=true) for all server-to-server shares on update, at this po...Bjoern Schiessle2015-01-134-1/+131
* | | Merge pull request #13288 from owncloud/enc_fix_public_downloadLukas Reschke2015-01-143-25/+14
|\ \ \
| * | | if we download a public shared file we need to retrieve the user from the pathBjoern Schiessle2015-01-133-25/+14
| |/ /
* | | Merge pull request #13335 from owncloud/disable-rememberme-files-externalThomas Müller2015-01-141-0/+1
|\ \ \
| * | | The files_external app might need the password so autologin must be disabledJoas Schilling2015-01-141-0/+1
* | | | Merge pull request #13311 from owncloud/fix_restore_keysBjörn Schießle2015-01-145-42/+145
|\ \ \ \ | |/ / / |/| | |
| * | | adapt decrypt all and restore/delete key backups to the new folder structure ...Bjoern Schiessle2015-01-135-42/+145
* | | | Merge pull request #13325 from owncloud/kill-strip-slashesMorris Jobke2015-01-145-9/+8
|\ \ \ \
| * | | | Get rid of `stripslashes()`Lukas Reschke2015-01-135-9/+8
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-14176-12/+452
| |_|_|/ |/| | |
* | | | Merge pull request #13320 from owncloud/fix-php-doc-for-files-viewMorris Jobke2015-01-131-1/+11
|\ \ \ \
| * | | | drop unused parameterMorris Jobke2015-01-131-2/+1
| * | | | Fix annotations in file viewLukas Reschke2015-01-131-0/+11
| |/ / /
* | | | Merge pull request #13318 from owncloud/fix-annotationMorris Jobke2015-01-131-3/+3
|\ \ \ \
| * | | | Fix PHP doc and enforce typeLukas Reschke2015-01-131-3/+3
| |/ / /
* | | | Merge pull request #13316 from owncloud/drop-dead-codeMorris Jobke2015-01-131-4/+0
|\ \ \ \ | |/ / / |/| | |
| * | | drop dead code - ref #13301Morris Jobke2015-01-131-4/+0
|/ / /
* | | Merge pull request #13217 from owncloud/make-basic-auth-work-againBernhard Posselt2015-01-131-13/+15
|\ \ \
| * | | Add some more sanity checks for maintenance modeLukas Reschke2015-01-091-1/+3
| * | | Verify authentication before initializing apps and routingLukas Reschke2015-01-091-13/+13
* | | | Merge pull request #13291 from owncloud/node-searchcommonbasepathfixThomas Müller2015-01-132-0/+40
|\ \ \ \
| * | | | Fix searchCommon to properly match path nameVincent Petry2015-01-122-0/+40
| | |_|/ | |/| |
* | | | Merge pull request #13277 from owncloud/pasteurlJoas Schilling2015-01-131-1/+1
|\ \ \ \
| * | | | add https:// placeholder for From Link feature. closes #13255Volkan Gezer2015-01-121-1/+1
* | | | | Merge pull request #13301 from owncloud/drop-etag-messageVincent Petry2015-01-131-3/+0
|\ \ \ \ \
| * | | | | drop useless "!!! No reuse of etag" - fixes #13187Morris Jobke2015-01-131-3/+0
* | | | | | Merge pull request #13305 from owncloud/remove-stray-minus-and-use-json-encodeRobin McCorkell2015-01-131-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Use json_encode on stringLukas Reschke2015-01-131-1/+1
* | | | | | Merge pull request #13271 from owncloud/fix-table-prefix-oracle-masterMorris Jobke2015-01-136-9/+32
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use a special filter expression for Oracle to filter the prefix - fixes #13220Thomas Müller2015-01-126-9/+32
* | | | | | Merge pull request #13299 from owncloud/fix-ie8Thomas Müller2015-01-131-1/+2
|\ \ \ \ \ \
| * | | | | | usage of const in JS is supported in IE11+Morris Jobke2015-01-131-1/+2
* | | | | | | Merge pull request #13278 from owncloud/repair-step-missing-etagsMorris Jobke2015-01-132-1/+44
|\ \ \ \ \ \ \
| * | | | | | | Adding repair step to fix missing etags - fixes #12172Thomas Müller2015-01-122-1/+44
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #13289 from owncloud/fav-keepfavoncancelrenameMorris Jobke2015-01-132-6/+41
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Properly update internal file info with updated tagsVincent Petry2015-01-122-6/+41
| | |_|_|/ / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-13214-270/+442
* | | | | | Merge pull request #13293 from owncloud/occ-required-posixLukas Reschke2015-01-121-0/+4
|\ \ \ \ \ \
| * | | | | | Check for the posix extension - refs https://github.com/owncloud/core/pull/13...Thomas Müller2015-01-121-0/+4
* | | | | | | Merge pull request #13154 from owncloud/fix13141Thomas Müller2015-01-122-7/+122
|\ \ \ \ \ \ \
| * | | | | | | add js tests for filelist filteringJörn Friedrich Dreyer2015-01-092-6/+119
| * | | | | | | don't show no files yet when mask is in place, fixes #13141Jörn Friedrich Dreyer2015-01-071-1/+3
* | | | | | | | Merge pull request #13272 from owncloud/fav-renamekeepfavJoas Schilling2015-01-122-2/+75
|\ \ \ \ \ \ \ \
| * | | | | | | | Return path attribute for ajax rename operationsVincent Petry2015-01-122-0/+3
| * | | | | | | | Return tags after renameVincent Petry2015-01-122-2/+72
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #13285 from owncloud/fix-encryption-check-number-of-partsMorris Jobke2015-01-121-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Check array size, before using the 3rd element from itJoas Schilling2015-01-121-0/+9