summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-11-17118-460/+832
|
* Merge pull request #2122 from nextcloud/downstream-26520Morris Jobke2016-11-173-7/+11
|\ | | | | 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-162-1/+4
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Hack to prevent warning for read-only wrapper in public linksVincent Petry2016-11-162-6/+7
| | | | | | | | | | | | | | | | | | | | | | 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 #2141 from nextcloud/icon-backgroundRoeland Jago Douma2016-11-175-7/+31
|\ \ | | | | | | 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-155-7/+31
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #2151 from nextcloud/theming-fixesMorris Jobke2016-11-162-30/+53
|\ \ \ | | | | | | | | theming: move reset button into field and only show when focused
| * | | theming: move reset button into field and only show when focusedJan-Christoph Borchardt2016-11-162-30/+53
| |/ / | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #2131 from nextcloud/fix-tabs-in-translationRoeland Jago Douma2016-11-161-6/+10
|\ \ \ | | | | | | | | convert text to single line so tabs in translation issue is fixed
| * | | No HTML in stringRoeland Jago Douma2016-11-161-1/+10
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | convert text to single line so tabs in translation issue is fixedJan-Christoph Borchardt2016-11-161-6/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #2147 from nextcloud/dont-update-same-valueRoeland Jago Douma2016-11-161-4/+6
|\ \ \ \ | | | | | | | | | | Don't update value if it is already set to the same value
| * | | | Use getvalue to fetch the valueRoeland Jago Douma2016-11-161-5/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Don't update value if it is already set to the same valueMorris Jobke2016-11-161-1/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * this PR makes sure to warm up the cache for that user * then the logic within the "if is in cache" code can be used to reduce needed queries * inspired by @andreas-p - https://github.com/nextcloud/server/pull/2128 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #2157 from nextcloud/fix-checkboxesJoas Schilling2016-11-163-8/+6
|\ \ \ \ | | | | | | | | | | Fix checkboxes when theming color is enabled
| * | | | Fix margin for checkboxes in multiselect optionsJulius Haertl2016-11-161-3/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Revert "Fix #1782"Julius Haertl2016-11-162-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bc5268bdc84c9c9f302914ebb1b5304b614dfc2e. Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | | | Merge pull request #2123 from nextcloud/downstream-26522Joas Schilling2016-11-162-2/+34
|\ \ \ \ \ | |_|/ / / |/| | | | Skip hidden files when counting visible files in list
| * | | | Skip hidden files when counting visible files in list (#26522)Vincent Petry2016-11-142-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file list UI logic that renders the next page doesn't properly exclude hidden files when not shown. This fix makes sure that only rows that are actually visible are counted when rendering a page, this makes sure that the page will always have enough elements displayed.
* | | | | Merge pull request #2160 from nextcloud/its-nextcloudRoeland Jago Douma2016-11-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | It's Nextcloud
| * | | | | It's NextcloudMarius Blüm2016-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | | | | Merge pull request #2166 from nextcloud/logreader-shippedRoeland Jago Douma2016-11-161-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | set logreader as shipped
| * | | | | | set logreader as shippedRobin Appelman2016-11-161-0/+1
| | | | | | |
* | | | | | | Merge pull request #2146 from nextcloud/add_copy_tooltip_to_clipboardRoeland Jago Douma2016-11-164-30/+59
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Adds copy tooltip to clipboards
| * | | | | | Fix tooltips - they now properly change on clickMorris Jobke2016-11-166-35/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Adds copy tooltip to clipboardsRoeland Jago Douma2016-11-153-4/+5
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #719 from nextcloud/lockdownRoeland Jago Douma2016-11-1628-41/+1336
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow restricting of app password permissions
| * | | | | | add testRobin Appelman2016-11-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | Add test for setting up fake fsRobin Appelman2016-11-163-2/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | dropdown uiRobin Appelman2016-11-163-24/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | Adds tests for the AuthSettingsControllerRoeland Jago Douma2016-11-161-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Adds NullCache ans NullStorage tests for LockdownRoeland Jago Douma2016-11-162-0/+402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Adds TokenProvider and Mapper testsRoeland Jago Douma2016-11-163-7/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | add testsRobin Appelman2016-11-162-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | update autoloaderRobin Appelman2016-11-162-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | explicit typesRobin Appelman2016-11-162-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | cast to intRobin Appelman2016-11-162-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | update testsRobin Appelman2016-11-161-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | phpdocRobin Appelman2016-11-165-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | fix setscopeRobin Appelman2016-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * | | | | | enable deleting/configuring new tokensRobin Appelman2016-11-163-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * | | | | | allow configuring filesystem accessRobin Appelman2016-11-169-13/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * | | | | | app password scope wipRobin Appelman2016-11-166-9/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * | | | | | read lockdown scope from tokenRobin Appelman2016-11-167-11/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * | | | | | basic lockdown logicRobin Appelman2016-11-1610-16/+424
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
* | | | | | Merge pull request #2150 from nextcloud/move_buttons_to_bottomRoeland Jago Douma2016-11-165-2/+68
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move social buttons to bottom on admin page
| * | | | | | left-align social media buttons correctly on Personal page tooJan-Christoph Borchardt2016-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | | Move social buttons to bottom on admin pageRoeland Jago Douma2016-11-164-1/+67
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | For #2134 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #2156 from nextcloud/fix-autoloader-for-new-appsRoeland Jago Douma2016-11-161-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add autoloader path for newly installed apps too
| * | | | | Add autoloader path for newly installed apps tooMorris Jobke2016-11-161-0/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * followup to https://github.com/nextcloud/server/pull/2148 * problem noticed in https://github.com/nextcloud/files_antivirus/pull/11 Signed-off-by: Morris Jobke <hey@morrisjobke.de>