summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-16174-0/+1076
|
* Adding transifex to new core appsThomas Müller2016-02-165-0/+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
| * Queries on the cards table by uri require the addressbook as well - fixes #22284Thomas Müller2016-02-154-15/+18
| |
* | Merge pull request #22400 from owncloud/files-select-closesidebarThomas Müller2016-02-162-9/+36
|\ \ | | | | | | Close file detail sidebar when selecting/unselecting files
| * | Close file detail sidebar when selecting/unselecting filesVincent Petry2016-02-152-9/+36
| |/ | | | | | | | | Interacting with the checkboxes, also "Select all" will automatically close the sidebar now.
* | Merge pull request #22385 from ↵Thomas Müller2016-02-161-1/+1
|\ \ | | | | | | | | | | | | owncloud/issue-22384-invalid-content-location-on-commenting Posting a comment replies with invalid location URL
| * | 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 t…
| * | | On login we create a default calendar and a default addressbook for the user ↵Thomas Müller2016-02-152-2/+44
| | |/ | |/| | | | | | | - fixes #22360
* | | Merge pull request #22403 from owncloud/improved-error-handlingThomas Müller2016-02-165-9/+41
|\ \ \ | | | | | | | | Remove background job if the server accepted to ask for the shared secret
| * | | forbidden (403) is a valid return status, don't log the whole exception in ↵Bjoern Schiessle2016-02-152-4/+12
| | | | | | | | | | | | | | | | this case
| * | | 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
| |/ / | | | | | | | | | | | | | | | If we don't remove it the server will later ask the remote server to ask for the shared secret which will result in a error log message on the remote server and in some circumstances maybe even to a failure
* / / [tx-robot] updated from transifexJenkins for ownCloud2016-02-166-0/+42
|/ /
* | Merge pull request #22337 from owncloud/new_reshare_no_initiatorThomas Müller2016-02-151-4/+4
|\ \ | | | | | | On backend hickups don't crash OCS output
| * | The owner and recipient can also be nullRoeland Jago Douma2016-02-121-3/+3
| | | | | | | | | | | | | | | If we have backend hickups it can be that we are unable to retrive the owner and recipient user as well. In such cases just return the UID.
| * | If the initiator no longer exists return UIDRoeland Jago Douma2016-02-121-1/+1
| | | | | | | | | | | | | | | | | | It can happen that the share initiator is deleted. Because of the new resharing behaviour this share then still exists. We just can fetch the displayname properly.
* | | Merge pull request #22358 from owncloud/fix-22278Thomas Müller2016-02-154-5/+32
|\ \ \ | |_|/ |/| | Fix race condition when switching filter mode. Fixes #22278
| * | Fix race condition when switching filter mode. Fixes #22278Arthur Schiwon2016-02-124-5/+32
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-1524-0/+214
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-144-0/+14
| | |
* | | Merge pull request #22351 from owncloud/fix_22277Thomas Müller2016-02-132-4/+168
|\ \ \ | | | | | | | | show remote server on federated share auto-complete
| * | | add remote server to the resultBjoern Schiessle2016-02-122-4/+168
| | | |
* | | | Merge pull request #22331 from owncloud/dav-nonexisting-partThomas Müller2016-02-131-1/+1
|\ \ \ \ | | | | | | | | | | fix getNodeForPath for non existing part files
| * | | | fix getNodeForPath for non existing part filesRobin Appelman2016-02-111-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-1318-6/+214
| |_|/ / |/| | |
* | | | 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 #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-121-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Calculate the share statuses in js from the OCS Response
| * | | | | Reload list of shares on directory changeRoeland Jago Douma2016-02-111-0/+4
| | | | | |
* | | | | | Merge pull request #22317 from owncloud/fix_invisible_linksharesThomas Müller2016-02-123-32/+183
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | 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
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-12124-276/+314
| | | | |
* | | | | Merge pull request #22320 from owncloud/files_external-cryptThomas Müller2016-02-113-5/+35
|\ \ \ \ \ | |_|_|_|/ |/| | | | encrypt passwords for files_external
| * | | | encrypt passwords for files_externalRobin Appelman2016-02-113-5/+35
| |/ / /
* | | | Merge pull request #22307 from ↵Thomas Müller2016-02-113-4/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/remove-notification-on-unshare-and-on-errors Remove notification on unshare and on errors
| * | | | Delete the notification when the owner unshares the remote before the user ↵Joas Schilling2016-02-111-0/+7
| | | | | | | | | | | | | | | | | | | | did anything
| * | | | Remove the notification if accepting/declining failed because of 404Joas Schilling2016-02-112-4/+10
| | | | |
* | | | | Merge pull request #22290 from owncloud/dav-upload-scan-in-lockThomas Müller2016-02-111-5/+5
|\ \ \ \ \ | |_|/ / / |/| | | | scan the file in the write lock when uploading over dav
| * | | | 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 #22281 from owncloud/activity-100-unshare-activitiesThomas Müller2016-02-111-16/+77
|\ \ \ \ | |_|/ / |/| | | Add translations of unshare activities
| * | | Add translations of unshare activitiesJoas Schilling2016-02-101-16/+77
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-1172-50/+66
| | |
* | | Revert back to non-webdav download link for public URLsVincent Petry2016-02-102-7/+4
| | | | | | | | | | | | | | | Fixes issues with browsers not happy with the token. Fixes activities which were not sent.