summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
|\ \ \ \ | |/ / / |/| | |
| * | | Remove unreachable code in priavte/api.phpMorris Jobke2016-02-141-5/+0
|/ / /
* | | Merge pull request #22369 from owncloud/fix-bmp-supportThomas Müller2016-02-141-0/+1
|\ \ \
| * | | Fix BMP supportMorris Jobke2016-02-141-0/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-14136-0/+152
* | | Merge pull request #22357 from owncloud/tags-hideonrenameThomas Müller2016-02-131-0/+5
|\ \ \
| * | | Properly hide tag name on renameVincent Petry2016-02-121-0/+5
* | | | Merge pull request #22351 from owncloud/fix_22277Thomas Müller2016-02-133-5/+173
|\ \ \ \
| * | | | show remote server on auto completeBjoern Schiessle2016-02-121-1/+5
| * | | | add remote server to the resultBjoern Schiessle2016-02-122-4/+168
* | | | | Merge pull request #22345 from owncloud/make-note-if-appcodechecker-is-not-en...Thomas Müller2016-02-133-2/+23
|\ \ \ \ \
| * | | | | Add note if integrity check is disabledLukas Reschke2016-02-123-2/+23
| | |_|/ / | |/| | |
* | | | | Merge pull request #22343 from owncloud/check-if-admin-userThomas Müller2016-02-131-1/+1
|\ \ \ \ \
| * | | | | Check if admin userLukas Reschke2016-02-121-1/+1
| |/ / / /
* | | | | Merge pull request #22331 from owncloud/dav-nonexisting-partThomas Müller2016-02-132-1/+7
|\ \ \ \ \
| * | | | | fix getNodeForPath for non existing part filesRobin Appelman2016-02-112-1/+7
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-1328-6/+226
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #22354 from owncloud/only-register-when-availableThomas Müller2016-02-121-2/+1
|\ \ \ \ \
| * | | | | Only register admin page when update is available Lukas Reschke2016-02-121-2/+1
|/ / / / /
* | | | | Merge pull request #21832 from owncloud/reduce-user-object-issuesThomas Müller2016-02-121-15/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Always set up a config object within the user objectMorris Jobke2016-02-121-15/+10
|/ / / /
* | | | Merge pull request #22349 from owncloud/icon-updatesThomas Müller2016-02-125-2/+13
|\ \ \ \
| * | | | add proper comment icon and add it to icons.cssJan-Christoph Borchardt2016-02-123-2/+6
| * | | | add white delete iconJan-Christoph Borchardt2016-02-123-0/+7
| | |/ / | |/| |
* | | | Merge pull request #21837 from owncloud/recipients-error-messageThomas Müller2016-02-121-2/+28
|\ \ \ \
| * | | | Clear error when removing textRoeland Jago Douma2016-02-121-1/+16