summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7963 from nextcloud/smb-2.0.4-13Roeland Jago Douma2018-01-1911-77/+98
|\ | | | | [13] update icewind/smb to 2.0.4
| * update icewind/smb to 2.0.4Robin Appelman2018-01-1911-77/+98
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* [tx-robot] updated from transifexNextcloud bot2018-01-19108-106/+108
|
* Merge pull request #7940 from nextcloud/13.0.0-rc2-prepv13.0.0RC2Morris Jobke2018-01-181-2/+2
|\ | | | | 13.0.0 RC2
| * 13.0.0 RC2Morris Jobke2018-01-181-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #7944 from ↵Morris Jobke2018-01-181-1/+1
|\ | | | | | | | | nextcloud/backport/7912/correctly-drop-owncloud-migrations-table [stable13] Correctly drop the ownCloud migrations table
| * Correctly drop the ownCloud migrations tableJoas Schilling2018-01-181-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #7942 from nextcloud/7941-stable13Morris Jobke2018-01-181-3/+0
|\ \ | | | | | | [stable13] remove hardcoded sharepoint icon path
| * | remove hardcoded sharepoint icon pathArthur Schiwon2018-01-181-3/+0
| | | | | | | | | | | | | | | | | | it does not exist and if it would, it was not themable Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #7943 from ↵Morris Jobke2018-01-181-3/+3
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/backport/7812/make-sure-the-arrays-are-arrays [stable13] Make sure the arrays are arrays
| * | | Make sure the arrays are arraysJoas Schilling2018-01-181-3/+3
| | |/ | |/| | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / | Properly catch InvalidTokenException for better error responseMorris Jobke2018-01-182-2/+50
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7932 from nextcloud/7914-stable13Daniel Calviño Sánchez2018-01-185-6/+74
|\ \ | |/ |/| [stable13] format self-mentions, but don't offer them
| * Backport of format self-mentions, but don't offer them #7914Arthur Schiwon2018-01-185-6/+74
|/ | | | | | | | | | | | | | | | | | comments should compile mentions also if done by author it is used by clients for formatting reasons, there is no reason not format the author if her handle is included in the comment body. It is unrelated to sending out notifications. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> do not offer the handle of the current user for auto completion Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> add types to php doc Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* [tx-robot] updated from transifexNextcloud bot2018-01-1814-0/+16
|
* Merge pull request #7915 from nextcloud/backport/7909/fix-migration-type-hintsRoeland Jago Douma2018-01-1724-98/+176
|\ | | | | Fix the type hints of migrations and correctly inject the wrapped sch…
| * Fix the type hints of migrations and correctly inject the wrapped schema ↵Joas Schilling2018-01-1724-98/+176
| | | | | | | | | | | | into migrations Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #7903 from nextcloud/13-7891Morris Jobke2018-01-171-1/+17
|\ \ | | | | | | [stable13] Fix systemtags/list to be compliant
| * | Fix systemtags/list to be compliantMorris Jobke2018-01-161-1/+17
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2018-01-1722-0/+34
| | |
* | | Merge pull request #7887 from ↵Morris Jobke2018-01-161-2/+2
|\ \ \ | |/ / |/| | | | | | | | nextcloud/backport/7879/dont-disable-shipped-apps-on-errors [stable13] Keep all shipped apps enabled because they should be okay
| * | Keep all shipped apps enabled because they should be okayJoas Schilling2018-01-161-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #7883 from nextcloud/search-and-13Roeland Jago Douma2018-01-162-3/+18
|\ \ \ | | | | | | | | [13] Support arbitrary number of arguments for d:or and d:and in search queries
| * | | Support arbitrary number of arguments for d:or and d:and in search queriesRobin Appelman2018-01-162-3/+18
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #7886 from nextcloud/13-7885Joas Schilling2018-01-161-0/+4
|\ \ \ | |/ / |/| | [stable13] Add OCP\User deprecations to app code checker
| * | Add OCP\User deprecations to app code checkerMorris Jobke2018-01-161-0/+4
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7878 from nextcloud/13-7877Christoph Wurst2018-01-161-0/+4
|\ \ | | | | | | [stable13] Deprecated checkLoggedIn and other old ways to access control
| * | Deprecated checkLoggedIn and other old ways to access controlMorris Jobke2018-01-161-0/+4
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-01-16142-264/+378
| |
* | Merge pull request #7806 from nextcloud/fix-7805Morris Jobke2018-01-152-1/+135
|\ \ | |/ |/| Fix bug with proxies
| * Add unit testJoas Schilling2018-01-151-0/+123
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix bug with proxiesMario Danic2018-01-151-1/+12
|/ | | | Signed-off-by: Mario Danic <mario@lovelyhq.com>
* Merge pull request #7764 from nextcloud/13rc1v13.0.0RC1Morris Jobke2018-01-111-2/+2
|\ | | | | 13.0.0 RC1
| * 13.0.0 RC1Morris Jobke2018-01-111-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #7796 from nextcloud/ldap-sync-fixesMorris Jobke2018-01-113-12/+11
|\ | | | | LDAP Sync fixes: revert recursion resolution, fixed handling of pagingsize of 0
| * revert resolving of recursion (3628d4d65d67d12afc93d969de61cb06a33179fd)Arthur Schiwon2018-01-111-5/+2
| | | | | | | | | | | | | | | | without recursion we have issues with internal states. paged search status are set to false, cookies are not being set. In the end we have endless requests which pile up enormously with a high initial offset. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fix return value when ldapPagingSize returns nullArthur Schiwon2018-01-112-3/+4
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * enrich log message with backtrace, but level it down to DEBUGArthur Schiwon2018-01-111-3/+3
| | | | | | | | | | | | | | The message is not helpful anyway for an admin, and oftentimes is just valid (e.g. when searching with an offset beyond users in LDAP). Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * when paged results are turned off, all (max possible) users are returnedArthur Schiwon2018-01-112-2/+3
| | | | | | | | | | | | thus hasMoreResult should return false Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #7709 from ↵Morris Jobke2018-01-116-9/+17
|\ \ | | | | | | | | | | | | nextcloud/fix-password-displayed-as-username-in-password-manager Fix password displayed as username in Firefox password manager dialog
| * | Add strengthify bar after plain text input clone of password inputDaniel Calviño Sánchez2018-01-112-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To show the password in plain text "showPassword" adds a text input after the password input and swaps their visibility depending on whether the password has to be shown in plain text or not. In a similar way, "strengthify" by default adds the strength bar after the input element it was called on. Due to this, if "showPassword" is called before "strengthify" on the same password input then the strength bar ends between the password input and the text input, and when the text input is shown it appears below the strength bar. To fix this now the strength bar is added after the text input in those places in which "strengthify" was called after "showPassword" on the same element. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Bump strengthify to 0.5.3Roeland Jago Douma2018-01-103-8/+14
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Fix password displayed as username in Firefox password manager dialogDaniel Calviño Sánchez2018-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When finishing the setup of Nextcloud through the WebUI (setting admin user and database) Firefox offers to save the username and password. However, the password was shown in both the username and password fields of the Firefox password manager dialog. The problem was that the password input element (in the HTML form) is cloned in a text input element, which is used to show the password in plain text when clicking on the "Show password" button. As it was a text input immediately followed by a password input Firefox seemed to assume that it had to be the username and ignored the real username field, no matter the value set for the "autocomplete" attribute. Now the cloned text input is added after the password input, so Firefox no longer thinks that the cloned text input is the username field and the password manager dialog shows the proper username instead. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #7776 from nextcloud/theming-capabilties-enhancementsMorris Jobke2018-01-116-53/+99
|\ \ \ | | | | | | | | More detailed theming capabilities
| * | | More detailed theming capabilitiesJulius Härtl2018-01-106-53/+99
| | | | | | | | | | | | | | | | | | | | | | | | This will allow clients to easily check if a custom background is used Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #7791 from nextcloud/bugfix/noid/fix-update-notificationMorris Jobke2018-01-111-6/+1
|\ \ \ \ | | | | | | | | | | Fix displaying of the HTML update notification
| * | | | Fix displaying of the HTML notificationJoas Schilling2018-01-111-6/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #7790 from nextcloud/usermanagement-fixesMorris Jobke2018-01-113-49/+35
|\ \ \ \ | | | | | | | | | | Fix popover and styling in user management
| * | | | Fix popover and styling in user managementJulius Härtl2018-01-113-49/+35
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #7650 from rpirritano/masterMorris Jobke2018-01-114-11/+10
|\ \ \ \ \ | | | | | | | | | | | | made small changes to login screen