summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13581 from owncloud/make-naming-consistentMorris Jobke2015-01-222-2/+10
|\
| * Make naming of encryption app consistentLukas Reschke2015-01-212-2/+10
|/
* Merge pull request #13552 from owncloud/request-uri-double-slashThomas Müller2015-01-212-0/+3
|\
| * Add unit testRobin Appelman2015-01-211-0/+1
| * Remove duplicated slashes from the requested urlRobin Appelman2015-01-211-0/+2
* | Merge pull request #13519 from Sugaroverdose/fix_#13500Thomas Müller2015-01-211-1/+2
|\ \
| * | do not clear fields until request return successSugaroverdose2015-01-201-1/+2
* | | Merge pull request #13559 from owncloud/increase-log-table-marginMorris Jobke2015-01-211-1/+4
|\ \ \
| * | | add margin to log table - fixes #13558Morris Jobke2015-01-211-1/+4
| | |/ | |/|
* | | Merge pull request #13432 from owncloud/animate_gifs_public_sharingThomas Müller2015-01-215-3/+30
|\ \ \
| * | | show animated gifs on public sharing pageGeorg Ehrke2015-01-195-3/+30
* | | | Merge pull request #13563 from owncloud/proper-titleThomas Müller2015-01-211-1/+1
|\ \ \ \
| * | | | use title instead of nameMorris Jobke2015-01-211-1/+1
| | |/ / | |/| |
* | | | Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialogThomas Müller2015-01-213-59/+204
|\ \ \ \
| * | | | Add unit test for external share JS dialogVincent Petry2015-01-213-58/+202
| * | | | External share dialog must properly read entered passwordVincent Petry2015-01-211-1/+2
* | | | | Merge pull request #13554 from owncloud/issue/13482Morris Jobke2015-01-211-0/+1
|\ \ \ \ \
| * | | | | Set the debugoutput channel to error_log instead of echoing itJoas Schilling2015-01-211-0/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #13553 from owncloud/s2s-webdavmkdirfixThomas Müller2015-01-212-0/+117
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed external cache test namespaceVincent Petry2015-01-211-1/+3
| * | | | Fix webdav mkdir for remote sharesVincent Petry2015-01-212-0/+115
|/ / / /
* | | | Merge pull request #13539 from owncloud/unit-tests-must-haveBernhard Posselt2015-01-211-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Unit tests are a must have for any changed codeThomas Müller2015-01-211-0/+4
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2126-64/+130
* | | Merge pull request #13520 from owncloud/fix-comparison-opLukas Reschke2015-01-201-1/+1
|\ \ \
| * | | this must be larger then (>), since buggy behaviour occurs when the parameter...Arthur Schiwon2015-01-201-1/+1
| | |/ | |/|
* | | Merge pull request #13506 from owncloud/fix-scanner-s2s-trashbinMorris Jobke2015-01-201-1/+1
|\ \ \ | |/ / |/| |
| * | avoid $this->cache being null - fixes #13491Thomas Müller2015-01-201-1/+1
* | | Merge pull request #13499 from owncloud/issue/13451-redis-json-encodeThomas Müller2015-01-202-4/+10
|\ \ \
| * | | Json_(en|de)code values on redis to be able to cache arraysJoas Schilling2015-01-201-4/+4
| * | | Add a test case for memcaches to store an arrayJoas Schilling2015-01-201-0/+6
| |/ /
* | | Merge pull request #13512 from owncloud/kill-ancient-codeLukas Reschke2015-01-201-17/+0
|\ \ \
| * | | kill ancient codeMorris Jobke2015-01-201-17/+0
* | | | Merge pull request #13494 from owncloud/windows_warningMorris Jobke2015-01-202-5/+18
|\ \ \ \ | |/ / / |/| | |
| * | | add a Windows warningFrank Karlitschek2015-01-202-5/+18
* | | | Merge pull request #13497 from owncloud/fix-basic-auth-for-sessionLukas Reschke2015-01-202-3/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix WebDAV auth for session authentication onlyLukas Reschke2015-01-202-3/+5
* | | | Merge pull request #13454 from owncloud/improve-empty-displaynameJoas Schilling2015-01-201-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | also show message for empty display name if change of it isn't allowedMorris Jobke2015-01-191-2/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2036-26/+220
| |/ / |/| |
* | | Merge pull request #13416 from owncloud/reauthenticate-if-session-differs-fro...Morris Jobke2015-01-192-13/+44
|\ \ \
| * | | Close session properlyLukas Reschke2015-01-191-0/+1
| * | | Prioritise Basic Auth header over CookieLukas Reschke2015-01-172-13/+43
| | |/ | |/|
* | | Merge pull request #13480 from owncloud/mysql-autocommitLukas Reschke2015-01-191-4/+9
|\ \ \
| * | | set MySQL autocommit on connection setupThomas Müller2015-01-191-4/+9
* | | | Merge pull request #13478 from owncloud/tags-chunkedqueryLukas Reschke2015-01-192-4/+30
|\ \ \ \
| * | | | Fix chunked query for tags + unit testVincent Petry2015-01-192-4/+30
| |/ / /
* | | | Merge pull request #13471 from owncloud/fix-blog-typoLukas Reschke2015-01-192-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | fix typo of blog -> changed to blockMorris Jobke2015-01-192-2/+2
* | | | Merge pull request #13466 from owncloud/Undefined-index-mimetype-cacheThomas Müller2015-01-191-1/+1
|\ \ \ \ | |/ / / |/| | |