summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6370 from nextcloud/fix-alternative-loginsMorris Jobke2017-09-061-4/+10
|\ | | | | Fix layout of alternative login buttons
| * Fix layout of alternative login buttonsMorris Jobke2017-09-061-4/+10
| | | | | | | | | | | | * fixes #6367 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #5415 from nextcloud/search-cache-nodeMorris Jobke2017-09-066-15/+55
|\ \ | | | | | | cache nodes from search results
| * | Fix testRobin Appelman2017-08-261-3/+3
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | cache nodes from search resultsRobin Appelman2017-08-265-12/+52
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-09-064-0/+10
| |/ |/|
* | Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-nameMorris Jobke2017-09-051-6/+3
|\ \ | | | | | | Set the meta data before everything
| * | Merge setMetaData into constructorJoas Schilling2017-09-041-6/+3
| | | | | | | | | | | | | | | | | | This ensures that the meta data is set in the beginning Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5642 from tobru/fix/groupOfUniqueNames_in_WizardMorris Jobke2017-09-051-1/+1
|\ \ \ | | | | | | | | recognize groupOfUniqueNames as valid LDAP group object
| * | | recognize groupOfUniqueNames as valid LDAP group objectTobias Brunner2017-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | This was already partly done in f88109b but was missed in the fetchGroups function.
* | | | Merge pull request #5466 from jlehtoranta/ldap-connectivity-fixesMorris Jobke2017-09-042-26/+132
|\ \ \ \ | | | | | | | | | | LDAP Connectivity Fixes
| * | | | LDAP: Simplify conditions in establishConnectionJarkko Lehtoranta2017-07-231-9/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
| * | | | LDAP: Add testStartTlsNegotiationFailure unit testJarkko Lehtoranta2017-07-231-0/+50
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
| * | | | LDAP: Add testBindWithInvalidCredentials unit testJarkko Lehtoranta2017-07-231-0/+44
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
| * | | | LDAP: Use imported exception in Connection classJarkko Lehtoranta2017-07-231-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
| * | | | LDAP: Clean-up doConnectJarkko Lehtoranta2017-07-231-11/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
| * | | | LDAP: Throw an exception if disabling LDAP referrals failsJarkko Lehtoranta2017-07-231-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
| * | | | LDAP: Fix testUseBackupServer unit testJarkko Lehtoranta2017-07-231-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
| * | | | LDAP: Throw an exception if Start TLS failsJarkko Lehtoranta2017-07-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that only a secure connection to the LDAP server will be used, if Start TLS has been enabled. Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
| * | | | LDAP: Remove unnecessary "recursion" fixJarkko Lehtoranta2017-07-231-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 86d72b9a61f5e8a9b57c6f0bb431eb6722aa12a3 "LDAP: fix possible recursion". Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
| * | | | LDAP: Don't handle invalid credentials as a connection errorJarkko Lehtoranta2017-07-231-2/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
| * | | | LDAP: Connect to backup server only if it exists + handle errorsJarkko Lehtoranta2017-07-231-3/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
* | | | | Cleanup theming styles to fit the new login pageJulius Härtl2017-09-041-32/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Fix tests for primary element colorJulius Härtl2017-09-041-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Use separate element color in themingJulius Härtl2017-09-042-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we can use a grey color when the primary color is to bright Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #6196 from nextcloud/downstream-26539-2Morris Jobke2017-09-044-2/+131
|\ \ \ \ \ | | | | | | | | | | | | Handle invalid ext storage backend to keep mount point visible
| * | | | | show storage as unavailable in the file listRobin Appelman2017-09-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | set the exception for failedstorageRobin Appelman2017-09-041-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | Use the FailedStorage insteadMorris Jobke2017-09-042-31/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Handle invalid ext storage backend to keep mount point visibleVincent Petry2017-09-045-2/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep mount point visible and also ext storage config visible when dealing with configs relating to storage backends or auth mechanisms that were provided by an app that is currently disabled. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #6120 from nextcloud/public_upload_share_api_fixblizzz2017-09-042-7/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Public upload share permission handling
| * | | | | | Update to new test caseRoeland Jago Douma2017-08-161-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Public upload share permission handlingRoeland Jago Douma2017-08-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you set the permissions on a public share the SHARE permission makes no sense. So instead of throwing a warning. Just filter out the share permission. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #6309 from nextcloud/new-dav-eventRoeland Jago Douma2017-09-042-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add a new dav event to allow apps to register their own sabredav plugins
| * | | | | | | also allow to register additional plugins if the old endpoint is usedBjoern Schiessle2017-08-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | | add a new dav event to allow apps to register their own sabredav pluginsBjoern Schiessle2017-08-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | | Merge pull request #6351 from nhirokinet/masterMorris Jobke2017-09-041-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | not to backquote LIMIT on CalDavBackend.php
| * | | | | | | not to backquote LIMIT on CalDavBackend.phpnhirokinet2017-09-031-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #6221 from nextcloud/fav_share_api_fixMorris Jobke2017-09-043-19/+50
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Correctly format OCS response with favorites
| * | | | | | | Correctly format OCS response with favoritesRoeland Jago Douma2017-08-293-19/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The helper funtion did not handle the response correctly and basically only returned the last share with tags. This is a simple rewrite. That is still understandable. Loops maybe more than strictly required. But preformance is not the issue here. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Change invertion threshold to 55%Julius Härtl2017-09-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-09-026-2/+32
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-09-014-0/+8
| | | | | | |
* | | | | | | Merge pull request #6315 from nextcloud/metadata-for-all-emailsMorris Jobke2017-08-311-0/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Implement metadata for email templates of remaining emails
| * | | | | | | Implement metadata for email templates of remaining emailsMorris Jobke2017-08-301-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-08-3112-8/+54
|/ / / / / / /
* | | | | | | Merge pull request #6273 from nextcloud/move-multiple-filesRoeland Jago Douma2017-08-302-2/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move multiple files
| * | | | | | | Move multiple filesThomas Citharel2017-08-272-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-08-3022-98/+156
| | | | | | | |
* | | | | | | | Merge pull request #6303 from nextcloud/background-imageMorris Jobke2017-08-293-4/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Adjust background image to the one used on the website