[Master] upstream sync#226

Merged

LukasReschke merged 58 commits intomasterfrom

master-upstream-sync

Jun 26, 2016

Commits on Jun 10, 2016

Commits on Jun 21, 2016

update session token password on user password change
ChristophWurst
committed
Filter out group shares for owner where owner is included (#25190)

Vincent Petry
authored and
DeepDiver1975
committed
pass new password instead of username
ChristophWurst
committed
Merge pull request #25042 from owncloud/session-settings-ellipsis
Vincent Petry
authored
fix broken unit test (#25198)
DeepDiver1975
authored
Contacts API: replace raw image data with url (#25081)

georgehrke
authored and
DeepDiver1975
committed
Merge pull request #25196 from owncloud/update-session-token-password
ChristophWurst
authored
redirect to new login route (#25099)

ChristophWurst
authored and
DeepDiver1975
committed
Merge pull request #24505 from owncloud/ceph-wait-for-http
Vincent Petry
authored
Fix null pointer exception in user_ldap (#25062)

butonic
authored and
DeepDiver1975
committed
app passwords/device tokens wording
ChristophWurst
committed
fix tranlations
ChristophWurst
committed
use theme name instead of hard-coded 'ownCloud'
ChristophWurst
committed
Fire hooks for mkdir for folder upload

karakayasemi
authored and
Vincent Petry
committed

Commits on Jun 22, 2016

[tx-robot] updated from transifex
Jenkins for ownCloud
committed
Merge pull request #25208 from owncloud/uploadfolder-firemkdirhooksforparents
Vincent Petry
authored
Add timeouts to make the UI usable again when a remote share is unreachable

nickvergessen
authored and
Vincent Petry
committed
Increase fed share timeout from 3 to 10 + unit tests
Vincent Petry
committed
occ web executor (#24957)

VicDeo
authored and
DeepDiver1975
committed
Hide more default options in occ files_external:list
icewind1991
committed
Merge pull request #25134 from owncloud/app-passwords
Vincent Petry
authored
Merge pull request #25172 from owncloud/token-login-validation
Vincent Petry
authored
Rollback version must also adjust cached size
Vincent Petry
committed
Merge pull request #25123 from owncloud/issue-23005-broken-remote-shares
Vincent Petry
authored
Merge pull request #25223 from owncloud/external-list-default-options
Vincent Petry
authored
Merge pull request #25225 from owncloud/enc-revertversionsize
Vincent Petry
authored
Init the headers in iedavclient.js
Vincent Petry
committed
Merge pull request #25233 from owncloud/iedavclient-nullheaders
MorrisJobke
authored

Commits on Jun 23, 2016

[tx-robot] updated from transifex
Jenkins for ownCloud
committed
Fix trashed file name corruption when rerendering trashbin list
Vincent Petry
committed
Don't reload page in case of auth errors during setup checks
Vincent Petry
committed
Add option to `occ files_external:list` to show all configured mounts
icewind1991
committed
Merge pull request #25238 from owncloud/files-trashlistnamecorruption
Vincent Petry
authored

Commits on Jun 24, 2016

[tx-robot] updated from transifex
Jenkins for ownCloud
committed
Merge pull request #25239 from owncloud/setupchecks-preventreload
Vincent Petry
authored
Show error message when posting an invalid comment
Vincent Petry
committed
Merge pull request #25171 from owncloud/files_external-list-all
Vincent Petry
authored
Fix search result link for file results outside default list
Vincent Petry
committed
Hide search results after switching directory
Vincent Petry
committed
Merge pull request #25257 from owncloud/comments-showerroronsave
ChristophWurst
authored
Merge pull request #25259 from owncloud/search-fixsearchfromotherfilelists
ChristophWurst
authored

Commits on Jun 25, 2016

[tx-robot] updated from transifex
Jenkins for ownCloud
committed

Commits on Jun 26, 2016

[tx-robot] updated from transifex
Jenkins for ownCloud
committed
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
LukasReschke
committed