aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [files_external] Remove unneeded update stepsMorris Jobke2017-04-123-88/+0
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #4304 from nextcloud/add-email-template-to-ocpMorris Jobke2017-04-1111-31/+82
|\ | | | | Add IEMailTemplate to public OCP API
| * Remove constructor from interfaceLukas Reschke2017-04-111-11/+0
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Adjust class referencesLukas Reschke2017-04-113-3/+3
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Add IEMailTemplate to public OCP APILukas Reschke2017-04-118-21/+83
| | | | | | | | | | | | Also adds `\OCP\Mail\IMailer::createEMailTemplate` as helper so the functionality can easily be used within apps. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #4302 from nextcloud/test-integration-testRoeland Jago Douma2017-04-113-1/+36
|\ \ | | | | | | [Integration Tests] Clear opcode cache after config change
| * | Clear opcode cache after config changeLukas Reschke2017-04-113-1/+36
| |/ | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #3876 from nextcloud/downstream-26583Roeland Jago Douma2017-04-116-31/+98
|\ \ | | | | | | Share api expanded by tags
| * | share api expanded by tags (#26583)Michael Jobst2017-04-116-31/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * share api expanded by tags * Modified files_sharing JS Unit tests * modified tests. renamed request parameter. refactoring * Update Share20OCS.php Added missing function description * Update Helper.php Added missing function description * Update Helper.php implicit boolean conversion to !empty() * Update Share20OCSTest.php Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4285 from nextcloud/bump-md5Morris Jobke2017-04-117-598/+13
|\ \ \ | |/ / |/| | [js] Bump blueimp-md5
| * | [js] Bump blueimp-md5 a major versionRoeland Jago Douma2017-04-104-43/+10
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | [js] Bump blueimp-md5Roeland Jago Douma2017-04-106-562/+10
| | | | | | | | | | | | | | | | | | | | | * bumped to latest * moved to min Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4293 from nextcloud/fix_4248Morris Jobke2017-04-111-0/+6
|\ \ \ | |_|/ |/| | Do reload shared views
| * | Do reload shared viewsRoeland Jago Douma2017-04-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4248 The magic introduced in #3686 caused the shared views not to be updated properly. Thus we just overwrite the _onUrlChange method in the sharedfilelist. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4280 from nextcloud/share_via_displayRoeland Jago Douma2017-04-112-0/+40
|\ \ \ | | | | | | | | Show 'shared via' in share list for reshares
| * | | Show 'shared via' in share list for resharesRoeland Jago Douma2017-04-112-0/+40
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1330 userA shares a file to userB userB shares that file to userC userA can see both userB and userC. Now they can also see that userB shared it to user C Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4256 from nextcloud/themingLukas Reschke2017-04-1144-149/+202
|\ \ \ | | | | | | | | Move OC_Defaults to OCP\Defaults
| * | | ThemingDefaults append cacheBusterCounter to logo URL by defaultMorris Jobke2017-04-092-15/+18
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Move OC_Defaults to OCP\DefaultsMorris Jobke2017-04-0942-134/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * currently there are two ways to access default values: OCP\Defaults or OC_Defaults (which is extended by OCA\Theming\ThemingDefaults) * our code used a mixture of both of them, which made it hard to work on theme values * this extended the public interface with the missing methods and uses them everywhere to only rely on the public interface Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #2618 from nextcloud/2fa-challenge-textLukas Reschke2017-04-112-21/+25
|\ \ \ \ | | | | | | | | | | Move log out and backup codes link into 2fa box for better readability
| * | | | Use button instead of simple linksChristoph Wurst2017-03-062-6/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | Move log out and back codes link into 2fa box for better readabilityChristoph Wurst2017-03-062-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/2538 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #4289 from nextcloud/maintenance-mode-also-on-davMorris Jobke2017-04-115-0/+64
|\ \ \ \ \ | | | | | | | | | | | | Add missing maintenance plugin to new DAV endpoint
| * | | | | Run maintenance mode tests on DroneLukas Reschke2017-04-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Add integration testsLukas Reschke2017-04-113-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Add missing maintenance plugin to new DAV endpointLukas Reschke2017-04-111-0/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | The `/remote.php/dav/` endpoint was not implementing the MaintenancePlugin. Thus when the instance was put into maintenance mode the endpoints were still accessible and delivered empty content. Sync clients really do love this. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #4283 from nextcloud/shares-by-folder-quoteMorris Jobke2017-04-103-3/+3
|\ \ \ \ \ | | | | | | | | | | | | properly quota table names in getSharesInFolder
| * | | | | properly quota table names in getSharesInFolderRobin Appelman2017-04-103-3/+3
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-11110-990/+382
| |/ / / |/| | |
* | | | Merge pull request #4146 from nextcloud/unread-comments-folderMorris Jobke2017-04-109-169/+312
|\ \ \ \ | | | | | | | | | | Allow getting the unread comment count for an entire folder at once
| * | | | fix whitespace in cleantagsRobin Appelman2017-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | fix quote helper testRobin Appelman2017-03-302-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | update FakeManagerRobin Appelman2017-03-301-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | use castColumnRobin Appelman2017-03-301-4/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Add test for getting unread comment count by folderRobin Appelman2017-03-302-81/+145
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Allow getting the unread comment count for an entire folder at onceRobin Appelman2017-03-304-90/+169
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #4274 from nextcloud/fix-share-by-mail-capabilitiesRoeland Jago Douma2017-04-105-21/+98
|\ \ \ \ \ | |_|/ / / |/| | | | move share by mail capabilities to the share provider
| * | | | move capabilities to share by mail appBjoern Schiessle2017-04-105-21/+98
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | Merge pull request #4277 from nextcloud/permissions-mask-scannerBjörn Schießle2017-04-102-0/+16
|\ \ \ \ \ | | | | | | | | | | | | Dont use the permissions mask while scanning
| * | | | | Dont use the permissions mask while scanningRobin Appelman2017-04-102-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #4222 from nextcloud/dav-search-fileidRoeland Jago Douma2017-04-102-4/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Allow searching file by fileid
| * | | | | Allow searching file by fileidRobin Appelman2017-04-052-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #4210 from nextcloud/downstream-26643Roeland Jago Douma2017-04-101-15/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removed path to datadir in exception
| * | | | | | Lowercase "data" correctlyJoas Schilling2017-04-101-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | removed path to datadirKawohl2017-04-041-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | 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 event
| * | | | | | Also send the new account data with the eventJoas Schilling2017-04-102-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #4250 from nextcloud/disable-lookupserver-uploadBjörn Schießle2017-04-108-6/+74
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | allow admin to disable lookupserver upload
| * | | | | | | simplify return statementBjoern Schiessle2017-04-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | | make sure that the selector for the visibility always fits next to 'Profile ↵Bjoern Schiessle2017-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | picture' Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 14:13:39 +0000