aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12612 from ↵dependabot[bot]2018-11-222-26/+173
|\ | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/@babel/core-7.1.6
| * Bump @babel/core from 7.1.2 to 7.1.6 in /apps/accessibilitydependabot[bot]2018-11-222-26/+173
|/ | | | | | | | Bumps [@babel/core](https://github.com/babel/babel) from 7.1.2 to 7.1.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.1.2...v7.1.6) Signed-off-by: dependabot[bot] <support@dependabot.com>
* Merge pull request #12592 from patrickbaber/masterRoeland Jago Douma2018-11-221-2/+2
|\ | | | | Fix Typo in Original English String and All Translations
| * fix typo in original english string and all translationsPatrick Baber2018-11-221-2/+2
| | | | | | | | Signed-off-by: Patrick Baber <patrick@p-squared.de>
* | Merge pull request #10825 from greenido/fixing-issue-9931Morris Jobke2018-11-221-1/+50
|\ \ | | | | | | Copy a file to the same directory
| * | JSUnit tests are not compatible with let/const yetMorris Jobke2018-11-191-10/+10
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Translate name for "(copy)"Morris Jobke2018-11-191-11/+12
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Per the last comment on having only (copy) for the first oneIdo Green2018-11-191-5/+19
| | | | | | | | | | | | Signed-off-by: Ido Green <greenido@gmail.com>
| * | Use the new naming per the comments on #9931Ido Green2018-11-191-5/+5
| | | | | | | | | | | | | | | | | | More details here: https://github.com/nextcloud/server/issues/9931#issuecomment-402318120 Signed-off-by: Ido Green <greenido@gmail.com>
| * | cleaning after comments on issue 10825Ido Green2018-11-192-5/+0
| | | | | | | | | | | | | | | | | | More: https://github.com/nextcloud/server/pull/10825#issuecomment-415800850 Signed-off-by: Ido Green <greenido@gmail.com>
| * | fixing issue 9931 - copy a file to the same directoryIdo Green2018-11-193-1/+40
| | | | | | | | | | | | | | | Signed-off-by: Ido Green <greenido@gmail.com> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #12581 from nextcloud/version/noid/15.0.0rc1v15.0.0RC1Morris Jobke2018-11-221-2/+2
|\ \ \ | | | | | | | | 15.0.0 RC 1
| * | | 15.0.0 RC 1Morris Jobke2018-11-221-2/+2
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #12554 from nextcloud/bugfix/12493/root-folder-switchMorris Jobke2018-11-222-3/+13
|\ \ \ | | | | | | | | Do not switch to root folder if filelist is already shown
| * | | Do not switch to root folder if filelist is already shownJulius Härtl2018-11-222-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Navigating to the root folder is already handled by OCA.Files.Navigation.setActiveItem in case the view doesn't change. Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #12587 from nextcloud/new-user-clear-fixMorris Jobke2018-11-2212-47/+130
|\ \ \ \ | |/ / / |/| | | Do not clear new user form on failure
| * | | Do not clear new user form on failureJohn Molakvoæ (skjnldsv)2018-11-2212-47/+130
|/ / / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #12589 from nextcloud/fix/twofactor-admin-groups-explanationMorris Jobke2018-11-226-10/+16
|\ \ \ | |_|/ |/| | Add explanatory text to admin twofactor settings
| * | Add explanatory text to admin twofactor settingsChristoph Wurst2018-11-226-10/+16
| | | | | | | | | | | | | | | | | | | | | Ref #12249 Ref https://github.com/nextcloud/documentation/pull/937 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #12571 from ↵Morris Jobke2018-11-223-11/+43
|\ \ \ | | | | | | | | | | | | | | | | TheLastProject/feature/make_connectivity_check_domains_changeable Make connectivity check domains configurable
| * | | Make connectivity check domains configurableSylvia van Os2018-11-223-11/+43
| | | | | | | | | | | | | | | | Signed-off-by: Sylvia van Os <sylvia@hackerchick.me>
* | | | Merge pull request #12580 from nextcloud/app-navigation-menu-dark-fixMorris Jobke2018-11-221-1/+1
|\ \ \ \ | | | | | | | | | | Fix navigation more menu background for dark theme
| * | | | Fix navigation more menu background for dark themeJohn Molakvoæ (skjnldsv)2018-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #12485 from nextcloud/nextcloud-talk-sessions-formatMorris Jobke2018-11-221-4/+10
|\ \ \ \ \ | | | | | | | | | | | | Format Nextcloud Talk clients sessions.
| * | | | | Fix wording of client sessionsJan-Christoph Borchardt2018-11-211-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | Format Nextcloud Talk clients sessions.Ivan Sein2018-11-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ivan Sein <ivan@nextcloud.com>
* | | | | | Merge pull request #12553 from ↵Morris Jobke2018-11-222-34/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/allow-empty-string-in-getAbsoluteURL Allow empty string in get absolute url
| * | | | | | Allow empty strings in getAbsoluteURLJoas Schilling2018-11-202-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Update the URLGenerator test to current state of artJoas Schilling2018-11-201-32/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #12558 from nextcloud/blurry-buttonMorris Jobke2018-11-222-7/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Apply border to primary button if on log in page (and not in a dark container) or if in header
| * | | | | | | Always give primary button a border for light primary colorsJan-Christoph Borchardt2018-11-212-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | | | Apply border to primary button if on log in page (and not in a dark ↵Jan-Christoph Borchardt2018-11-201-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | container) or if in header, fix #12294 Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | | Merge pull request #12559 from nextcloud/heading-menu-spacingMorris Jobke2018-11-221-57/+51
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Better header navigation display
| * | | | | | | | Better header navigation displayJohn Molakvoæ (skjnldsv)2018-11-201-57/+51
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | Merge pull request #12577 from ↵Morris Jobke2018-11-227-11/+204
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-rendering-of-the-sidebar-in-files-app Fix rendering of the sidebar in Files app
| * | | | | | | Fix rendering of the sidebar in Files appDaniel Calviño Sánchez2018-11-222-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a view is rendered it should not be concerned with where it is going to be placed in the document; in general this should be a responsibility of the object using the view. Moreover, when the details view is rendered it should simply prepare a skeleton that includes the root elements provided by the plugins; those elements will be updated by the plugins as needed when a file or a tab is selected. Finally, the details view should not be explicitly rendered. The rendering removes the previous elements, but that is needed only when the details view is in a dirty state, that is, when new plugins were added since the last time that it was rendered. However, that dirty state is internally handled, and the view is automatically rendered again if needed when a file info is set. Due to all that the details view is no longer explicitly rendered when updating it with a different file. Also, as each file list has its own details view, and each details view has its own element, but there can be only one details view/sidebar element in the document, when the file list updates the details view it also replaces the current one in the document with its own details view if needed (that is, if it is not the current one already). Besides that, when the element of a details view is replaced with the element of a different details view the old one should be detached from the document, but never removed. Otherwise the event handlers would not work when that element is attached again later (when changing to a different section in the Files app and then going back to the previous one). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | Add acceptance tests for showing again the input field for tagsDaniel Calviño Sánchez2018-11-221-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | Add acceptance tests for opening and closing again the details viewDaniel Calviño Sánchez2018-11-221-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | Add acceptance tests for marking a file as favorite in the details viewDaniel Calviño Sánchez2018-11-222-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | Add acceptance tests for switching to the comments of another fileDaniel Calviño Sánchez2018-11-222-0/+51
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | | Merge pull request #12468 from nextcloud/multiselect-removal-fixJohn Molakvoæ2018-11-226-480/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Remove conflicting multiselect
| * | | | | | Remove conflicting multiselectJohn Molakvoæ (skjnldsv)2018-11-156-480/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-11-226-0/+30
| | | | | | |
* | | | | | | Merge pull request #12570 from ↵Roeland Jago Douma2018-11-211-0/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | nextcloud/do-not-show-tab-headers-marked-as-hidden Do not show tab headers marked as hidden
| * | | | | | Do not show tab headers marked as hiddenDaniel Calviño Sánchez2018-11-211-0/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tab headers that should not be shown are marked with the "hidden" CSS class. The CSS rules set "display: none" for ".hidden" elements, but as the rules for ".tabHeaders .tabHeader" are more specific than rules for ".hidden" the "display" property is overriden and ends being "flex". Therefore, it is necessary to explicitly set a rule for ".tabHeaders .tabHeader.hidden" elements. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-11-2112-0/+34
| | | | | |
* | | | | | Merge pull request #12531 from nextcloud/bugfix/noid/hide-download-foldersRoeland Jago Douma2018-11-206-42/+66
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Allow to hide download option for folders shared by link
| * | | | | Fix whitespace and file action cleanupJulius Härtl2018-11-203-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Clear link to avoid downloadsRoeland Jago Douma2018-11-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Compile handlebarsRoeland Jago Douma2018-11-201-37/+33
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>