summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix race condition when switching filter mode. Fixes #22278Arthur Schiwon2016-02-124-5/+32
* 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
| * | Update tooltip on new searchRoeland Jago Douma2016-02-121-8/+12
| * | First try for shareWithField error messageJulian Müller2016-02-121-0/+7
* | | Merge pull request #22292 from owncloud/smb-handle-forbiddenThomas Müller2016-02-121-1/+18
|\ \ \
| * | | 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 groupsThomas Müller2016-02-105-2/+119
* | | | | Merge pull request #22305 from owncloud/sharestatus_to_ocs_22298Thomas Müller2016-02-122-6/+22
|\ \ \ \ \
| * | | | | 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
* | | | | | Merge pull request #22309 from owncloud/infinite-recursion-on-expired-linkThomas Müller2016-02-122-14/+4
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | 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 shippedLukas Reschke2016-02-111-1/+1
|/ / / / / /
* | | | | | Merge pull request #22314 from owncloud/fix-mariadb-autotestThomas Müller2016-02-112-4/+11
|\ \ \ \ \ \
| * | | | | | Use official mariadb dockerThomas Müller2016-02-112-1/+7
| * | | | | | Wait until mariadb is up and runningThomas Müller2016-02-111-3/+4
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #22320 from owncloud/files_external-cryptThomas Müller2016-02-113-5/+35
|\ \ \ \ \ \
| * | | | | | encrypt passwords for files_externalRobin Appelman2016-02-113-5/+35
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #22315 from owncloud/update-info-checker-requirementsThomas Müller2016-02-112-13/+6
|\ \ \ \ \ \
| * | | | | | Update info checker requirementsJoas Schilling2016-02-112-13/+6
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #22264 from owncloud/read-version-from-info.xml-onlyThomas Müller2016-02-116-19/+6
|\ \ \ \ \ \
| * | | | | | No longer evaluate appinfo/versionThomas Müller2016-02-106-19/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #22322 from owncloud/fix-typoThomas Müller2016-02-111-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typoMorris Jobke2016-02-111-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #22307 from owncloud/remove-notification-on-unshare-and-on...Thomas Müller2016-02-113-4/+17
|\ \ \ \ \ \
| * | | | | | Delete the notification when the owner unshares the remote before the user di...Joas Schilling2016-02-111-0/+7
| * | | | | | Remove the notification if accepting/declining failed because of 404Joas Schilling2016-02-112-4/+10
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #22308 from owncloud/shorter-ttl-find-pathThomas Müller2016-02-111-1/+2
|\ \ \ \ \ \
| * | | | | | Fixes #13658Thomas Müller2016-02-111-1/+2
| |/ / / / /
* | | | | | Merge pull request #22290 from owncloud/dav-upload-scan-in-lockThomas Müller2016-02-111-5/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | also fix lock order for chunked dav uploadsRobin Appelman2016-02-101-2/+2
| * | | | | scan the file in the write lock when uploading over davRobin Appelman2016-02-101-3/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #22316 from owncloud/fix_22309Morris Jobke2016-02-112-3/+10
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Properly check for legacy methodsRoeland Jago Douma2016-02-112-3/+10
|/ / / /