summaryrefslogtreecommitdiffstats
path: root/core/templates
Commit message (Collapse)AuthorAgeFilesLines
* Remove quotes around device nameMorris Jobke2017-08-141-1/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Highlight client identifier in auth grant pageMorris Jobke2017-08-141-1/+4
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Add heading to account access pageJan-Christoph Borchardt2017-08-121-0/+1
| | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* Merge pull request #5972 from ↵Morris Jobke2017-08-081-1/+4
|\ | | | | | | | | 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/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"Joas Schilling2017-08-031-3/+1
|/
* Logo claim is not used anymoreMorris Jobke2017-08-021-1/+0
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Replace `include` with `file_get_contents`Marin Treselj2017-08-021-1/+1
| | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* Proof of concept #5593 - inline SVG icon for icon-contactsMarin Treselj2017-08-021-1/+3
| | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* Merge pull request #5920 from nextcloud/gallery-share-view-fixMorris Jobke2017-08-021-2/+2
|\ | | | | Top bar buttons in share view are wrong positioned
| * Fixes nextcloud/gallery#269Marin Treselj2017-07-281-2/+2
| | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | Fix 403 and 404 redirectMorris Jobke2017-07-262-8/+8
|/ | | | | | | | * Nextcloud is not properly loaded in the standalone version (especially the theming) * it is already not listed anymore in the Nginx config (see nextcloud/documentation#392) * the index.php-free version doesn't support this Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #5520 from nextcloud/disable-click-on-hintMorris Jobke2017-07-051-2/+2
|\ | | | | [Small] Hint should not be clickable
| * Hint should not be clickableMaxence Lange2017-06-231-2/+2
| | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | Simplified Nextcloud logo iconMarin Treselj2017-07-021-1/+1
|/ | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* Merge pull request #4993 from michaelletzgus/emit_css-tagsMorris Jobke2017-06-143-18/+3
|\ | | | | Emit css tags
| * Streamline templates, more DRYMichael Letzgus2017-05-253-18/+3
| | | | | | | | | | | | | | | | Use Unified function to emit <link> tags for css loading, obey "Don't Repeat Yourself" ;-) (Next step might by to combine this with the emit <script> function (even more DRY?) AND move all this to a better place?) Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
* | Use the guest.css for the maintenance page as wellMorris Jobke2017-06-131-10/+0
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #4854 from michaelletzgus/deferred-script-loading-v2Morris Jobke2017-05-203-24/+3
|\ | | | | Make page loading faster, deferred script loading, now switchable:
| * Make page loading faster by deferred script loading:Michael Letzgus2017-05-203-24/+3
| | | | | | | | | | | | | | | | * Create generalized function for emmitting <script defer src=""> tags to templates * Remove type attribute from inline_js * Add defer attribute to external <script> tags Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
* | remove 'Alternative login using app token' in case of oauth loginBjoern Schiessle2017-05-181-0/+2
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Add basic implementation for OAuth 2.0 Authorization Code FlowLukas Reschke2017-05-182-1/+3
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Allow to enforce update via web UIMorris Jobke2017-05-111-0/+9
|/ | | | | | | | * adds a disclaimer that an update via web UI is on own risk * allows to skip the warning * fixes #4353 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Properly decide on actual users if instance is too bigMorris Jobke2017-05-101-1/+1
| | | | | | * state the reason why NC thinks it is a big instance Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Check if Nextcloud is installedLukas Reschke2017-05-081-1/+2
| | | | | | Fixes https://github.com/nextcloud/server/issues/4735 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #4632 from nextcloud/login-logo-ratioLukas Reschke2017-05-081-0/+3
|\ | | | | show non landscape logos bigger on the login page
| * smaller max logo sizes and cleaner codeRobin Appelman2017-05-021-1/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * show non landscape icons bigger on the login pageRobin Appelman2017-05-011-0/+3
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Prevent flashing of apps and user menuJan-Christoph Borchardt2017-04-291-2/+2
|/ | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* Merge branch 'master' into contactsmenuJan-Christoph Borchardt2017-04-262-0/+94
|\ | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Fix auth flow background color and redirect view layoutJan-Christoph Borchardt2017-04-251-1/+4
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Correctly case the stateTokenRoeland Jago Douma2017-04-251-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add new auth flowLukas Reschke2017-04-252-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the basics for the new app-password based authentication flow for our clients. The current implementation tries to keep it as simple as possible and works the following way: 1. Unauthenticated client opens `/index.php/login/flow` 2. User will be asked whether they want to grant access to the client 3. If accepted the user has the chance to do so using existing App Token or automatically generate an app password. If the user chooses to use an existing app token then that one will simply be redirected to the `nc://` protocol handler. While we can improve on that in the future, I think keeping this smaller at the moment has its advantages. Also, in the near future we have to think about an automatic migration endpoint so there's that anyways :-) If the user chooses to use the regular login the following happens: 1. A session state token is written to the session 2. User is redirected to the login page 3. If successfully authenticated they will be redirected to a page redirecting to the POST controller 4. The POST controller will check if the CSRF token as well as the state token is correct, if yes the user will be redirected to the `nc://` protocol handler. This approach is quite simple but also allows to be extended in the future. One could for example allow external websites to consume this authentication endpoint as well. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Contacts menuChristoph Wurst2017-04-251-0/+5
|/ | | | | | | * load list of contacts from the server * show last message of each contact Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Responsive app menuJulius Härtl2017-04-251-33/+30
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Update email template for lost password emailMorris Jobke2017-04-121-21/+0
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Removes unused code for link share emailsMorris Jobke2017-04-112-51/+0
| | | | | | | * now handled by sharebymail app * see https://github.com/nextcloud/server/pull/657 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #4256 from nextcloud/themingLukas Reschke2017-04-111-1/+1
|\ | | | | Move OC_Defaults to OCP\Defaults
| * Move OC_Defaults to OCP\DefaultsMorris Jobke2017-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | * currently there are two ways to access default values: OCP\Defaults or OC_Defaults (which is extended by OCA\Theming\ThemingDefaults) * our code used a mixture of both of them, which made it hard to work on theme values * this extended the public interface with the missing methods and uses them everywhere to only rely on the public interface Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #2618 from nextcloud/2fa-challenge-textLukas Reschke2017-04-112-21/+25
|\ \ | |/ |/| Move log out and backup codes link into 2fa box for better readability
| * Use button instead of simple linksChristoph Wurst2017-03-062-6/+4
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Move log out and back codes link into 2fa box for better readabilityChristoph Wurst2017-03-062-21/+27
| | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/2538 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | rename confusing getMailHeaderColor to getColorPrimary, ref #3491Jan-Christoph Borchardt2017-03-294-7/+7
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-pJoas Schilling2017-03-291-1/+1
|\ \ | | | | | | Replace unecessary unescaped prints with print
| * | Replace unecessary unescaped prints with printLukas Reschke2017-03-291-1/+1
| | | | | | | | | | | | | | | | | | There's no need to have those unescaped from what I can see. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Web app manifestPierre Rudloff2017-03-281-0/+1
|/ / | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Moving the inline js before the CSSRoeland Jago Douma2017-03-283-15/+15
| | | | | | | | | | | | This allows browsers to do smarted parallel downloads Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | use theming colors for favicon on macOSJan-Christoph Borchardt2017-03-273-3/+3
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #4077 from nextcloud/better-navigation-managementMorris Jobke2017-03-261-37/+1
|\ \ | | | | | | Register the app management in the normal way
| * | Manage the right side menu via the navigation manager as wellJoas Schilling2017-03-261-6/+0
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>