summaryrefslogtreecommitdiffstats
path: root/core/templates
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/owncloud/core/pull/3900Björn Schießle2013-07-052-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit a34098427720c2d0470367cd9698c184d85b8dfd Merge: ccf849b 955646c Author: Björn Schießle <schiessle@owncloud.com> Date: Fri Jul 5 09:59:29 2013 +0200 Merge branch 'master' into theme_aware_mail_footer commit ccf849bc6f18d80cdb593e851529b87579fe072b Merge: 8d5fb70 3c1308f Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jul 4 11:03:47 2013 +0200 Merge branch 'master' into theme_aware_mail_footer commit 8d5fb70e6dcb2e2e34dcdf2a883680ef034afeea Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jul 4 10:38:39 2013 +0200 switch to non-static defaults.php commit 88ab2768dcc4ced12c48872c887baa94ad938d62 Merge: e199df8 84c25f9 Author: Björn Schießle <schiessle@owncloud.com> Date: Wed Jul 3 16:59:48 2013 +0200 Merge branch 'theme_aware_mail_footer' of github.com:owncloud/core into theme_aware_mail_footer Conflicts: core/templates/altmail.php commit e199df844b5faf80a36d8380a5b0b58025cd425f Author: Björn Schießle <schiessle@owncloud.com> Date: Wed Jul 3 16:56:29 2013 +0200 name and slogan should be in one line commit 84c25f9853e1bfbe4ae780371b1353aafb6b15c2 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Mon Jul 1 21:15:35 2013 +0200 no ?> at the end of a file commit 3bd8d38d011f62ce78bcd0c108eb8cf2ce97eb99 Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 12:58:36 2013 +0200 print url unescaped commit d304ed18c8b7350e92e24565b9b9ba77b519d74c Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 12:56:05 2013 +0200 make new mail templates aware of different ownCloud themes
* move to non-static OC_DefaultsBjörn Schießle2013-07-043-9/+9
| | | | | | Conflicts: lib/mail.php
* Add init funtion to OC_Defaults to be able to wrap translatable stringsBjörn Schießle2013-07-043-0/+9
|
* add logo claim to defaults.phpBjörn Schießle2013-07-012-6/+2
|
* construct the foother in defaults.php so that we use always the same footerBjörn Schießle2013-07-011-5/+2
| | | | | | Conflicts: settings/templates/admin.php
* Merge pull request #2914 from Kondou-ger/label_overlapping_valueBart Visscher2013-06-291-1/+1
|\ | | | | Fix textfield label overlapping value.
| * Fix textfield label overlapping value.kondou2013-04-131-1/+1
| |
* | hide the logo claim in case the theme is not loadedJan-Christoph Borchardt2013-06-172-2/+2
| |
* | remove » and « from the text mail because they will be escapedThomas Mueller2013-06-141-1/+1
| |
* | Do no translate "ownCloud - "Stephan Arts2013-06-142-4/+4
| |
* | Use templates to theme share e-mails (#3683)Stephan Arts2013-06-142-0/+42
| |
* | improved footerBjörn Schießle2013-06-131-1/+2
| |
* | add logo-claimBjörn Schießle2013-06-122-1/+6
| |
* | keep all strings in one place to make it easier to change themBjörn Schießle2013-06-123-7/+6
| |
* | make footer aware of ownCloud editionsBjörn Schießle2013-06-121-2/+7
| |
* | mage page title aware of ownCloud editionBjörn Schießle2013-06-123-4/+11
| |
* | Merge pull request #3179 from pawl/patch-1Jörn Friedrich Dreyer2013-05-281-1/+2
|\ \ | | | | | | Improve IE Compatibility
| * | Improve IE CompatibilityPaul Brown2013-04-291-1/+2
| | | | | | | | | Added meta tags from HTML5 Boiler Plate to improve compatibility with IE7+. This fixes the issues with rendering.
* | | Don't set image path in template.Thomas Tanghus2013-05-201-1/+1
| | |
* | | Dialogs: Loose up-button.Thomas Tanghus2013-05-171-1/+0
| | |
* | | Various cleanups in OC.dialogsThomas Tanghus2013-05-171-4/+4
| | |
* | | Port OC.dialogs to use octemplate except for prompt() and form().Thomas Tanghus2013-05-162-0/+14
| | | | | | | | | | | | Also load octemplate per default.
* | | Add requesttoken to guest viewLukas Reschke2013-05-131-1/+1
| | | | | | | | | Should fix #3321
* | | Get config from templateLukas Reschke2013-05-121-1/+1
|/ /
* | Reword sentence and move HTML out of translationLukas Reschke2013-04-291-1/+1
| |
* | Remove uneeded linkLukas Reschke2013-04-241-1/+1
| |
* | Add an update notification on every page for admin usersLukas Reschke2013-04-241-0/+3
| |
* | move password warning more relevant below password field, un-nest log in warningJan-Christoph Borchardt2013-04-171-17/+15
| |
* | Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_betterBart Visscher2013-04-171-0/+1
|\ \ | | | | | | Handle empty datafolder better.
| * | Hint to default data directorykondou2013-04-161-1/+1
| | | | | | | | | | | | | | | | | | not to before submitted data directory. Thanks to bartv2 for the heads up.
| * | Handle empty datafolder better.kondou2013-04-131-0/+1
| |/ | | | | | | | | | | If datafolder is erased, the default value will be shown as a placeholder. If installation is submitted without a datafolder the default value will be used.
* / Implements Toggle for Database Password.raghunayyar2013-04-131-2/+4
|/
* Long Application Names are ellipsis correctly.raghunayyar2013-04-101-1/+3
|
* Show a warning in the installer if the used PHP version is vulnerable to the ↵Lukas Reschke2013-03-201-0/+7
| | | | NULL Byte attack
* Restores keyboard accessibility for expandable settings area.Henning Oschwald2013-03-161-1/+1
| | | | | | Tabindex="0" makes the element focussable with the keyboard and role="link" tells assistive technologies that this clickable span element is supposed to be presented as a hyperlink.
* Don't sanitize error message hintLukas Reschke2013-03-061-1/+1
|
* explicitly add empty placeholder to inputs which use infield labels, fix #2049Jan-Christoph Borchardt2013-03-042-9/+9
|
* add ie css switch to layout templatesJörn Friedrich Dreyer2013-03-033-3/+18
|
* Avoid to display empty DisplayNames for menu and titleBrice Maron2013-03-021-2/+2
|
* Typo...Lukas Reschke2013-02-271-1/+1
|
* Add a missing )Lukas Reschke2013-02-271-1/+1
|
* [core] From echo to pLukas Reschke2013-02-2711-116/+116
|
* Remove uneeded fileLukas Reschke2013-02-271-32/+0
|
* Merge pull request #1902 from owncloud/angularcspFrank Karlitschek2013-02-263-3/+3
|\ | | | | add CSP turned on for angularjs
| * add CSP turned on for angularjsBernhard Posselt2013-02-253-3/+3
| |
* | Merge branch 'master' of github.com:owncloud/core into issue_1776Qingping Hou2013-02-252-5/+17
|\ \ | | | | | | | | | | | | Conflicts: core/templates/layout.user.php
| * \ Merge pull request #1837 from owncloud/fix-user-templateLukas Reschke2013-02-251-1/+1
| |\ \ | | | | | | | | Remove unneeded code for user layout template
| | * | Remove unneeded code for user layout templateBart Visscher2013-02-221-1/+1
| | | |
| * | | Merge branch 'master' into master-sqlserverThomas Mueller2013-02-226-27/+55
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: core/templates/installation.php
| * | | Merge branch 'master' into master-sqlserverThomas Mueller2013-02-182-3/+3
| |\ \ \ | | | |/ | | |/|