summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 PHPDoc
| * 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 in UI case insensitive
| * | Search tags case insensitiveRoeland Jago Douma2016-02-142-1/+55
| |/ | | | | | | | | | | fixes: #22352 * Added unit tests
* | Merge pull request #22378 from owncloud/drop-unreachable-codeThomas Müller2016-02-151-5/+0
|\ \ | |/ |/| Remove unreachable code in priavte/api.php
| * 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 support
| * Fix BMP supportMorris Jobke2016-02-141-0/+1
|/ | | | * fixes #16461
* [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 rename
| * 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 federated share auto-complete
| * | 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 ↵Thomas Müller2016-02-133-2/+23
|\ \ \ | | | | | | | | | | | | | | | | owncloud/make-note-if-appcodechecker-is-not-enabled Add note if integrity check is disabled
| * | | Add note if integrity check is disabledLukas Reschke2016-02-123-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our issue template states that users should post the output of `/index.php/settings/integrity/failed`, at the moment it displays that all passes have been passed if the integrity checker has been disabled. This is however a wrong approach considering that some distributions are gonna package Frankenstein releases and makes it harder for us to detect such issues. Thus if the integrity code checker is disabled (using the config switch) it displays now: `Appcode checker has been disabled. Integrity cannot be verified.` This is not displayed anywhere else in the UI except these URL used for us for debugging purposes.
* | | | Merge pull request #22343 from owncloud/check-if-admin-userThomas Müller2016-02-131-1/+1
|\ \ \ \ | | | | | | | | | | Check if admin user
| * | | | Check if admin userLukas Reschke2016-02-121-1/+1
| |/ / / | | | | | | | | | | | | We should not add the JS for not admin users.
* | | | Merge pull request #22331 from owncloud/dav-nonexisting-partThomas Müller2016-02-132-1/+7
|\ \ \ \ | | | | | | | | | | fix getNodeForPath for non existing part files
| * | | | 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
| * | | | | Only register admin page when update is available Lukas Reschke2016-02-121-2/+1
|/ / / / / | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/22353
* | | | | 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 object
| * | | | Always set up a config object within the user objectMorris Jobke2016-02-121-15/+10
|/ / / / | | | | | | | | | | | | * the new getEmailAddress and setEmailAddress relies on this anyway
* | | | Merge pull request #22349 from owncloud/icon-updatesThomas Müller2016-02-125-2/+13
|\ \ \ \ | | | | | | | | | | icon fixes: comments, delete
| * | | | 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
|\ \ \ \ | | | | | | | | | | First try for shareWithField error message
| * | | | Clear error when removing textRoeland Jago Douma2016-02-121-1/+16
| | | | |
| * | | | Update tooltip on new searchRoeland Jago Douma2016-02-121-8/+12
| | | | |
| * | | | First try for shareWithField error messageJulian Müller2016-02-121-0/+7
| | | | | | | | | | | | | | | | | | | | Second try for ShareWithField error message
* | | | | Merge pull request #22292 from owncloud/smb-handle-forbiddenThomas Müller2016-02-121-1/+18
|\ \ \ \ \ | | | | | | | | | | | | handle forbidden exceptions in smb backend
| * | | | | handle forbidden exceptions in smb backendRobin Appelman2016-02-101-1/+18
| | | | | |
* | | | | | Merge pull request #22294 from owncloud/carddav-report-list-groups-2Thomas Müller2016-02-125-2/+119
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adding a custom webdav property which holds the list of contacts groups
| * | | | | | Adding a custom webdav property which holds the list of contacts groupsThomas Müller2016-02-105-2/+119
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #22305 from owncloud/sharestatus_to_ocs_22298Thomas Müller2016-02-122-6/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Calculate the share statuses in js from the OCS Response
| * | | | | | Reload list of shares on directory changeRoeland Jago Douma2016-02-112-1/+11
| | | | | | |
| * | | | | | Calculate the share statuses in js from the OCS ResponseRoeland Jago Douma2016-02-111-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now this is only done on page load. We should do it on each directory traversal.
* | | | | | | Merge pull request #22309 from owncloud/infinite-recursion-on-expired-linkThomas Müller2016-02-122-14/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Do not getShare in deleteShare, it's already there when deleting
| * | | | | | | Fix unit testsRoeland Jago Douma2016-02-111-12/+2
| | | | | | | |
| * | | | | | | Do not getShare in deleteShare, it's already there when deletingJoas Schilling2016-02-111-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #22317 from owncloud/fix_invisible_linksharesThomas Müller2016-02-126-32/+214
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Do not allow invisible link shares
| * | | | | | | Fix migration step to avoind invisible sharesRoeland Jago Douma2016-02-112-32/+63
| | | | | | | |
| * | | | | | | Add testsRoeland Jago Douma2016-02-111-0/+120
| | | | | | | |
| * | | | | | | Add parent for invisible link sharesRoeland Jago Douma2016-02-113-0/+31
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-12210-360/+328
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #22334 from owncloud/files_videoplayer_it_isThomas Müller2016-02-111-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Mark files_videoplayer as shipped
| * | | | | | | Mark files_videoplayer as shippedLukas Reschke2016-02-111-1/+1
|/ / / / / / / | | | | | | | | | | | | | | Ref https://github.com/owncloud/files_video_player/pull/27 + https://github.com/owncloud/files_videoplayer/issues/26#issuecomment-182968638