summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13257 from owncloud/fixrmpermThomas Müller2015-01-111-2/+2
|\
| * l10n: delete permanently fixVolkan Gezer2015-01-111-2/+2
|/
* Merge pull request #13256 from owncloud/versionupThomas Müller2015-01-111-2/+2
|\
| * version upVolkan Gezer2015-01-111-2/+2
|/
* Merge pull request #13251 from owncloud/spaceoutsideVolkan Gezer2015-01-111-2/+2
|\
| * keep spaces out of translationVolkan Gezer2015-01-111-2/+2
* | Merge pull request #13250 from owncloud/bittypoVolkan Gezer2015-01-111-3/+3
|\ \
| * | 32-bit typo fixVolkan Gezer2015-01-111-3/+3
| |/
* / suggestion by transifex translatorVolkan Gezer2015-01-111-1/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-1132-54/+98
* 8.0.0 alpha 2v8.0.0alpha2Frank Karlitschek2015-01-111-2/+2
* Merge pull request #13226 from owncloud/fix-encodingVolkan Gezer2015-01-101-1/+1
|\
| * Don't double encode stringLukas Reschke2015-01-101-1/+1
* | Merge pull request #13224 from owncloud/simplify-is-valid-path-and-add-unit-t...Morris Jobke2015-01-102-1/+34
|\ \
| * | Simplify isValidPath and add unit testsLukas Reschke2015-01-102-1/+34
* | | Merge pull request #13223 from owncloud/optimize-normalize-unicodeMorris Jobke2015-01-101-5/+8
|\ \ \
| * | | Verify whether value is already normalizedLukas Reschke2015-01-101-5/+8
* | | | Merge pull request #13236 from owncloud/use-isset-for-performanceMorris Jobke2015-01-101-2/+4
|\ \ \ \
| * | | | Use isset() instead of strlen()Lukas Reschke2015-01-101-2/+4
| |/ / /
* | | | Merge pull request #13235 from owncloud/cache-normalize-pathMorris Jobke2015-01-101-1/+12
|\ \ \ \
| * | | | Cache results of `normalizePath`Lukas Reschke2015-01-101-1/+12
| |/ / /
* | | | Merge pull request #13225 from owncloud/add-csrf-checkMorris Jobke2015-01-101-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add CSRF check to searchLukas Reschke2015-01-101-1/+2
| |/ /
* | | Merge pull request #13212 from owncloud/cache-appstore-responseMorris Jobke2015-01-107-45/+76
|\ \ \
| * | | Cache responses from the AppStore serverLukas Reschke2015-01-097-45/+76
| |/ /
* | / [tx-robot] updated from transifexJenkins for ownCloud2015-01-1062-32/+230
| |/ |/|
* | Fix URL to developer manualLukas Reschke2015-01-101-1/+1
|/
* Merge pull request #13204 from owncloud/enc_fix_key_lostVincent Petry2015-01-092-630/+714
|\
| * unit testsBjoern Schiessle2015-01-091-4/+86
| * don't move encryption keys if a mount point was renamedBjoern Schiessle2015-01-091-626/+628
* | Merge pull request #13195 from owncloud/resharepermfixMorris Jobke2015-01-092-0/+158
|\ \
| * | Fix reshare permission issueVincent Petry2015-01-092-0/+158
* | | Merge pull request #13208 from owncloud/hhvm-streamwrapper-exceptionThomas Müller2015-01-091-12/+5
|\ \ \
| * | | HHVM Workaround: Do not use Exception from Stream.Andreas Fischer2015-01-091-12/+5
* | | | Merge pull request #13192 from owncloud/cache_binary_pathThomas Müller2015-01-093-4/+45
|\ \ \ \
| * | | | Memcache binary executable searchingRobin McCorkell2015-01-091-2/+8
| * | | | Add Null memcacherRobin McCorkell2015-01-092-2/+37
* | | | | Merge pull request #13188 from owncloud/add-check-if-user-is-logged-inThomas Müller2015-01-092-0/+3
|\ \ \ \ \
| * | | | | Add check if user is logged-inLukas Reschke2015-01-092-0/+3
* | | | | | Merge pull request #13196 from owncloud/js-personal-no-passwordRobin Appelman2015-01-091-1/+3
|\ \ \ \ \ \
| * | | | | | Fix js error in personal settings if there is no password fieldRobin Appelman2015-01-091-1/+3
* | | | | | | Merge pull request #13205 from owncloud/remove-shared-iconThomas Müller2015-01-092-3/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | replace outdated 'shared' people icon with regular share icon as fallbackJan-Christoph Borchardt2015-01-092-3/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #13181 from owncloud/filecache-preventleadingslashRobin McCorkell2015-01-093-2/+38
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix cache jail to not duplicate slashesVincent Petry2015-01-091-1/+1
| * | | | | Trim leading or trailing slashes in file cache pathsVincent Petry2015-01-082-1/+37
* | | | | | Merge pull request #12011 from owncloud/reuse-etag-defaultMorris Jobke2015-01-091-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Default to reusing etags in the scannerRobin Appelman2014-11-061-2/+2
* | | | | | Merge pull request #12995 from owncloud/tbelau666-masterThomas Müller2015-01-097-32/+47
|\ \ \ \ \ \
| * | | | | | add default for dbtableprefixMorris Jobke2014-12-234-5/+5