summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2121 from nextcloud/stable10_2100Morris Jobke2016-11-172-0/+56
|\ | | | | [Stable10] Fixes not allowed increasing of link share permissions
| * Fix testsRoeland Jago Douma2016-11-151-0/+55
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * [Stable10] Fixes not allowed increasing of link share permissionsRoeland Jago Douma2016-11-151-0/+1
| | | | | | | | | | | | Backport of #2100 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #2186 from nextcloud/stable10-2122Morris Jobke2016-11-173-0/+9
|\ \ | | | | | | [stable10] Hack to prevent warning for read-only wrapper in public links
| * | only use one kind of hack for the storage wrappers of the sharing codeMorris Jobke2016-11-171-0/+3
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Hack to prevent warning for read-only wrapper in public linksVincent Petry2016-11-172-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Storage wrappers should normally always be registered inside a presetup hook. However in the public link scenario this is not possible and there is currently no good alternative with the current architecture. Instead of logging a warning every time, this fix prevents the warning to be shown but also adds a FIXME in the code for the future. This is ok because this app is already using private/internal APIs at the moment and should be reworked properly in the future.
* | | Merge pull request #2185 from nextcloud/stable10-icons-audio-video-offMorris Jobke2016-11-177-8/+42
|\ \ \ | |/ / |/| | [stable10] add icons for audio mute and video off
| * | add icons for audio mute and video offJan-Christoph Borchardt2016-11-177-8/+42
|/ / | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [tx-robot] updated from transifexNextcloud bot2016-11-17114-460/+582
| |
* | Merge pull request #2091 from nextcloud/fix_1862Morris Jobke2016-11-171-3/+3
|\ \ | | | | | | Do not request node when creating a user-group share
| * | Fixes retargeting a share of a deleted sourceRoeland Jago Douma2016-11-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1862 We tried to construct the actual node. While this node was no longer available. This work around makes sure that we don't try to do this. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #2142 from nextcloud/stable10-icon-backgroundRoeland Jago Douma2016-11-174-7/+25
|\ \ \ | | | | | | | | [stable10] add dark background fade to icons to make them visible on light backgrounds
| * | | add dark background fade to icons to make them visible on light backgroundsJan-Christoph Borchardt2016-11-154-7/+25
| | |/ | |/| | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #2155 from nextcloud/stable10-federated-cloud-idRoeland Jago Douma2016-11-161-1/+1
|\ \ \ | |/ / |/| | [stable10] specify Federated Cloud ID syntax
| * | specify Federated Cloud ID syntaxJan-Christoph Borchardt2016-11-161-1/+1
|/ / | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [tx-robot] updated from transifexNextcloud bot2016-11-156-22/+26
| |
* | Merge pull request #2118 from ↵Roeland Jago Douma2016-11-141-0/+3
|\ \ | | | | | | | | | | | | nextcloud/stable10-add-bruteforce-check-to-person-endpoint [stable10] Add bruteforce checker to Person.php
| * | Add bruteforce checker to Person.phpLukas Reschke2016-11-141-0/+3
|/ / | | | | | | | | | | Also check for attempts on this endpoint Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | [tx-robot] updated from transifexNextcloud bot2016-11-1418-58/+220
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-1318-2/+28
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-1270-182/+262
| |
* | Merge pull request #2078 from nextcloud/jospoortvliet-patch-1Joas Schilling2016-11-111-1/+1
|\ \ | | | | | | [Stable 10] Fix Nextcloud vs oldCloud wording
| * | Update sharedialogview.jsJos Poortvliet2016-11-101-1/+1
| | | | | | | | | | | | Fix Nextcloud vs oldCloud wording
* | | [tx-robot] updated from transifexNextcloud bot2016-11-1114-14/+48
|/ /
* | [tx-robot] updated from transifexNextcloud bot2016-11-10120-98/+272
| |
* | Merge pull request #2059 from ↵Morris Jobke2016-11-093-7/+22
|\ \ | | | | | | | | | | | | nextcloud/backport-2058-better-error-message-for-installation-error [stable10] Use a better error message and point the users to the support channels
| * | Correctly catch the "soft errors" nowJoas Schilling2016-11-091-4/+8
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Use a better error message and point the users to the support channelsJoas Schilling2016-11-092-1/+13
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix help linkJoas Schilling2016-11-091-3/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #2056 from nextcloud/stable10-fix-public-buttonRoeland Jago Douma2016-11-091-3/+4
|\ \ \ | | | | | | | | [stable10] fix button on public upload page
| * | | fix button on public upload pageJan-Christoph Borchardt2016-11-081-3/+4
|/ / / | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #2041 from nextcloud/backport-2036-2040Roeland Jago Douma2016-11-081-1/+3
|\ \ \ | | | | | | | | [stable10] Fix the push state + Apply firefox workaroud to svg filters
| * | | Apply firefox workaroud to svg filtersJulius Haertl2016-11-081-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | Fix the push stateJoas Schilling2016-11-081-1/+1
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #2048 from nextcloud/stable10-update-containersMorris Jobke2016-11-084-55/+51
|\ \ \ | | | | | | | | [stable10] Update containers to latest version
| * | | Remove unneeded Windows logicMorris Jobke2016-11-082-32/+0
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Activate APCu on PHP 7Morris Jobke2016-11-081-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue with APCus inc and dec methods on PHP 7 see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221 for details Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Update containers to latest versionMorris Jobke2016-11-081-21/+21
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / [tx-robot] updated from transifexNextcloud bot2016-11-08112-170/+174
|/ /
* | [tx-robot] updated from transifexNextcloud bot2016-11-0730-40/+142
| |
* | Merge pull request #2025 from nextcloud/stable10-backport-2018Roeland Jago Douma2016-11-061-0/+11
|\ \ | | | | | | [stable10] Workaround for disappearing app icons for Firefox before version 51
| * | Workaround for disappearing app icons for Firefox before version 51Julius Haertl2016-11-051-0/+11
| | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2016-11-0612-0/+68
|/ /
* | [tx-robot] updated from transifexNextcloud bot2016-11-0524-38/+280
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-0478-190/+268
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-03244-1590/+1564
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-0228-4/+236
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-0190-2858/+3142
| |
* | [tx-robot] updated from transifexNextcloud bot2016-10-3132-20/+196
| |
* | [tx-robot] updated from transifexNextcloud bot2016-10-3020-2/+172
| |