summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* adding test testSimplePutFailsOnRename()Thomas Müller2013-09-301-0/+14
* remove commented codeThomas Müller2013-09-301-56/+0
* Merge branch 'master' into fixing-4011-masterThomas Müller2013-09-3097-573/+1100
|\
| * Merge pull request #4969 from owncloud/fixing-4043-masterThomas Müller2013-09-303-3/+139
| |\
| | * code cleanupThomas Müller2013-09-271-39/+22
| | * adding unit tests for ObjectTree::move()Thomas Müller2013-09-262-14/+134
| | * adding privilege check on move and rename operationsThomas Müller2013-09-242-1/+34
| * | Merge pull request #3563 from evgeni/curl-no-timeoutThomas Müller2013-09-301-9/+0
| |\ \
| | * | cURL does not honour default_socket_timeoutEvgeni Golov2013-09-301-9/+0
| |/ /
| * | Merge pull request #4966 from owncloud/text_preview_blacklistAndreas Fischer2013-09-294-1/+71
| |\ \
| | * | rename variable in testIsTransparentGeorg Ehrke2013-09-271-3/+3
| | * | rename testTxtBlacklist to txtBlacklistGeorg Ehrke2013-09-271-3/+3
| | * | move fileView object initialization to testIsTransparentGeorg Ehrke2013-09-271-10/+10
| | * | use dataProvider for txt blacklist testGeorg Ehrke2013-09-271-25/+28
| | * | add test for txt blacklistGeorg Ehrke2013-09-251-0/+38
| | * | add test data for cal and contact previewGeorg Ehrke2013-09-242-0/+19
| | * | add blacklist to txt preview backendGeorg Ehrke2013-09-241-0/+10
| * | | Merge pull request #4960 from owncloud/fixing-mirall-1014-masterThomas Müller2013-09-292-2/+15
| |\ \ \
| | * | | duplicate code :sigh: - will fix this in a second prThomas Müller2013-09-241-1/+8
| | * | | adding file_exists check just to be on the save sideThomas Müller2013-09-241-1/+2
| | * | | handle error situation of rename properThomas Müller2013-09-231-1/+6
| * | | | Merge pull request #5031 from zimba12/masterThomas Müller2013-09-291-1/+2
| |\ \ \ \
| | * | | | followup of #4032 - makes the settings-button bigger and adds again padding a...Alessandro Cosentino2013-09-291-1/+2
| |/ / / /
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-2923-122/+154
| * | | | Merge pull request #5030 from owncloud/base_defaultavatar_text_on_displaynameMorris Jobke2013-09-283-2/+7
| |\ \ \ \
| | * | | | Have uniform (wrong) indentionkondou2013-09-281-1/+1
| | * | | | Base defaultavatar text on displaynamekondou2013-09-283-2/+7
| |/ / / /
| * | | | Merge pull request #5004 from owncloud/phpunit-dist-coverage-excludesMorris Jobke2013-09-281-0/+14
| |\ \ \ \
| | * | | | phpunit.xml: Port code coverage excludes from autotest to dist.Andreas Fischer2013-09-261-0/+14
| * | | | | Merge pull request #4207 from owncloud/search_shared_filesThomas Müller2013-09-272-12/+72
| |\ \ \ \ \
| | * | | | | adding PHPDoc comments to getBackendThomas Müller2013-09-242-7/+12
| | * | | | | same for search by mimeJörn Friedrich Dreyer2013-09-191-4/+4
| | * | | | | add all results, sharing cache also returns entries for shared files in exter...Jörn Friedrich Dreyer2013-09-191-4/+4
| | * | | | | fix getAll(), refactor search by mime & searchJörn Friedrich Dreyer2013-09-191-18/+37
| | * | | | | return fixed path, skip shared files outside of 'files'Jörn Friedrich Dreyer2013-09-191-3/+6
| | * | | | | divide ids into chunks of 1kJörn Friedrich Dreyer2013-09-191-9/+18
| | * | | | | add initial search in shared filesJörn Friedrich Dreyer2013-09-192-2/+26
| * | | | | | Merge pull request #5001 from owncloud/fixing-user-external-backends-masterMorris Jobke2013-09-271-0/+1
| |\ \ \ \ \ \
| | * | | | | | prelogin apps have to be loaded within setupBackend() otherwise required clas...Thomas Müller2013-09-261-0/+1
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-2731-121/+153
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #4999 from owncloud/run-unit-tests-for-apps-masterMorris Jobke2013-09-261-2/+0
| |\ \ \ \ \ \
| | * | | | | | Remove $RUNTIME_NOAPPS - setting to false was not enoughThomas Müller2013-09-261-2/+0
| | * | | | | | run unit tests for apps as wellThomas Müller2013-09-261-1/+1
| * | | | | | | Merge pull request #4990 from owncloud/user_fix_managerblizzz2013-09-262-1/+44
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Missing Test for the previous commitArthur Schiwon2013-09-251-0/+43
| | * | | | | | manager checkPassword now returns User object, adjust internal user class acc...Arthur Schiwon2013-09-251-1/+1
| * | | | | | | Merge pull request #4887 from owncloud/sharing_disable_public_uploadBjörn Schießle2013-09-261-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | we can leave the loop if the permission of the link share was checkedBjoern Schiessle2013-09-171-3/+1
| | * | | | | | | check only permission from link-share to decide if public upload is enabled o...Bjoern Schiessle2013-09-171-1/+3
| * | | | | | | | Merge pull request #4991 from owncloud/enc_fix_warningThomas Müller2013-09-262-5/+7
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |