summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add l10nRoeland Jago Douma2017-02-151-1/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Fix setup issue and refine error messagesMorris Jobke2017-02-156-36/+27
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* use random password if "password link" is enabledtobiasKaminsky2017-02-151-1/+3
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* empty password only allowed if password link is senttobiasKaminsky2017-02-151-4/+4
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* add setting for "send password link"tobiasKaminsky2017-02-155-21/+54
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* send email to new user with password forgotten link to create own passwordtobiasKaminsky2017-02-151-4/+35
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #3421 from espro/freeipa-uuid-fixMorris Jobke2017-02-151-1/+1
|\ | | | | Update uuidAttributes list to include FreeIPA's ipauniqueid
| * Update uuidAttributes list to include FreeIPA's ipauniqueidBrent Bloxam2017-02-101-1/+1
| | | | | | | | Signed-off-by: Brent Bloxam <brent.bloxam@gmail.com>
* | Merge pull request #3485 from nextcloud/Popovermenu-files-css-fixblizzz2017-02-151-4/+0
|\ \ | | | | | | Popovermenu files css fix
| * | Css fixJohn Molakvoæ (skjnldsv)2017-02-151-4/+0
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #3473 from nextcloud/fix-addressbook-deletionblizzz2017-02-154-3/+30
|\ \ \ | | | | | | | | Address book data lost when any user receiving a share is deleted
| * | | this is publicJohn Molakvoæ (skjnldsv)2017-02-141-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Test fixJohn Molakvoæ (skjnldsv)2017-02-141-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | testsJohn Molakvoæ (skjnldsv)2017-02-141-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | getUsersOwnAddressBooksJohn Molakvoæ (skjnldsv)2017-02-142-1/+28
| |/ / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #3487 from nextcloud/fix-files-header-nameblizzz2017-02-153-13/+0
|\ \ \ | | | | | | | | Fix app name of files app
| * | | Fix app name of files appMorris Jobke2017-02-143-13/+0
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-1522-64/+354
| | | |
* | | | Merge pull request #3480 from nextcloud/screensharing-iconMorris Jobke2017-02-145-0/+44
|\ \ \ \ | | | | | | | | | | add screensharing icon
| * | | | add screensharing iconJan-Christoph Borchardt2017-02-145-0/+44
| |/ / / | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #3477 from nextcloud/fix-cloud-id-manager-injectionMorris Jobke2017-02-143-1/+7
|\ \ \ \ | |/ / / |/| | | Fix DI of the cloud id manager into apps
| * | | Fix DI of the cloud id manager into appsJoas Schilling2017-02-143-1/+7
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #3341 from nextcloud/transparent-white-checkboxJan-Christoph Borchardt2017-02-143-8/+14
|\ \ \ | | | | | | | | Transparent white checkbox
| * | | Transparent white checkboxJohn Molakvoæ (skjnldsv)2017-01-313-8/+14
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #3472 from nextcloud/enable-avatars-alwaysMorris Jobke2017-02-1419-138/+46
|\ \ \ \ | | | | | | | | | | Always enable avatars
| * | | | Always enable avatarsMorris Jobke2017-02-1319-138/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * we introduced this setting in the begining because our avatar support caused some performance issues, but we fixed them and should only provide one way how Nextcloud looks Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3465 from nextcloud/storage-log-locksLukas Reschke2017-02-145-3/+97
|\ \ \ \ \ | |_|_|/ / |/| | | | Add option to enable locking debug logging
| * | | | Add missing PHPDoc and properly throw exceptionMorris Jobke2017-02-134-0/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Add storage to log item as wellLukas Reschke2017-02-131-3/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | Add comment about log.conditionMorris Jobke2017-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Add option to enable locking debug loggingRobin Appelman2017-02-132-3/+58
| |/ / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-1468-206/+1094
| | | |
* | | | Merge pull request #3444 from nextcloud/recognize-bat-and-cmdMorris Jobke2017-02-133-3/+20
|\ \ \ \ | | | | | | | | | | Recognize .bat and .cmd files
| * | | | Recognize .bat and .cmd filesJoas Schilling2017-02-103-3/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #3324 from nextcloud/fix-2431Lukas Reschke2017-02-133-36/+85
|\ \ \ \ \ | | | | | | | | | | | | LDAP's checkPassword should only catch when a user was not found, fixes #2431
| * | | | | LDAP's checkPassword should only catch when a user was not found, fixes #2431Arthur Schiwon2017-01-303-36/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes error processing after ldap_search, due to different return format Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #3448 from kuimovvg/masterLukas Reschke2017-02-131-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | bug when connect to yandex webdav server
| * | | | | bug when connect to yandex webdav servervkuimov2017-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server think that request like <?xml version="1.0" encoding="UTF-8"?> <d:propfind xmlns:d="DAV:"> <d:prop/> </d:propfind> is 400: Bad Request
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-1316-60/+248
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-1230-10/+314
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-11212-1336/+1732
| | | | | |
* | | | | | Merge pull request #3417 from nextcloud/push-notificationMorris Jobke2017-02-102-2/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | Push notification
| * | | | | | Make sure to use the right appdata directoryJoas Schilling2017-02-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Save the used token id in the session so it can be used later onJoas Schilling2017-02-091-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #3430 from nextcloud/fix-ios-client-detectionMorris Jobke2017-02-105-11/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix detection of the new iOS app
| * | | | | | | Fix detection of the new iOS appJoas Schilling2017-02-105-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #3443 from nextcloud/add-integration-tests-for-davblizzz2017-02-108-31/+90
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add integration tests for legacy DAV endpoints
| * | | | | | | | Add integration tests for legacy DAV endpointsLukas Reschke2017-02-108-31/+90
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | | Merge pull request #3371 from m3ntalsp00n/reload_countdownblizzz2017-02-102-4/+40
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | showUpdate funciton allows updated messages
| * | | | | | | Fix indentation and l10n compliance.m3ntalsp00n2017-02-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>