summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add save button for setting LDAP Agent DN and PasswordArthur Schiwon2017-10-273-4/+48
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Fix regression: undesired writes to the DBArthur Schiwon2017-10-271-1/+1
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* LDAP: only write actually changes values to the DBArthur Schiwon2017-10-271-2/+8
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* first, remove the hackArthur Schiwon2017-10-272-12/+0
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #6977 from Fiech/masterJoas Schilling2017-10-271-0/+6
|\ | | | | Added additional methods for removal of sensitive info
| * Added additional methods for removal of sensitive infoJohannes Schlichenmaier2017-10-271-0/+6
| | | | | | | | Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
* | [tx-robot] updated from transifexNextcloud bot2017-10-2728-32/+128
| |
* | Merge pull request #6973 from nextcloud/menu-highlightMorris Jobke2017-10-262-0/+3
|\ \ | | | | | | Add blue bar as highlight to active menu entry
| * | Add blue highlight to active menu entryJan-Christoph Borchardt2017-10-242-0/+3
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #6970 from nextcloud/class-usage-in-mocks-encryption-appMorris Jobke2017-10-2627-115/+176
|\ \ \ | | | | | | | | Use ::class in test mocks of encryption app
| * | | Use ::class in test mocks of encryption appMorris Jobke2017-10-2627-115/+176
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #6939 from nextcloud/class-usage-in-mocks-dav-appMorris Jobke2017-10-2642-113/+159
|\ \ \ | | | | | | | | Use ::class in test mocks of dav app
| * | | Fix another warningMorris Jobke2017-10-261-4/+5
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Use ::class in test mocks of dav appMorris Jobke2017-10-2641-109/+154
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #6949 from nextcloud/cachingrouter_localRoeland Jago Douma2017-10-261-2/+2
|\ \ \ | | | | | | | | Use local cache for the CachingRouter
| * | | Use local cache for the CachingRouterRoeland Jago Douma2017-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to cache routes distributed. It even has the downside that the router might return different routes then the ones in the local routes.php files. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-10-26102-150/+226
| |_|/ |/| |
* | | Merge branch 'mastix-master'Morris Jobke2017-10-251-2/+2
|\ \ \
| * | | Updated OpenGraph title to display folder name instead of a nextcloud ↵Sascha Sambale2017-10-251-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | standard text When sharing a folder via Facebook, WhatsApp or any other platform that makes use of OpenGraph, the display title was "Nextcloud - a safe home for all your data" and the description was the actual name of the folder. This should not be the case, so the display title has been changed to display the folder name and the description now displays the former OpenGraph title. Signed-off-by: Sascha Sambale <mastixmc@gmail.com> Fixing whitespaces and empty line.
* | | Merge pull request #6947 from nextcloud/fix_6821Morris Jobke2017-10-251-1/+1
|\ \ \ | | | | | | | | Use new-password as autocomplete on share auth page
| * | | Use new-password as autocomplete on share auth pageRoeland Jago Douma2017-10-251-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6821 This makes sure that (supported) browsers will not prefill the password field if a user has a password saved for that nextcloud. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #6940 from nextcloud/master-6935-ellipsisJoas Schilling2017-10-252-3/+3
|\ \ \ | |/ / |/| | Add space between ellipsis and word
| * | Add space between ellipsis and wordMorris Jobke2017-10-252-3/+3
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-10-25100-80/+396
| | |
* | | Merge pull request #6709 from ↵Morris Jobke2017-10-2514-157/+289
|\ \ \ | |/ / |/| | | | | | | | nextcloud/show-checkbox-where-the-favourite-icon-is-now Show checkbox where the favourite icon is now
| * | Solve acceptance test failure due to clicks on covered elementsDaniel Calviño Sánchez2017-10-192-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firefox and Chrome drivers for Selenium refuse to click on an element if the point to be clicked is covered by a different element, throwing an UnknownError exception with message "Element is not clickable at point ({x}, {y}). Other element would receive the click: {element}". Although in general that would be a legit error (as the user would not be able to click on the element) due to a bad layout, sometimes this can be just a temporal issue caused by an animation, in which case there would be no problem once the animation finished and the elements are all in their final location. Unfortunately, automatically handling those situations in which the problem is caused by an animation by just retrying a few times if the element to be clicked is covered before giving up would probably cause confusion instead of easing test writing. The reason is that if the center of the element is covered by another one the Firefox driver for Selenium tries to click on the corners of the element instead. The problem is that the coordinates used for the click are integer values, but Firefox has sub-pixel accuracy, so sometimes (depending on which corner is not covered and whether the left, top, width or height properties of the element to be clicked have a decimal component or not) the clicks silently land on a different HTML element (and that is with squared borders; with round borders they always land on a different HTML element. That was partially addressed for Selenium 3.0 by clicking first on the edges, but it would still fail if the middle point of the edges is covered but not the corners). It is not possible to fix or even detect all that from the tests (except maybe with some extreme hacks involving accessing private PHP members from Mink and bypassing or replacing the standard JavaScript executed by the Firefox driver with a custom implementation...), so it is not possible to ensure that clicks during an animation will land on the right element (in fact it is not possible even on static elements, although except when the layout is wrong there should be no problem); sometimes retrying a click when the element is covered would solve the problem, sometimes it would cause a different element to be clicked (and sometimes there would be even no retry, as the first click would have silently landed on a different element than the expected one). Therefore, a different approach must be used. Instead of trying to automatically handle clicks during animations the tests must be written being aware of the problem and thus waiting somehow for the animations that can cause a problem to end before performing the clicks. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Extend the clickable area of the file name to include the thumbnailDaniel Calviño Sánchez2017-10-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the checkbox was moved to its own column clicking on the thumbnail should behave like clicking on the file name. To achieve this the left position was replaced with a padding, so the element is kept at the same place while extending its clickable area to cover the thumbnail. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Move checkboxes to their own columnDaniel Calviño Sánchez2017-10-197-63/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The selection column is not only a visual column, but also a real column of the file list table. Unlike other columns whose width is reduced in space constrained screens the selection column must stay the same so the tapping area is large enough to be easily usable The selection column does not appear in the search results table, so its contents have to be explicitly aligned with those of the main table based on whether the main table has a selection column or not (using the "has-selection" CSS class in the same way as the "has-favorite" CSS class was being used when there was a column for favorite actions). In the tests the ":visible" selector can no longer be used. That selector matches elements with a width or height that is greater than zero, but the dimensions calculated in the unit tests are not reliable; the width of the link was zero before these changes, and now moving the checkbox to its own column causes the height of the link to become zero too, so it no longer matches the ":visible" selector even if it is not hidden. As hidding and showing the link is based on its "display" CSS property its value is the one checked now. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Remove "has-favorites" class from file list tableDaniel Calviño Sánchez2017-10-192-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | The "has-favorites" CSS class is no longer used after moving the favorite mark to the top right corner of the thumbnail, so there is no need to add it to the table. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Move favorite mark to the top right corner of the thumbnailDaniel Calviño Sánchez2017-10-195-38/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The favorite icon was shown on its own "column" (not a real column in the table, but a visual column achieved through margins and left positions). Now the icon was moved to the top right corner of the file thumbnail, and the thumbnail and file name were moved to the left to fill the space left by the "column". To keep the markup in line with its visual representation (and to ease the placing through CSS), the favorite mark is no longer prepended to the row, but appended to the thumbnail instead. In the same way, the thumbnail is no longer appended to the checkbox label, but to the link with the name of the file instead (although the checkbox is still shown at the bottom right corner of the thumbnail, and clicking on the thumbnail still selects the file). In order to show the "busy" state on a file the "icon-loading-small" CSS class is set to the parent element of the thumbnail, so the thumbnail is also wrapped now by another div with the same size and position as the label. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Set background size for thumbnail in CSS instead of JavaScriptDaniel Calviño Sánchez2017-10-192-2/+3
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Show always the checkboxDaniel Calviño Sánchez2017-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The checkbox is not shown always with full opacity, though, in order to reduce the visual noise (specially later, once the checkbox is moved to its own column). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Replace inline favorite action with just a favorite iconDaniel Calviño Sánchez2017-10-194-147/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparatory step for a following commit in which the position of the favorite icon and the checkbox will be swapped; in that new design the favorite icon is no longer expected to be an action but just a simple mark on whether the file is favorited or not (the action is expected to be triggered then only from the file actions menu). The favorite icon is now fully shown or completely hidden depending on whether the file is favorited or not. As the icon is just informative but no longer an action now it does not change when hovered or focus. In the same way, the alternative text when the file is not favorited now it is not "Favorite" (an action) but "Not favorited" instead. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Update acceptance tests to favorite files through the file actions menuDaniel Calviño Sánchez2017-10-191-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently a file can be favorited either through the inline action or through the file actions menu. However, the inline action will be removed in a following commit and then it will be possible to do it only through the file actions menu. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add "Favorite" action to the file actions menuDaniel Calviño Sánchez2017-10-193-2/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new FileAction for the menu is essentially the same as the old inline FileAction, except for the rendering; in this case the FileAction is shown in the menu in a standard way, so there is no need to provide a custom renderer (although the menu entry text and icon change depending on whether the file is currently a favorite or not, but that can be done just with displayName and iconClass functions). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add support to FileActionsMenu for icon class functionsDaniel Calviño Sánchez2017-10-193-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Icon class function properties make possible to render a different icon class depending on the context of the file action. Inline file actions had support for them already and called them passing the file name and context of the file action as parameters. Due to this the FileActionsMenu passes those parameters too to icon class functions instead of just the context like done for display name functions. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #6936 from nextcloud/master-6935Morris Jobke2017-10-251-1/+1
|\ \ \ | |_|/ |/| | Fix typo
| * | Replace ... with …Morris Jobke2017-10-241-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #6918 from nextcloud/rotate_job_by_defaultRoeland Jago Douma2017-10-246-14/+55
|\ \ \ | | | | | | | | Add logrote as a default background job
| * | | Update autoloaderRoeland Jago Douma2017-10-242-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add logrote as a default background jobRoeland Jago Douma2017-10-244-14/+53
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #6921 from nextcloud/appmanager-securitymiddlewareRoeland Jago Douma2017-10-243-4/+19
|\ \ \ \ | | | | | | | | | | Use proper DI for security middleware for app enabled check
| * | | | Use proper DI for security middleware for app enabled checkMorris Jobke2017-10-243-4/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #6934 from nextcloud/class-usage-in-mocksRoeland Jago Douma2017-10-24146-740/+947
|\ \ \ \ \ | | | | | | | | | | | | Use ::class in test mocks
| * | | | | Use ::class in test mocksMorris Jobke2017-10-24146-740/+947
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #6928 from nextcloud/remove-unneeded-methodMorris Jobke2017-10-241-15/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused method of OC_App
| * | | | | Remove unused method of OC_AppMorris Jobke2017-10-241-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #6930 from nextcloud/use-proper-di-for-repair-stepMorris Jobke2017-10-242-4/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Use proper DI for repair command
| * | | | | Use proper DI for repair commandMorris Jobke2017-10-242-4/+9
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #6919 from nextcloud/di-appmanager-encryption-migrationMorris Jobke2017-10-244-13/+34
|\ \ \ \ \ | | | | | | | | | | | | Use DI for IAppManager to encryption migration
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 13:40:53 +0000