aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4337 from nextcloud/fix-adblock-share-iconMorris Jobke2017-04-136-32/+31
|\
| * Fix AdBlock blocking share icon, ref #866Jan-Christoph Borchardt2017-04-126-32/+31
* | Merge pull request #4341 from nextcloud/local-link-explanationMorris Jobke2017-04-131-1/+1
|\ \
| * | Explain local linkJos Poortvliet2017-04-131-1/+1
* | | Merge pull request #4336 from nextcloud/add-ratelimitingLukas Reschke2017-04-134-2/+74
|\ \ \
| * | | Add support for ratelimiting via annotationsLukas Reschke2017-04-134-2/+74
* | | | Merge pull request #4313 from nextcloud/ldap-name-changeLukas Reschke2017-04-135-20/+20
|\ \ \ \ | |/ / / |/| | |
| * | | Change LDAP method namesMorris Jobke2017-04-125-20/+20
* | | | Remove invalid routeLukas Reschke2017-04-131-2/+0
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-04-1348-168/+172
* | | Merge pull request #4307 from nextcloud/sharing-emailsRoeland Jago Douma2017-04-125-250/+40
|\ \ \
| * | | Dont add click-button text for plaintext mailsJoas Schilling2017-04-121-3/+4
| * | | Don't duplicate the sentence with the headerJoas Schilling2017-04-121-1/+1
| * | | Use new email design for sharebymail emailsMorris Jobke2017-04-125-250/+39
| |/ /
* | | Merge pull request #4329 from nextcloud/move-out-shared-folderMorris Jobke2017-04-122-6/+6
|\ \ \ | |/ / |/| |
| * | rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::get...Robin Appelman2017-04-122-6/+6
* | | Merge pull request #3614 from nextcloud/discover-federatedsharing-endpointsBjörn Schießle2017-04-1225-493/+211
|\ \ \
| * | | Do proper DIRoeland Jago Douma2017-04-1112-13/+13
| * | | give old end-points a seperate nameBjoern Schiessle2017-04-112-2/+33
| * | | fix constructorBjoern Schiessle2017-04-112-2/+2
| * | | remove discovery manager in favour of the OCSDiscoveryServiceBjoern Schiessle2017-04-1114-452/+65
| * | | adjust existing testsBjoern Schiessle2017-04-114-12/+42
| * | | get addressbook url and carddav user from remote serverBjoern Schiessle2017-04-113-21/+35
| * | | use discovered end-point for trusted serversBjoern Schiessle2017-04-112-6/+36
* | | | Allow file upload when storage is unlimitedJoas Schilling2017-04-122-6/+12
| |_|/ |/| |
* | | Merge pull request #4317 from nextcloud/cleanup-files_trashbin-updateBjörn Schießle2017-04-121-42/+0
|\ \ \
| * | | [files_trashbin] Remove unneeded update stepsMorris Jobke2017-04-121-42/+0
* | | | Merge pull request #4316 from nextcloud/cleanup-files_sharing-updateBjörn Schießle2017-04-122-263/+0
|\ \ \ \
| * | | | [files_sharing] Remove unneeded update stepsMorris Jobke2017-04-122-263/+0
| |/ / /
* | | | Merge pull request #4312 from nextcloud/cleanup-nameBjörn Schießle2017-04-1254-113/+113
|\ \ \ \
| * | | | Update comments to NextcloudMorris Jobke2017-04-1154-113/+113
| |/ / /
* | | | Merge pull request #4315 from nextcloud/cleanup-files_external-updateLukas Reschke2017-04-123-88/+0
|\ \ \ \
| * | | | [files_external] Remove unneeded update stepsMorris Jobke2017-04-123-88/+0
| |/ / /
* | | | Merge pull request #4314 from nextcloud/remove-not-needed-update.phpLukas Reschke2017-04-121-98/+0
|\ \ \ \
| * | | | Remove update.php of files appMorris Jobke2017-04-121-98/+0
| |/ / /
* / / / [tx-robot] updated from transifexNextcloud bot2017-04-1226-12/+88
|/ / /
* | | Merge pull request #4304 from nextcloud/add-email-template-to-ocpMorris Jobke2017-04-111-1/+1
|\ \ \
| * | | Adjust class referencesLukas Reschke2017-04-111-1/+1
| |/ /
* | | Merge pull request #4302 from nextcloud/test-integration-testRoeland Jago Douma2017-04-111-0/+22
|\ \ \
| * | | Clear opcode cache after config changeLukas Reschke2017-04-111-0/+22
| |/ /
* | | share api expanded by tags (#26583)Michael Jobst2017-04-116-31/+98
* | | Merge pull request #4293 from nextcloud/fix_4248Morris Jobke2017-04-111-0/+6
|\ \ \ | |/ / |/| |
| * | Do reload shared viewsRoeland Jago Douma2017-04-111-0/+6
* | | Merge pull request #4256 from nextcloud/themingLukas Reschke2017-04-1111-35/+41
|\ \ \
| * | | ThemingDefaults append cacheBusterCounter to logo URL by defaultMorris Jobke2017-04-092-15/+18
| * | | Move OC_Defaults to OCP\DefaultsMorris Jobke2017-04-099-20/+23
* | | | Merge pull request #4289 from nextcloud/maintenance-mode-also-on-davMorris Jobke2017-04-111-0/+3
|\ \ \ \
| * | | | Add missing maintenance plugin to new DAV endpointLukas Reschke2017-04-111-0/+3
| | |/ / | |/| |
* | | | Merge pull request #4283 from nextcloud/shares-by-folder-quoteMorris Jobke2017-04-102-2/+2
|\ \ \ \
| * | | | properly quota table names in getSharesInFolderRobin Appelman2017-04-102-2/+2
| | |_|/ | |/| |