aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-03-0524-8/+76
|
* [tx-robot] updated from transifexNextcloud bot2018-03-0484-110/+402
|
* [tx-robot] updated from transifexNextcloud bot2018-03-03146-148/+96
|
* Merge pull request #8619 from coliff/patch-1Roeland Jago Douma2018-03-021-1/+1
|\ | | | | Use correct input type for the url entry
| * Use correct input type for the url entryChristian Oliff2018-03-021-1/+1
| | | | | | Change `type="text"` to `type="url"`
* | Merge pull request #6805 from nextcloud/can-not-change-encryption-directoryBjörn Schießle2018-03-022-4/+5
|\ \ | | | | | | Can not change encryption directory
| * | update unit testsBjoern Schiessle2018-03-021-1/+2
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | s/ownCloud/NextcloudBjoern Schiessle2018-03-011-1/+1
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | fix check and improve error messageBjoern Schiessle2018-03-011-2/+2
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | Anything but true means it failedJoas Schilling2018-03-011-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #8606 from nextcloud/strengthify-unificationRoeland Jago Douma2018-03-023-7/+16
|\ \ \ | | | | | | | | Unify look of the strengthify password hint
| * | | fixup! Unify look of the strengthify password hintJohn Molakvoæ (skjnldsv)2018-03-011-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Unify look of the strengthify password hintJohn Molakvoæ (skjnldsv)2018-03-013-7/+17
| |/ / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #8289 from nextcloud/appdata_hardeningJoas Schilling2018-03-023-1/+60
|\ \ \ | | | | | | | | AppData hardening
| * | | Hardening of SimpleFile getContentRoeland Jago Douma2018-02-273-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | if file_get_contents fails remove the file. And traverse up the tree checking if the other folders are there. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #8612 from nextcloud/rakekniven-i18n-fixMorris Jobke2018-03-021-1/+1
|\ \ \ \ | |_|_|/ |/| | | Update commentstabview.js
| * | | Update commentstabview.jsrakekniven2018-03-011-1/+1
| | | | | | | | | | | | | | | | Changed typo reported at GitHub. See https://www.transifex.com/nextcloud/nextcloud/translate/#de_DE/$/91002505?issue=yes
* | | | [tx-robot] updated from transifexNextcloud bot2018-03-02210-276/+600
| | | |
* | | | Merge pull request #8605 from nextcloud/user-page-ellipsizeRoeland Jago Douma2018-03-011-5/+11
|\ \ \ \ | |/ / / |/| | | Ellipsize long values in the user management
| * | | Ellipsize long values in the user managementJulius Härtl2018-03-011-5/+11
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #8284 from nextcloud/lib_log-storage-test-failedRoeland Jago Douma2018-03-011-0/+3
|\ \ \ \ | |/ / / |/| | | External storage test: log exceptions
| * | | External storage test: log exceptionsRoland Tapken2018-02-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an external storage test fails the exception's message is now written into the logfile (level INFO). Additionally, the stack trace is printed as DEBUG. This helps to resolve the reason for a failing connection. Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
* | | | Merge pull request #8573 from nextcloud/appnav-ie11-fixesRoeland Jago Douma2018-03-011-4/+8
|\ \ \ \ | | | | | | | | | | Fixed app navigation for IE11
| * | | | fixup! Fixed app navigation for IE11John Molakvoæ (skjnldsv)2018-02-281-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fixed app navigation for IE11John Molakvoæ (skjnldsv)2018-02-281-3/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #8588 from nextcloud/fix-breadcrumbs-width-calculationRoeland Jago Douma2018-03-012-55/+426
|\ \ \ \ \ | | | | | | | | | | | | Fix breadcrumbs width calculation
| * | | | | Update comments in testsDaniel Calviño Sánchez2018-02-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Menu and home are not always visible; home is always visible, but menu is shown only when needed. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Improve documentation of "getTotalWidth"Daniel Calviño Sánchez2018-02-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "getTotalWidth" is not more accurate; it is simply not clamped. Moreover, "width/outerWidth" could be used in tests too, and also even if "getTotalWidth" could be used in tests while others not that would not be something to be stated in the API documentation, but in a comment. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Do not show the crumbs again after hiding themDaniel Calviño Sánchez2018-02-281-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the changes in the previous commit "_showCrumb" no longer shows the menu, only the same crumb that was hidden by the last call to "_hideCrumb". Therefore, if the crumb was hidden because it did not fit there is no need to try to show it again, as it will still not fit. Moreover, the calculated width for a hidden element is not always accurate; in some cases the calculated width is lower than the actual width (it happens, for example, when using a background image like the "Share" icon), which causea the crumb to be shown even if there is not enough room, which in the end causes the siblings to overflow the contents. No unit tests for this one, though; you will have to trust me on this, sorry ;-) Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Fix menu visibilityDaniel Calviño Sánchez2018-02-282-10/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crumb for the menu was shown like any other crumb when calling "_showCrumb", but it was also shown when other crumbs were hidden without taking into account the available width. This caused several related problems, like the breadcrumbs taking too much space when the menu was sometimes shown after the rest of the crumbs were adjusted to the available width, or the menu being shown instead of the last crumb even if there was room for it when the available width was increased. Now the menu is always hidden before starting the resizing of the crumbs to ensure that whether it was previously shown or not does not affect the result. In a similar way, the menu will no longer be shown by "_showCrumb", as it is not a regular crumb that has to be shown simply if there is enough room. The menu is now shown as soon as any other crumb is hidden; this ensures that the menu width will be taken into account in further width checks. As when _updateMenu" is called it no longer needs to take care of showing the menu this fixes the issue revealed when fixing the test setup in the previous commit. Finally, this implicitly fixes the failure in the breadcrumbs tests when run on Firefox, as it was caused by the menu interfering in the calculations of the other crumbs when increasing the width. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Fix setup to test the breadcrumbs menuDaniel Calviño Sánchez2018-02-281-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "Shows only items not in the breadcrumb" test was failing when run on Firefox, but not on PhantomJS. This was caused by the differences in the starting width between both browsers and an incorrect setup of the test (the width set for the crumbs was overriden when the breadcrumbs were rendered again, and the breadcrumb was resized to 300 from an indeterminate initial width). Now the crumbs are rendered and then its width, padding and margin are set to a known value. Then it is resized to 1000px, which ensures that there will be enough room for all the crumbs and thus the menu will be hidden, and finally it is resized to 300, which causes the middle crumb to be hidden and the menu to be shown. Note, however, that the test now always fails, no matter if it is run on PhantomJS or on Firefox; if the menu crumb is hidden when "_updateMenu" is called it will show it, but it will also wrongly try to add the menu itself to the menu. As the "crumb-id" of the menu crumb is "-1" this causes the last regular crumb to be added to the menu. This will be fixed with other related issues in the next commit. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Take padding and margins of crumbs into accountDaniel Calviño Sánchez2018-02-282-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calculating the total width of the crumbs only its padding was taken into account; now the margin is too. In a similar way, before showing a crumb only its width was taken into account; now its padding and margin are taken into account too. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Use hard-coded values for paddings and marginsDaniel Calviño Sánchez2018-02-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the resize tests do not depend on the values set in the CSS files. Note that this change causes a test to fail with Firefox, but not with PhantomJS. This is due to a difference in the starting width used by Firefox and by PhantomJS, and it will be fixed in a following commit. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Compress siblings before calculating the available width for crumbsDaniel Calviño Sánchez2018-02-282-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the parent element of the breadcrumbs was resized to a larger width and the siblings of the breadcrumbs expanded to fill all the available width some crumbs could be hidden even if there was enough room for them. The reason was that the width of the siblings being used to calculate the available width for the breadcrumbs was the expanded width of the siblings. Now as many crumbs as possible (that is, fitting in the parent, no matter the siblings) are first shown so the expanding siblings are compressed before calculating the available width. Due to the lack of support for flexboxes in PhantomJS the related unit test is skipped; it has to be run in other browser, like Firefox. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Take all visible siblings into accountDaniel Calviño Sánchez2018-02-282-5/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other apps could add elements to the controls outside the creatable actions div (for example, the button to switch to the gallery), so the widths of all the visible siblings of the breadcrumbs have to be taken into account in the size calculations. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Take padding and margin of the creatable actions div into accountDaniel Calviño Sánchez2018-02-282-1/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some differences in width handling between the browsers used to run the tests, most likely due to their support (or lack of) of certain CSS features: PhantomJS requires "width" to be set (probably because it does not handle flex displays and treats it like a block, so "min-width" does not matter in this case), while Firefox requires "min-width" to be set (otherwise the children of "#controls" could be compressed due to its use of flex display and the elements would end with a different width than the one needed for the tests). Due to all that the width of the breadcrumb siblings must be specified in the tests using both "width" and "min-width". Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Do not render the breadcrumbs again in resize testsDaniel Calviño Sánchez2018-02-281-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to call "setDirectory" again in resize tests; it is enough to simply resize them (and isolates them better to just test the resizing behaviour). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Replace attribute with local variableDaniel Calviño Sánchez2018-02-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "usedWidth" attribute was not used elsewhere outside the "_resize" method, so it was replaced with a local variable. Moreover, it was also renamed to a more suitable name ("availableWidth"). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Set the width of the parent element in breadcrumb testsDaniel Calviño Sánchez2018-02-282-27/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the width of the parent element of the breadcrumbs and then explicitly calling "_resize" is enough to test the resizing behaviour. This makes possible to remove the "setMaxWidth" method and its related code, which was used only for testing purposes. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | Merge pull request #8587 from nextcloud/email-to-new-user-fixRoeland Jago Douma2018-03-012-16/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed email form on new user
| * | | | | | Fixed email form on new userJohn Molakvoæ (skjnldsv)2018-02-282-16/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #8585 from nextcloud/avatar-loading-disable-fixRoeland Jago Douma2018-03-011-3/+8
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Prevent double selection of avatar and loading fix
| * | | | | Prevent double selection of avatar and loading fixJohn Molakvoæ (skjnldsv)2018-02-281-3/+8
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #8298 from ↵Joas Schilling2018-03-012-75/+179
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/e2e-45/fix-activities-for-end2end-encryption Fix activities for e2e encryption
| * | | | | Fix unit testJoas Schilling2018-02-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Catch exception when the parent is deleted as wellJoas Schilling2018-02-281-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Do a recursion instead of an endless loopJoas Schilling2018-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Fix problem with deleted filesJoas Schilling2018-02-281-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Fix path handling for activitiesJoas Schilling2018-02-281-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Add special handling for e2e encryptionJoas Schilling2018-02-281-1/+108
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>