summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-01-2710-0/+14
|
* Merge pull request #8027 from nextcloud/13.0.0-last-rcv13.0.0RC3Morris Jobke2018-01-261-2/+2
|\ | | | | 13.0.0 RC3
| * 13.0.0 RC3Morris Jobke2018-01-261-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2018-01-2612-4/+58
|
* [tx-robot] updated from transifexNextcloud bot2018-01-2518-2/+42
|
* Merge pull request #8034 from nextcloud/13-8032Roeland Jago Douma2018-01-241-0/+2
|\ | | | | [stable13] Fix missing clipboard icon in shared links
| * Fix missing clipboard icon in shared linksDaniel Calviño Sánchez2018-01-241-0/+2
|/ | | | | | | | | | | | The clipboard icon in shared links appears either directly on the link input field or, if any social sharing app is enabled, in a menu. The clipboard icon uses the same CSS rules as other icons (like the information icon) to be posioned on the end of the input field, and those rules have to be "cancelled" when the icon is shown in the menu. Fixes #7990 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Merge pull request #8031 from nextcloud/7921_12Morris Jobke2018-01-241-8/+1
|\ | | | | [stable13] Removed additional and uneccessary request on password reset, to fix redirection afterwards.
| * Removed additional and uneccessary request on password reset, to fix ↵Luca Adrian Lindhorst2018-01-241-8/+1
| | | | | | | | | | | | redirection afterwards. Signed-off-by: Luca Adrian Lindhorst <info@lucalindhorst.de>
* | Merge pull request #8030 from nextcloud/7986_12Morris Jobke2018-01-241-3/+13
|\ \ | | | | | | [stable13] If the preview is size 0 it is invalid
| * | If the preview is size 0 it is invalidRoeland Jago Douma2018-01-241-3/+13
| |/ | | | | | | | | | | | | | | | | * delete it * throw a NotFound Exception - This should a proper 404 to the user - Next time it is then regenerated Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8025 from nextcloud/13-8020Roeland Jago Douma2018-01-241-0/+5
|\ \ | | | | | | [stable13] Make sure we always know for sure if an avatar is generated or not
| * | Make sure we always know for sure if an avatar is generated or notJulius Härtl2018-01-241-0/+5
| |/ | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #8029 from nextcloud/13-7991Morris Jobke2018-01-241-1/+9
|\ \ | |/ |/| [stable13] Send a proper response for status.php on trusted domain error
| * Send a proper response for status.php on trusted domain errorMorris Jobke2018-01-241-1/+9
|/ | | | | | * fixes #7732 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2018-01-24112-116/+122
|
* increase the time we wait for smb notifications in the testRobin Appelman2018-01-231-2/+2
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* [tx-robot] updated from transifexNextcloud bot2018-01-2310-2/+78
|
* [tx-robot] updated from transifexNextcloud bot2018-01-222-0/+2
|
* [tx-robot] updated from transifexNextcloud bot2018-01-21148-144/+178
|
* [tx-robot] updated from transifexNextcloud bot2018-01-202-0/+4
|
* 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
| |