summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22416 from owncloud/fix_22402Thomas Müller2016-02-162-42/+15
|\
| * Return proper error string if sharing for this user is disabledRoeland Jago Douma2016-02-162-42/+15
* | Merge pull request #22338 from owncloud/fix_22247Thomas Müller2016-02-162-9/+10
|\ \
| * | Fix unit testsRoeland Jago Douma2016-02-121-7/+7
| * | More characters are allowed on POSIX systemsRoeland Jago Douma2016-02-121-2/+3
* | | Merge pull request #22417 from owncloud/issue-22389-duplicate-output-messageMorris Jobke2016-02-161-4/+0
|\ \ \
| * | | Remove inaccurate "is already enabled" messageJoas Schilling2016-02-161-4/+0
|/ / /
* | | Merge pull request #22398 from owncloud/fix-card-propertiesThomas Müller2016-02-164-15/+18
|\ \ \
| * | | Queries on the cards table by uri require the addressbook as well - fixes #22284Thomas Müller2016-02-154-15/+18
* | | | Merge pull request #22390 from owncloud/update-tarstreamerThomas Müller2016-02-161-0/+0
|\ \ \ \
| * | | | Update TarStreamer to v0.1.0Thomas Müller2016-02-151-0/+0
* | | | | Merge pull request #22400 from owncloud/files-select-closesidebarThomas Müller2016-02-162-9/+36
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Close file detail sidebar when selecting/unselecting filesVincent Petry2016-02-152-9/+36
| | |/ / | |/| |
* | | | Merge pull request #22377 from owncloud/remove-unneeded-codeThomas Müller2016-02-161-5/+5
|\ \ \ \
| * | | | Remove unneeded parameter from OC_App::getEnabledAppsMorris Jobke2016-02-151-5/+5
* | | | | Merge pull request #22385 from owncloud/issue-22384-invalid-content-location-...Thomas Müller2016-02-161-1/+1
|\ \ \ \ \
| * | | | | Deduplicate slashesJoas Schilling2016-02-151-1/+1
* | | | | | Merge pull request #22392 from owncloud/create-default-calendar-and-addressbookThomas Müller2016-02-162-2/+44
|\ \ \ \ \ \
| * | | | | | On login we create a default calendar and a default addressbook for the user ...Thomas Müller2016-02-152-2/+44
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #22403 from owncloud/improved-error-handlingThomas Müller2016-02-165-9/+41
|\ \ \ \ \ \
| * | | | | | forbidden (403) is a valid return status, don't log the whole exception in th...Bjoern Schiessle2016-02-152-4/+12
| * | | | | | throw exception if we don't find a token for a given serverBjoern Schiessle2016-02-151-0/+6
| * | | | | | Remove background job if the server accepted to ask for the shared secretBjoern Schiessle2016-02-152-5/+23
| |/ / / / /
* | | | | | Merge pull request #22407 from fancycode/untrusted_domainThomas Müller2016-02-161-1/+1
|\ \ \ \ \ \
| * | | | | | Pass checked host as "domain" variable to "untrustedDomain" template.Joachim Bauch2016-02-151-1/+1
| |/ / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-16138-130/+48
* | | | | | Merge pull request #22406 from pierreozoux/patch-1Thomas Müller2016-02-151-1/+1
|\ \ \ \ \ \
| * | | | | | typoPierre Ozoux2016-02-151-1/+1
|/ / / / / /
* | | | | | Merge pull request #22376 from owncloud/fix-return-code-getAppPathThomas Müller2016-02-151-14/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Properly handle return code of OC_App::getAppPathMorris Jobke2016-02-141-14/+29
| | |/ / / | |/| | |
* | | | | Merge pull request #22337 from owncloud/new_reshare_no_initiatorThomas Müller2016-02-151-4/+4
|\ \ \ \ \
| * | | | | The owner and recipient can also be nullRoeland Jago Douma2016-02-121-3/+3
| * | | | | If the initiator no longer exists return UIDRoeland Jago Douma2016-02-121-1/+1
* | | | | | Merge pull request #22358 from owncloud/fix-22278Thomas Müller2016-02-154-5/+32
|\ \ \ \ \ \
| * | | | | | Fix race condition when switching filter mode. Fixes #22278Arthur Schiwon2016-02-124-5/+32
* | | | | | | Merge pull request #22379 from owncloud/limit-scrutinizer-scopeThomas Müller2016-02-151-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Limit scope of scrutinizer to actual application codeMorris Jobke2016-02-141-0/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #22381 from owncloud/remove-not-needed-variableThomas Müller2016-02-151-1/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove not needed variableMorris Jobke2016-02-141-1/+0
| |/ / / / /
* | | | | | Merge pull request #22383 from owncloud/better-sharee-translationsThomas Müller2016-02-151-3/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Do not use string concatination for translationsJoas Schilling2016-02-151-3/+10
* | | | | | Merge pull request #22350 from owncloud/fix_22304Thomas Müller2016-02-153-8/+30
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Updated unit testsRoeland Jago Douma2016-02-121-1/+15
| * | | | | Provide proper feedback when creating a share in the webUIRoeland Jago Douma2016-02-122-7/+15
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-1544-2/+318
* | | | | Merge pull request #22380 from owncloud/make-scrutinizer-happyThomas Müller2016-02-152-2/+2
|\ \ \ \ \
| * | | | | Fix typo in PHPDocMorris Jobke2016-02-142-2/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #22375 from owncloud/fix_22352Thomas Müller2016-02-152-1/+55
|\ \ \ \ \
| * | | | | Search tags case insensitiveRoeland Jago Douma2016-02-142-1/+55
| |/ / / /
* | | | | Merge pull request #22378 from owncloud/drop-unreachable-codeThomas Müller2016-02-151-5/+0
|\ \ \ \ \ | |/ / / / |/| | | |