summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use constantsJoas Schilling2017-04-132-2/+2
* Reorder the entries of the log for easier readingJuan Pablo Villafáñez2017-04-122-6/+7
* Merge pull request #3905 from nextcloud/downstream-27069Joas Schilling2017-04-125-10/+174
|\
| * Add drone.yml configMorris Jobke2017-04-111-0/+10
| * Add integration test for trashbinVincent Petry2017-04-114-10/+164
* | 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 #4309 from nextcloud/remove-unused-codeLukas Reschke2017-04-124-243/+0
|\ \ \
| * | | Removes unused code for link share emailsMorris Jobke2017-04-114-243/+0
| |/ /
* | | Merge pull request #4310 from nextcloud/allow-plain-text-emailLukas Reschke2017-04-124-10/+84
|\ \ \
| * | | Allow to set text versions for the plain text emailMorris Jobke2017-04-114-10/+84
| |/ /
* | | 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-1262-26/+244
|/ /
* | Merge pull request #4304 from nextcloud/add-email-template-to-ocpMorris Jobke2017-04-1111-31/+82
|\ \ | |/ |/|
| * Remove constructor from interfaceLukas Reschke2017-04-111-11/+0
| * Adjust class referencesLukas Reschke2017-04-113-3/+3
| * Add IEMailTemplate to public OCP APILukas Reschke2017-04-118-21/+83
* | Merge pull request #4302 from nextcloud/test-integration-testRoeland Jago Douma2017-04-113-1/+36
|\ \
| * | Clear opcode cache after config changeLukas Reschke2017-04-113-1/+36
| |/
* | Merge pull request #3876 from nextcloud/downstream-26583Roeland Jago Douma2017-04-116-31/+98
|\ \
| * | share api expanded by tags (#26583)Michael Jobst2017-04-116-31/+98
* | | Merge pull request #4285 from nextcloud/bump-md5Morris Jobke2017-04-117-598/+13
|\ \ \ | |/ / |/| |
| * | [js] Bump blueimp-md5 a major versionRoeland Jago Douma2017-04-104-43/+10
| * | [js] Bump blueimp-md5Roeland Jago Douma2017-04-106-562/+10
* | | 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 #4280 from nextcloud/share_via_displayRoeland Jago Douma2017-04-112-0/+40
|\ \ \
| * | | Show 'shared via' in share list for resharesRoeland Jago Douma2017-04-112-0/+40
| | |/ | |/|
* | | Merge pull request #4256 from nextcloud/themingLukas Reschke2017-04-1144-149/+202
|\ \ \
| * | | ThemingDefaults append cacheBusterCounter to logo URL by defaultMorris Jobke2017-04-092-15/+18
| * | | Move OC_Defaults to OCP\DefaultsMorris Jobke2017-04-0942-134/+184
* | | | Merge pull request #2618 from nextcloud/2fa-challenge-textLukas Reschke2017-04-112-21/+25
|\ \ \ \
| * | | | Use button instead of simple linksChristoph Wurst2017-03-062-6/+4
| * | | | Move log out and back codes link into 2fa box for better readabilityChristoph Wurst2017-03-062-21/+27
* | | | | Merge pull request #4289 from nextcloud/maintenance-mode-also-on-davMorris Jobke2017-04-115-0/+64
|\ \ \ \ \
| * | | | | Run maintenance mode tests on DroneLukas Reschke2017-04-111-0/+10
| * | | | | Add integration testsLukas Reschke2017-04-113-0/+51
| * | | | | 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-103-3/+3
|\ \ \ \ \
| * | | | | properly quota table names in getSharesInFolderRobin Appelman2017-04-103-3/+3
| | |_|_|/ | |/| | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-11110-990/+382
| |/ / / |/| | |
* | | | Merge pull request #4146 from nextcloud/unread-comments-folderMorris Jobke2017-04-109-169/+312
|\ \ \ \
| * | | | fix whitespace in cleantagsRobin Appelman2017-03-301-1/+1