summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-2814-2/+44
|
* Merge pull request #4522 from nextcloud/downstream-27596Morris Jobke2017-04-272-20/+46
|\ | | | | Allow to create a user for a specific backend
| * Use the new method in the old one to remove duplicate codeJoas Schilling2017-04-272-31/+30
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Allow to create a user for a specific backendJoas Schilling2017-04-262-0/+27
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4501 from nextcloud/downstream-27144Morris Jobke2017-04-263-7/+38
|\ \ | | | | | | Add duration of last job execution to the table
| * | Add duration of last job execution to the tableNoveen Sachdeva2017-04-253-7/+38
| | |
* | | Merge pull request #4515 from nextcloud/downstream-27643Morris Jobke2017-04-2613-141/+122
|\ \ \ | | | | | | | | Adjust query/event logging code in favour of more complex owncloud/di…
| * | | Update autoloaderRoeland Jago Douma2017-04-262-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Fix missing conflict resolutionsJoas Schilling2017-04-263-12/+0
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Adjust query/event logging code in favour of more complex ↵Piotr Mrówczyński2017-04-2611-137/+134
| | |/ | |/| | | | | | | | | | | | | | | | owncloud/diagnostics (#27643) * Adjust query/event logging code in favour of more complex owncloud/diagnostics * Add descriptions to IQueryLogger and IEventLogger interfaces
* | | [tx-robot] updated from transifexNextcloud bot2017-04-272-0/+2
| | |
* | | Merge pull request #4526 from nextcloud/downstream-27269Morris Jobke2017-04-261-0/+6
|\ \ \ | | | | | | | | Don`t allow upload of files with extension .part
| * | | Use regex to detect part filesVincent Petry2017-04-261-2/+2
| | | |
| * | | #7496 Don`t allow upload of files with extension .partIlja Neumann2017-04-261-0/+6
| |/ /
* | | Update autoload mapLukas Reschke2017-04-262-0/+2
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Add SocialSharingBundleLukas Reschke2017-04-262-0/+47
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Add tests for repairstepLukas Reschke2017-04-261-1/+1
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Add spreed to Groupware bundleLukas Reschke2017-04-261-0/+1
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Remove unrequired getDescription() methodLukas Reschke2017-04-264-29/+1
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Make the emergency disable also accept arraysLukas Reschke2017-04-261-5/+6
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Add app bundlesLukas Reschke2017-04-2614-9/+460
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4374 from nextcloud/contactsmenu_popoverLukas Reschke2017-04-262-1/+60
|\ \ \ | | | | | | | | add contacts popover
| * | | add contactsmenu popoverGeorg Ehrke2017-04-262-1/+60
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Fix scanner after reviewVincent Petry2017-04-261-2/+3
| | | |
* | | | OCC scanner commit in batchesVincent Petry2017-04-261-6/+38
| |/ / |/| |
* | | 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-262-22/+138
|\ \ \ | | | | | | | | Add lists to HTML emails
| * | | Allow meta info and iconsJoas Schilling2017-04-252-8/+32
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add lists to HTML emailsJoas Schilling2017-04-242-22/+114
| | | | | | | | | | | | | | | | 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>
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-264-18/+20
| | | |
* | | | Merge branch 'master' into contactsmenuJan-Christoph Borchardt2017-04-265-3/+14
|\ \ \ \ | | | | | | | | | | | | | | | 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 #4479 from nextcloud/auth-flowMorris Jobke2017-04-252-0/+2
| |\ \ \ \ | | | | | | | | | | | | Add new auth flow basics
| | * | | | Add new auth flowLukas Reschke2017-04-252-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the basics for the new app-password based authentication flow for our clients. The current implementation tries to keep it as simple as possible and works the following way: 1. Unauthenticated client opens `/index.php/login/flow` 2. User will be asked whether they want to grant access to the client 3. If accepted the user has the chance to do so using existing App Token or automatically generate an app password. If the user chooses to use an existing app token then that one will simply be redirected to the `nc://` protocol handler. While we can improve on that in the future, I think keeping this smaller at the moment has its advantages. Also, in the near future we have to think about an automatic migration endpoint so there's that anyways :-) If the user chooses to use the regular login the following happens: 1. A session state token is written to the session 2. User is redirected to the login page 3. If successfully authenticated they will be redirected to a page redirecting to the POST controller 4. The POST controller will check if the CSRF token as well as the state token is correct, if yes the user will be redirected to the `nc://` protocol handler. This approach is quite simple but also allows to be extended in the future. One could for example allow external websites to consume this authentication endpoint as well. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | 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
| | |/ / /
* | | | | Update composer autoloaderChristoph Wurst2017-04-254-6/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | 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-253-4/+10
| | | | | | | | | | | | | | | | | | | | 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-2518-8/+963
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * load list of contacts from the server * show last message of each contact Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>