summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Use the new method in the old one to remove duplicate codeJoas Schilling2017-04-271-30/+28
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Allow to create a user for a specific backendJoas Schilling2017-04-261-0/+18
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #4430 from nextcloud/refactor-authRoeland Jago Douma2017-04-262-14/+10
|\ | | | | Improve readability of login logic
| * Refactor auth methodsJörn Friedrich Dreyer2017-04-262-14/+10
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4467 from nextcloud/lists-for-html-mailsRoeland Jago Douma2017-04-261-22/+124
|\ \ | | | | | | Add lists to HTML emails
| * | Allow meta info and iconsJoas Schilling2017-04-251-6/+26
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add lists to HTML emailsJoas Schilling2017-04-241-22/+104
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4061 from nextcloud/downstream-26407Roeland Jago Douma2017-04-262-37/+59
|\ \ \ | | | | | | | | Redis cluster support
| * | | no ternaryJörn Friedrich Dreyer2017-03-251-2/+10
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | fix constantJörn Friedrich Dreyer2017-03-251-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Add Redis Cluster supportRobin McCorkell2017-03-252-37/+51
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4449 from stweil/mimetypesMorris Jobke2017-04-261-0/+13
|\ \ \ \ | |_|_|/ |/| | | Add mimetypes for jp2 and webp
| * | | Add repair steps for new image mime typesStefan Weil2017-04-251-0/+13
| | | | | | | | | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de>
* | | | Merge branch 'master' into contactsmenuJan-Christoph Borchardt2017-04-263-3/+12
|\ \ \ \ | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * \ \ \ Merge pull request #4499 from nextcloud/downstream-26984Morris Jobke2017-04-251-1/+5
| |\ \ \ \ | | | | | | | | | | | | Trigger change when a user is enabled/disabled
| | * | | | Trigger change when a user is enabled/disabledJoas Schilling2017-04-251-1/+5
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Merge pull request #4495 from nextcloud/downstream-27638Roeland Jago Douma2017-04-252-2/+7
| |\ \ \ \ | | | | | | | | | | | | Catch session already closed exception in destructor
| | * | | | Catch session already closed exception in destructorVictor Dubiniuk2017-04-252-2/+7
| | |/ / /
* | | | | Use absolute URI for action iconsChristoph Wurst2017-04-251-3/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Don't show contacts an entry for themselvesChristoph Wurst2017-04-252-4/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Let apps register contact menu provider via info.xmlChristoph Wurst2017-04-252-14/+45
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Show mail address in popover menuChristoph Wurst2017-04-251-3/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Contacts menuChristoph Wurst2017-04-259-0/+666
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * load list of contacts from the server * show last message of each contact Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* / / / Responsive app menuJulius Härtl2017-04-252-70/+0
|/ / / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #3531 from nextcloud/theming-scssMorris Jobke2017-04-254-17/+99
|\ \ \ | | | | | | | | Theming using SCSS variables
| * | | Use theming cachebuster for server resourcesJulius Härtl2017-04-251-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Implement scss variable injection by OC_DefaultsJulius Haertl2017-04-254-16/+96
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> Add Scss variables to example theme and theming app Signed-off-by: Julius Haertl <jus@bitgrid.net> Use SCSSCacher to build theming css Signed-off-by: Julius Härtl <jus@bitgrid.net> Update theming.scss Signed-off-by: Julius Härtl <jus@bitgrid.net> Code cleanup Signed-off-by: Julius Härtl <jus@bitgrid.net> Fix tests Signed-off-by: Julius Härtl <jus@bitgrid.net> Inject SCSSCacher for easier testing Signed-off-by: Julius Härtl <jus@bitgrid.net> Fix typehint Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Generate absolute URLs Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Fix tests to always use absolute urls for theming images Signed-off-by: Julius Härtl <jus@bitgrid.net> MailheaderColor -> ColorPrimary Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4462 from danxuliu/fix-sharing-password-protected-linkRoeland Jago Douma2017-04-251-24/+31
|\ \ \ | |/ / |/| | Fix sharing a password protected link
| * | Extract updateSharePasswordIfNeeded functionDaniel Calviño Sánchez2017-04-241-22/+30
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Join if block to preceding if chainDaniel Calviño Sánchez2017-04-241-3/+2
| | | | | | | | | | | | | | | | | | | | | If getShareType() returns "email" it can not also return "user", "group" nor "link", so the if block can be added to the preceding if chain. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Fix double hashing of shared link passwordsDaniel Calviño Sánchez2017-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plain text password for a shared links was hashed and, then, the hashed password was hashed again and set as the final password. Due to this the password introduced in the "Authenticate" page for the shared link was always a wrong password, and thus the file could not be accessed. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #4443 from nextcloud/cleanup-unused-importsJoas Schilling2017-04-2437-70/+0
|\ \ \ | |/ / |/| | Remove unused use statements
| * | Remove unused use statementsMorris Jobke2017-04-2237-70/+0
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Remove unused variablesMorris Jobke2017-04-221-1/+0
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4396 from nextcloud/scan-non-existingRoeland Jago Douma2017-04-211-0/+5
|\ \ | | | | | | show error when trying to scan non existing path
| * | check for existence before we start the db transactionRobin Appelman2017-04-201-3/+3
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | Add PHPDoc and handle exception in ScanAppData as wellMorris Jobke2017-04-191-0/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | show error when trying to scan non existing pathRobin Appelman2017-04-191-0/+4
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #4428 from nextcloud/file-by-id-limit-userRoeland Jago Douma2017-04-212-4/+15
|\ \ \ | | | | | | | | limit the user when searching for a file by id if we know the user already
| * | | limit the user when searching for a file by id if we know the user alreadyRobin Appelman2017-04-212-4/+15
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #4406 from nextcloud/fix-unit-test-problemsRoeland Jago Douma2017-04-211-89/+0
|\ \ \ \ | | | | | | | | | | Fix unit test problems
| * | | | Kill dead codeJoas Schilling2017-04-201-89/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | > No tests found in class "Test\Share\MailNotificationsTest". Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | respect password policy for auto generated passwordsBjoern Schiessle2017-04-201-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | allow admin to enforce password on mail sharesBjoern Schiessle2017-04-201-1/+2
|/ / / | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #4398 from nextcloud/fix_accesslistcodeJoas Schilling2017-04-201-2/+7
|\ \ \ | | | | | | | | Get proper accesslist for userFolder
| * | | Get proper accesslist for userFolderRoeland Jago Douma2017-04-201-2/+7
| |/ / | | | | | | | | | | | | | | | | | | If the accesslist is requested for a users root folder we should properly construct the path Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4381 from nextcloud/2954_take_2Joas Schilling2017-04-201-7/+1
|\ \ \ | | | | | | | | Fix group settings routes and fix route regression
| * | | Revert "Match slashes in ../{id} resource routes"Roeland Jago Douma2017-04-181-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 31f9be7a75712e9f8b7831ed29397527f9fa8baf. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Rename renderHTML to renderHtmlMorris Jobke2017-04-191-2/+2
| |/ / |/| | | | | | | | | | | | | | | | | * fixes #4383 * improves consistency Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4382 from nextcloud/use-proper-reply-toLukas Reschke2017-04-191-1/+3
|\ \ \ | | | | | | | | Add "Reply-To" on ShareByMailProvider mails
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 00:09:23 +0000