aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [files_external] Remove unneeded update stepsMorris Jobke2017-04-123-88/+0
* 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
| * | | | fix quote helper testRobin Appelman2017-03-302-2/+2
| * | | | update FakeManagerRobin Appelman2017-03-301-0/+3
| * | | | use castColumnRobin Appelman2017-03-301-4/+1
| * | | | Add test for getting unread comment count by folderRobin Appelman2017-03-302-81/+145
| * | | | Allow getting the unread comment count for an entire folder at onceRobin Appelman2017-03-304-90/+169
* | | | | Merge pull request #4274 from nextcloud/fix-share-by-mail-capabilitiesRoeland Jago Douma2017-04-105-21/+98
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | move capabilities to share by mail appBjoern Schiessle2017-04-105-21/+98
* | | | | Merge pull request #4277 from nextcloud/permissions-mask-scannerBjörn Schießle2017-04-102-0/+16
|\ \ \ \ \
| * | | | | Dont use the permissions mask while scanningRobin Appelman2017-04-102-0/+16
* | | | | | Merge pull request #4222 from nextcloud/dav-search-fileidRoeland Jago Douma2017-04-102-4/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow searching file by fileidRobin Appelman2017-04-052-4/+8
* | | | | | Merge pull request #4210 from nextcloud/downstream-26643Roeland Jago Douma2017-04-101-15/+15
|\ \ \ \ \ \
| * | | | | | Lowercase "data" correctlyJoas Schilling2017-04-101-6/+6
| * | | | | | removed path to datadirKawohl2017-04-041-13/+13
* | | | | | | Merge pull request #4271 from nextcloud/also-send-the-new-data-with-the-eventJoas Schilling2017-04-102-6/+9
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Also send the new account data with the eventJoas Schilling2017-04-102-6/+9
* | | | | | | Merge pull request #4250 from nextcloud/disable-lookupserver-uploadBjörn Schießle2017-04-108-6/+74
|\ \ \ \ \ \ \
| * | | | | | | simplify return statementBjoern Schiessle2017-04-101-4/+4
| * | | | | | | make sure that the selector for the visibility always fits next to 'Profile p...Bjoern Schiessle2017-04-071-1/+1