summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-03-12288-444/+514
|
* Merge pull request #8633 from nextcloud/rakekniven-i18n-fixMorris Jobke2018-03-114-4/+11
|\ | | | | Improved translation strings
| * Use variable for proper translationsRoeland Jago Douma2018-03-101-1/+8
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Update ThemingControllerTest.phprakekniven2018-03-101-1/+1
| | | | | | Fixed tests for https://github.com/nextcloud/server/pull/8633
| * Update wizardTabElementary.jsrakekniven2018-03-101-1/+1
| | | | | | | | Fixed grammar. Reported at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/91002422?issue=yes
| * Update settings.jsrakekniven2018-03-101-1/+1
| | | | | | | | Added question mark. Reported at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/120539223?issue=yes
| * Update ThemingController.phprakekniven2018-03-101-1/+1
| | | | | | | | Improved translation string. Reported at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/121491256?issue=yes
* | [tx-robot] updated from transifexNextcloud bot2018-03-1118-0/+50
|/
* [tx-robot] updated from transifexNextcloud bot2018-03-1028-64/+154
|
* Merge pull request #8731 from nextcloud/acceptance-header-testsMorris Jobke2018-03-097-10/+248
|\ | | | | Header acceptance features
| * Header acceptance featuresJohn Molakvoæ (skjnldsv)2018-03-097-10/+248
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #8757 from nextcloud/search_controllerMorris Jobke2018-03-095-65/+56
|\ \ | | | | | | Move search to proper Controller
| * | Update autoloaderRoeland Jago Douma2018-03-092-0/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move search to proper ControllerRoeland Jago Douma2018-03-093-65/+54
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-03-09148-474/+276
| |/ |/|
* | Merge pull request #8747 from nextcloud/bugfix/noid/apps-are-updatedRoeland Jago Douma2018-03-091-4/+4
|\ \ | | | | | | Revert wording back to updates
| * | Revert wording back to updatesJoas Schilling2018-03-091-4/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #8710 from nextcloud/followup/8596/tests-for-user-paginationblizzz2018-03-092-19/+116
|\ \ \ | | | | | | | | Tests for email collaborators pagination
| * | | Fix calculation if there are more resultsJoas Schilling2018-03-082-20/+24
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add tests for finding own email and user results paginationJoas Schilling2018-03-081-1/+94
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #8594 from ↵Morris Jobke2018-03-099-299/+638
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/add-acceptance-tests-for-permissions-on-public-shared-folders Add acceptance tests for permissions on public shared folders
| * | | | Add acceptance tests for creation of subfolders in public shared foldersDaniel Calviño Sánchez2018-03-093-0/+121
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Extract common "wait for" functions to a helper classDaniel Calviño Sánchez2018-03-093-46/+86
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Generalize file list steps so a specific ancestor can be usedDaniel Calviño Sánchez2018-03-094-3/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "FileListContext" provides steps to interact with and check the behaviour of a file list. However, the "FileListContext" does not know the right file list ancestor that has to be used by the file list steps, so until now the file list steps were explicitly wired to the Files app and they could be used only in that case. Instead of duplicating the steps with a slightly different name (for example, "I create a new folder named :folderName in the public shared folder" instead of "I create a new folder named :folderName") the steps were generalized; now contexts that "know" that certain file list ancestor has to be used by the FileListContext steps performed by certain actor from that point on (until changed again) set it explicitly. For example, when the current page is the Files app then the ancestor of the file list is the main view of the current section of the Files app, but when the current page is a shared link then the ancestor is set to null (because there will be just one file list, and thus its ancestor is not relevant to differentiate between instances) A helper trait, "FileListAncestorSetter", was introduced to reduce the boilerplate needed to set the file list ancestor from other contexts. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Generalize file list locators so a specific ancestor can be usedDaniel Calviño Sánchez2018-03-092-54/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file list is used in other places besides the Files app (for example, the File sharing app); in those cases the locators for the file list elements are the same, but not for the ancestor of the file list. To make possible to reuse the file list locators in those cases too now they receive the ancestor to use. Note that the locators for the file actions menu were not using an ancestor locator because it is expected that there is only one file actions menu at a time in the whole page; that may change in the future, but for the time being it is a valid assumption and thus the ancestor was not added to those locators in this commit. Although the locators were generalized the steps themselves still use the "FilesAppContext::currentSectionMainView" locator as ancestor; the steps will be generalized in a following commit. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Store the name of the actor in the Actor objectDaniel Calviño Sánchez2018-03-092-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to be able to easily use the actor as a key in an array. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Extract file list locators and steps to its own classDaniel Calviño Sánchez2018-03-093-250/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Besides the extraction some minor adjustments (sorting locators for file action menu entries to reflect the order of the menu entries in the UI, moving parametrized locators like "createMenuItemFor" above the locators that use them and placing "descendantOf" calls always in a new line) were made too. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #8112 from nextcloud/fix-integer-overflowMorris Jobke2018-03-091-1/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix integer overflow in ChunkingPlugin
| * | | | | Fix integer overflow in ChunkingPluginMorris Jobke2018-03-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids errors when the size exceeds MAX_INT because of the cast to int. Better cast it to float to avoid this. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #8742 from nextcloud/strict_appJoas Schilling2018-03-092-10/+13
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | OCP\AppFramework\App strict
| * | | | | OCP\AppFramework\App strictRoeland Jago Douma2018-03-092-10/+13
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #8736 from nextcloud/rakekniven-patch-1Joas Schilling2018-03-091-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Update login.php
| * | | | Update login.phprakekniven2018-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | Fixed grammar issue. Reported at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#af/$/124614533?issue=yes
* | | | | Merge pull request #8741 from nextcloud/fix_autoloaderRoeland Jago Douma2018-03-092-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Fix autoloader
| * | | | Fix autoloaderRoeland Jago Douma2018-03-092-0/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2018-03-09148-172/+316
| | | |
* | | | Merge pull request #8648 from nextcloud/feature/csrf-token-controllerRoeland Jago Douma2018-03-085-32/+157
|\ \ \ \ | | | | | | | | | | Use session heartbeat to update CSRF token
| * | | | Add CSRF token controller to retrieve the current CSRF tokenChristoph Wurst2018-03-085-32/+157
| |/ / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #8716 from nextcloud/fix-cache-prefixingRoeland Jago Douma2018-03-0810-36/+63
|\ \ \ \ | | | | | | | | | | Remove base url from global cache prefix
| * | | | Use cache prefix for theming as wellJulius Härtl2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix tests to use ICacheFactoryJulius Härtl2018-03-076-17/+40
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Actually clear cache values for all base urlsJulius Härtl2018-03-073-10/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Use JSCombiner from server container when searching for JS filesJulius Härtl2018-03-071-7/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Move base url from global cache prefix to frontend related onesJulius Härtl2018-03-072-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #8575 from nextcloud/new-folder-buttonRoeland Jago Douma2018-03-0811-101/+176
|\ \ \ \ \ | | | | | | | | | | | | Updated popover rules to allow form inputs and added input submit for…
| * | | | | Fixed jsunitJohn Molakvoæ (skjnldsv)2018-03-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fixed event propagation on safariJohn Molakvoæ (skjnldsv)2018-03-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Use label for better focus on external shareJohn Molakvoæ (skjnldsv)2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Align radio & checkboxesJohn Molakvoæ (skjnldsv)2018-03-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fixed ext share style and use varable for popover heightJohn Molakvoæ (skjnldsv)2018-03-075-29/+48
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>