summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-08-1810-0/+16
|
* [tx-robot] updated from transifexNextcloud bot2017-08-1784-552/+586
|
* Bye bye Dropbox v1Vincent Petry2017-08-1623-6155/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #6130 from nextcloud/cleanup-unused-methodsMorris Jobke2017-08-164-5/+5
|\ | | | | Cleanup unused methods
| * Cleanup unused methodsMorris Jobke2017-08-154-5/+5
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-08-168-32/+136
| |
* | Merge pull request #6128 from nextcloud/primary-font-color-in-capabilitiesMorris Jobke2017-08-152-9/+22
|\ \ | | | | | | Add the primary font color to the capabilities as well
| * | Add the primary font color to the capabilities as wellJoas Schilling2017-08-152-9/+22
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #6132 from nextcloud/do-not-log-maintenance-modeMorris Jobke2017-08-152-3/+10
|\ \ \ | | | | | | | | Do not log WebDAV maintenance mode exception
| * | | Do not log WebDAV maintenance mode exceptionMorris Jobke2017-08-152-3/+10
| | |/ | |/| | | | | | | | | | | | | Log the maintenance mode exception only in debug level. Fixes #6124 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #6101 from cbartz/patch-1Lukas Reschke2017-08-151-6/+1
|\ \ \ | | | | | | | | Missing array assignment in Swift.php
| * | | Remove tmpFiles Array in Swift.phpChristopher Bartz2017-08-141-6/+1
| | |/ | |/| | | | | | | | | | | | | tmpFiles Array is unnecessary and there has been a reference without an assignment which lead to a bug making swift external storage unuseable.
* | | Merge pull request #6099 from nextcloud/issue-3457-no-exception-on-sharee-errorLukas Reschke2017-08-151-5/+21
|\ \ \ | |_|/ |/| | Catch exceptions on error of cloud id resolution
| * | Catch exceptions on error of cloud id resolutionJoas Schilling2017-08-141-5/+21
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #6123 from nextcloud/cleanup-shareItemMorris Jobke2017-08-154-8/+8
|\ \ \ | | | | | | | | Cleanup usage of shareItem in internal code base
| * | | Cleanup usage of shareItem in internal code baseMorris Jobke2017-08-154-8/+8
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Use proper methods for registerBackendMorris Jobke2017-08-153-4/+4
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #6116 from nextcloud/cleanup-unused-methodsMorris Jobke2017-08-151-63/+0
|\ \ \ | | | | | | | | Cleanup unused methods
| * | | Cleanup unused methodsMorris Jobke2017-08-151-63/+0
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / [tx-robot] updated from transifexNextcloud bot2017-08-154-0/+16
|/ /
* | Merge pull request #6080 from nextcloud/header-bottom-borderMorris Jobke2017-08-141-0/+20
|\ \ | | | | | | Add buttom border for header
| * | Add buttom border for headerMorris Jobke2017-08-141-0/+20
| |/ | | | | | | | | | | | | * allows to distinct the header from the rest of the UI for bright colors * ref #5654 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #5872 from nextcloud/swift-filter-dotRobin Appelman2017-08-141-1/+1
|\ \ | |/ |/| Filter magic dot object when swift directory
| * Filter magic dot object when swift directoryRobin Appelman2017-08-011-1/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-08-1412-4/+54
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-1310-20/+24
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-1212-8/+58
| |
* | Merge pull request #5861 from nextcloud/shareinfoLukas Reschke2017-08-117-118/+646
|\ \ | | | | | | Move shareinfo over to proper controller
| * | Add unit testsRoeland Jago Douma2017-08-104-16/+437
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Remove old code + add MiddlewareRoeland Jago Douma2017-08-105-125/+96
| | | | | | | | | | | | | | | | | | | | | * Add proper middleware for shareinfo * Remove old shareinfo routes Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move shareinfo over to proper controllerRoeland Jago Douma2017-08-102-1/+137
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-08-114-18/+38
| | |
* | | Merge pull request #5616 from ↵Morris Jobke2017-08-103-20/+7
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/ldap-wizard-remove-LDAPTLS_REQCERT-attempt LDAP Wizard: do not attempt to recognise cert issue by using LDAPTLS_REQCERT
| * | | fix phpdoc return types (no code change)Arthur Schiwon2017-07-212-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | do not attempt to recognise cert issue by using LDAPTLS_REQCERTArthur Schiwon2017-07-211-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | first, it does not work (at least not everywhere/reliably), second if it did it was not reset properly. Removes a bit of complexity. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Fix preview of themingDaniel Calviño Sánchez2017-08-101-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull request #5429 made cached SCSS files depend on a hash of the base URL, so the "/css/core/server.css" file does no longer exist; as the file can not be loaded the "Loading preview" message is never removed and the "Saved" message is never shown. As it now depends on the hash of the base URL the file to be reloaded can no longer be hardcoded, so the full URL to the "server.css" file that has to be reloaded (if any) is now got from the DataResponse provided by the controller. Fixes #5975 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Refactor reloadStylesheets to receive absolute URLsDaniel Calviño Sánchez2017-08-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparatory step for a following change in which reloadStylesheets will have to be able to receive absolute URLs. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Provide "server.css" URL in ThemingController responseDaniel Calviño Sánchez2017-08-102-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull request #5429 made cached SCSS files depend on a hash of the base URL, so the "/css/core/server.css" file does no longer exist. The "server.css" URL must be known by the Theming app in order to update the stylesheets when previewing the changes to the theme, so the DataResponse from the controller now provides the full URL to the "server.css" file that has to be reloaded (if any). The "server.css" URL provided by the response will be taken into account by the JavaScript front-end in a following commit. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Split updateStylesheet tests for success and errorDaniel Calviño Sánchez2017-08-101-17/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparatory step for a following commit in which the properties present in the response will change depending on whether the request was successful or not. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Unify DataResponse format with its uses in the rest of the fileDaniel Calviño Sánchez2017-08-101-6/+9
| |/ / |/| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-08-104-0/+8
| | |
* | | Fix ldap testsRoeland Jago Douma2017-08-092-0/+11
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Fix files_sharing CacheTestsRoeland Jago Douma2017-08-091-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-08-09566-830/+306
| | |
* | | Merge pull request #5982 from ↵Lukas Reschke2017-08-081-1/+2
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix-loading-icon-inside-upload-button-in-theming-app Fix loading icon inside upload button in Theming app
| * | | Fix loading icon inside upload button in Theming appDaniel Calviño Sánchez2017-08-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull request #5969 fixed the vertical alignment of loading icon and status message in Theming app, but in doing so it broke the loading icon inside the upload button. When an image is being uploaded the upload icon is replaced by a loading icon, so the loading icon and the upload icon have to share their CSS rules, but only in that specific case. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #5972 from ↵Morris Jobke2017-08-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/replace-loading-icon-gif-with-pure-css-in-login-button Replace loading icon GIF with pure CSS in login button
| * | | | Replace loading icon GIF with pure CSS loading iconDaniel Calviño Sánchez2017-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pure CSS loading icon uses an ::after pseudo-element, and thus it can only be used on container elements; the input element is not a container element, so when the class "icon-loading-small" is set on an input element it falls back to a loading icon GIF. This commit modifies the markup of the login button to add a div element that holds the confirm icon and the loading icon (depending on the case). In order to position the icon in the same place as before the input and the icon are both wrapped by another div making possible to set the absolute position of the icon relative to the input. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-08-0810-2/+22
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-08-062-0/+4
| | | | |