summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* removed unused importsRobin Appelman2016-01-111-3/+0
* improve handling of non existing files in the trashbinRobin Appelman2016-01-111-10/+15
* handle not found in trash hookRobin Appelman2016-01-111-1/+5
* Typo in error messageLukas Reschke2016-01-111-3/+3
* de-deplicate getUidAndFilenameRobin Appelman2016-01-114-33/+29
* dont return an owner for files that don't existRobin Appelman2016-01-111-2/+7
* Merge pull request #21589 from owncloud/mobile-webDAV-selectThomas Müller2016-01-111-2/+3
|\
| * webDAV select bug fixedJulian Müller2016-01-111-2/+3
* | Merge pull request #21593 from owncloud/strict_autoloaderThomas Müller2016-01-111-2/+3
|\ \
| * | Only '/tests' to be autoloaded when running unit testsRoeland Jago Douma2016-01-101-1/+3
| * | OC autoloader is not allowed to load 3rdpartyRoeland Jago Douma2016-01-101-1/+0
* | | Merge pull request #21586 from owncloud/fix-no-minimum-versionThomas Müller2016-01-111-0/+5
|\ \ \
| * | | Assume apps from the appstore are compatible with the current versionLukas Reschke2016-01-101-0/+5
| |/ /
* | | Merge pull request #21573 from owncloud/fix_21535_21534Thomas Müller2016-01-112-1/+19
|\ \ \
| * | | Add unit test for file updateRoeland Jago Douma2016-01-091-0/+16
| * | | Updating a file should not update the summaryRoeland Jago Douma2016-01-091-1/+3
* | | | Merge pull request #21594 from owncloud/cleanup_utilThomas Müller2016-01-115-20/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove generateRandomBytes from OC_UtilRoeland Jago Douma2016-01-105-20/+3
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-1126-160/+268
* | | Merge pull request #21596 from owncloud/settings-footerMorris Jobke2016-01-112-11/+7
|\ \ \ | |/ / |/| |
| * | remove extra slogan footer from Personal and Admin pagesJan-Christoph Borchardt2016-01-112-11/+7
|/ /
* | Merge pull request #21572 from owncloud/fix-setup-warningsThomas Müller2016-01-101-2/+2
|\ \
| * | Concat also the other resultsLukas Reschke2016-01-101-2/+2
|/ /
* | Merge pull request #21577 from owncloud/make-code-cleaner-by-removing-unrequi...Morris Jobke2016-01-101-11/+1
|\ \
| * | Remove code related to session regeneration after some timeLukas Reschke2016-01-101-11/+1
|/ /
* | Merge pull request #21575 from owncloud/use-session-clearMorris Jobke2016-01-101-4/+1
|\ \
| * | Use ISession::clearLukas Reschke2016-01-101-4/+1
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-1042-82/+394
* | Merge pull request #21576 from owncloud/use-proper-class-nameLukas Reschke2016-01-101-1/+1
|\ \
| * | Use proper class nameLukas Reschke2016-01-091-1/+1
|/ /
* | Merge pull request #21571 from owncloud/query_secure_randomRoeland Douma2016-01-091-1/+1
|\ \ | |/ |/|
| * Just query the securerandom from the containerRoeland Jago Douma2016-01-091-1/+1
|/
* Merge pull request #21562 from owncloud/properly-check-for-well-known-redirectThomas Müller2016-01-094-0/+59
|\
| * Add check for .well-known URL in the root of the webservers URLMorris Jobke2016-01-084-0/+59
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-0934-48/+466
|/
* Merge pull request #19676 from owncloud/fix_15253Morris Jobke2016-01-082-46/+333
|\
| * Properly close db cursorsRoeland Jago Douma2016-01-082-4/+7
| * Make sure to respect deleted group shares by userRoeland Jago Douma2016-01-082-1/+82
| * Moved to the query builderRoeland Jago Douma2016-01-081-17/+56
| * Make sure that permissions stay in sync for share_type 2Roeland Jago Douma2016-01-082-44/+208
|/
* Merge pull request #21008 from owncloud/UoM-ResPlat-DevOps-swift-acl-shared-c...Thomas Müller2016-01-081-2/+19
|\
| * Allowing access to Swift containers shared by ACLTim Dettrick2016-01-081-2/+19
* | Merge pull request #20961 from owncloud/provis-api-group-special-charThomas Müller2016-01-082-2/+23
|\ \
| * | Update log message when error occurs during addGroupTom Needham2016-01-081-1/+1
| * | Fix provisioning API unit testRoeland Jago Douma2016-01-081-1/+1
| * | Remove unnecessary group name validationTom Needham2016-01-082-1/+22
* | | Merge pull request #21491 from owncloud/webdav_auth_no_basic_authThomas Müller2016-01-082-4/+19
|\ \ \
| * | | Allow only cookie auth to webdavRoeland Jago Douma2016-01-072-4/+19
* | | | Merge pull request #21546 from owncloud/jsunit-stubportinpublicappspecThomas Müller2016-01-081-1/+3
|\ \ \ \
| * | | | Fix public page URL JS testVincent Petry2016-01-081-1/+3