summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* remove synced remote address book if the remote server revoked access to his ...Bjoern Schiessle2016-02-297-7/+39
* remove remote address book if the admin removes the server from the trusted s...Bjoern Schiessle2016-02-299-18/+97
* reuse the url_hash instead of calculating a new hash for the address bookBjoern Schiessle2016-02-265-13/+14
* Merge pull request #22671 from owncloud/issue-22670Thomas Müller2016-02-262-26/+26
|\
| * Move the tag filter at the end for nowJoas Schilling2016-02-262-26/+26
* | Merge pull request #22640 from owncloud/fix_22587Thomas Müller2016-02-262-0/+129
|\ \
| * | Remove delete permissions for read-only federated resharesRoeland Jago Douma2016-02-252-0/+129
* | | Merge pull request #22608 from owncloud/collaborative-tagsThomas Müller2016-02-262-3/+4
|\ \ \
| * | | Rename system tags app to collaborative tagsJoas Schilling2016-02-262-3/+4
| | |/ | |/|
* | | Merge pull request #22461 from owncloud/fix_6773Thomas Müller2016-02-2613-63/+150
|\ \ \ | |/ / |/| |
| * | Fix favorite icon unit test for icon imageVincent Petry2016-02-251-2/+4
| * | Make more action icons themable + style fixesVincent Petry2016-02-255-22/+24
| * | Close classRoeland Jago Douma2016-02-251-1/+1
| * | Make file actions use icon CSS classesRoeland Jago Douma2016-02-258-42/+125
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2622-2/+58
|/ /
* | Merge pull request #22644 from owncloud/external-share-managerThomas Müller2016-02-251-3/+4
|\ \
| * | inject the correct external share manager into the storageRobin Appelman2016-02-251-3/+4
* | | Merge pull request #22628 from owncloud/fix-thrashbin-cronjobThomas Müller2016-02-251-0/+6
|\ \ \ | |/ / |/| |
| * | Skip users with no trashbinVictor Dubiniuk2016-02-241-0/+6
* | | Merge pull request #22636 from owncloud/fix-ssl-on-external-storagesThomas Müller2016-02-253-11/+40
|\ \ \
| * | | Properly cast typeLukas Reschke2016-02-243-11/+40
| |/ /
* | | Merge pull request #22604 from owncloud/fix-google-drive-encryptionThomas Müller2016-02-251-5/+11
|\ \ \
| * | | More error handlingLukas Reschke2016-02-251-2/+6
| * | | Copy into local fileLukas Reschke2016-02-251-3/+5
| | |/ | |/|
* | | Merge pull request #22600 from owncloud/extstorage-disablesharingoptionbydefaultThomas Müller2016-02-254-3/+10
|\ \ \
| * | | Disable sharing by default for external storage mountsVincent Petry2016-02-244-3/+10
* | | | Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displaynameThomas Müller2016-02-251-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | take the first result of that array, if present. Fixes 2nd display name to be...Arthur Schiwon2016-02-241-2/+2
| | |/ | |/|
* / | [tx-robot] updated from transifexJenkins for ownCloud2016-02-25388-482/+2860
|/ /
* | Merge pull request #22593 from owncloud/swift-docker-fixThomas Müller2016-02-242-277/+1
|\ \
| * | Enable upstream entrypoint changes with Ceph DockerRobin McCorkell2016-02-232-277/+1
| |/
* | Merge pull request #22592 from owncloud/fix-response-headerThomas Müller2016-02-241-17/+0
|\ \
| * | Drop unneeded use statementsMorris Jobke2016-02-231-4/+0
| * | Add header for attachment disposition only onceLukas Reschke2016-02-231-13/+0
* | | Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entriesThomas Müller2016-02-231-11/+11
|\ \ \ | |_|/ |/| |
| * | Fix dav unit testsJoas Schilling2016-02-231-11/+11
| |/
* | Merge pull request #22582 from owncloud/case-insensitive-contact-searchThomas Müller2016-02-232-3/+3
|\ \
| * | Case insensitive search in contacts - fixes #22575Thomas Müller2016-02-222-3/+3
| |/
* | Merge pull request #22516 from owncloud/core-cumulativenotificationsThomas Müller2016-02-233-2/+11
|\ \ | |/ |/|
| * Fix unit tests affected by side effectsVincent Petry2016-02-222-1/+6
| * Accumulate notifications instead of blinkingVincent Petry2016-02-221-1/+5
* | Make non-public-method protectedJoas Schilling2016-02-222-9/+9
|/
* Merge pull request #22536 from owncloud/add-integration-tests-for-tagsThomas Müller2016-02-224-6/+285
|\
| * Check if user has permission to create such a tagLukas Reschke2016-02-194-6/+285
* | Merge pull request #22555 from owncloud/jenkins-19978Thomas Müller2016-02-221-0/+3
|\ \
| * | Solution for Proposal #19974Pierre Jochem2016-02-221-0/+3
| |/
* | Fix public page footer position in IEVincent Petry2016-02-221-0/+5
* | Fixes pagination in IEMorris Jobke2016-02-221-1/+0
|/
* Merge pull request #22503 from owncloud/issue_22500Thomas Müller2016-02-191-0/+3
|\
| * make sure that the file name doesn't end with a trailing slash. Can for examp...Bjoern Schiessle2016-02-191-0/+3