summaryrefslogtreecommitdiffstats
path: root/core/templates
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4339 from owncloud/mimetype-defaultsThomas Müller2013-08-171-0/+9
|\ | | | | Add the option to provide templates for newly created files
| * Merge branch 'master' into mimetype-defaultsThomas Müller2013-08-161-0/+13
| |\ | | | | | | | | | | | | Conflicts: apps/files/ajax/newfile.php
| * | add template for html filesRobin Appelman2013-08-071-0/+9
| | |
* | | change font on login/install page from black to whiteMorris Jobke2013-08-171-1/+1
| | |
* | | tixing width and position of wider error messagesThomas Müller2013-08-161-1/+1
| | |
* | | merge master into css-fixesJan-Christoph Borchardt2013-08-162-6/+23
|\ \ \ | | |/ | |/|
| * | show 'More apps' link to app administration directly in app navigationJan-Christoph Borchardt2013-08-071-0/+13
| |/
| * Allow apps to have own 404 content, closes #3225Victor Dubiniuk2013-07-291-6/+10
| |
* | remove unused and never to be used paginationJan-Christoph Borchardt2013-07-311-22/+0
|/
* show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary ↵Jörn Friedrich Dreyer2013-07-241-15/+15
| | | | js & html ids
* merge masterJan-Christoph Borchardt2013-07-247-28/+22
|\
| * Merge pull request #4175 from owncloud/remember-checkedJan-Christoph Borchardt2013-07-241-2/+2
| |\ | | | | | | check remember log in by default, ref #3918
| | * check remember log in by default, ref #3918Jan-Christoph Borchardt2013-07-241-2/+2
| | |
| * | use OC_Defaults directly from the templateBjörn Schießle2013-07-241-2/+2
| | |
| * | initialize OC_Defaults in template constructorXBjörn Schießle2013-07-245-23/+14
| |/
| * use themable strings for installationJan-Christoph Borchardt2013-07-111-2/+5
| |
| * introduce shortname themable string and split from title, use for image alt textJan-Christoph Borchardt2013-07-114-8/+8
| |
* | sticky footerJan-Christoph Borchardt2013-07-231-5/+9
| |
* | input field adjustments for new full-color background on log inJan-Christoph Borchardt2013-07-231-1/+2
| |
* | rip out unneeded #login div, replace with existing body-loginJan-Christoph Borchardt2013-07-231-7/+7
|/
* 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.