Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/owncloud/core/pull/3900 | Björn Schießle | 2013-07-05 | 2 | -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_Defaults | Björn Schießle | 2013-07-04 | 3 | -9/+9 |
| | | | | | | Conflicts: lib/mail.php | ||||
* | Add init funtion to OC_Defaults to be able to wrap translatable strings | Björn Schießle | 2013-07-04 | 3 | -0/+9 |
| | |||||
* | add logo claim to defaults.php | Björn Schießle | 2013-07-01 | 2 | -6/+2 |
| | |||||
* | construct the foother in defaults.php so that we use always the same footer | Björn Schießle | 2013-07-01 | 1 | -5/+2 |
| | | | | | | Conflicts: settings/templates/admin.php | ||||
* | Merge pull request #2914 from Kondou-ger/label_overlapping_value | Bart Visscher | 2013-06-29 | 1 | -1/+1 |
|\ | | | | | Fix textfield label overlapping value. | ||||
| * | Fix textfield label overlapping value. | kondou | 2013-04-13 | 1 | -1/+1 |
| | | |||||
* | | hide the logo claim in case the theme is not loaded | Jan-Christoph Borchardt | 2013-06-17 | 2 | -2/+2 |
| | | |||||
* | | remove » and « from the text mail because they will be escaped | Thomas Mueller | 2013-06-14 | 1 | -1/+1 |
| | | |||||
* | | Do no translate "ownCloud - " | Stephan Arts | 2013-06-14 | 2 | -4/+4 |
| | | |||||
* | | Use templates to theme share e-mails (#3683) | Stephan Arts | 2013-06-14 | 2 | -0/+42 |
| | | |||||
* | | improved footer | Björn Schießle | 2013-06-13 | 1 | -1/+2 |
| | | |||||
* | | add logo-claim | Björn Schießle | 2013-06-12 | 2 | -1/+6 |
| | | |||||
* | | keep all strings in one place to make it easier to change them | Björn Schießle | 2013-06-12 | 3 | -7/+6 |
| | | |||||
* | | make footer aware of ownCloud editions | Björn Schießle | 2013-06-12 | 1 | -2/+7 |
| | | |||||
* | | mage page title aware of ownCloud edition | Björn Schießle | 2013-06-12 | 3 | -4/+11 |
| | | |||||
* | | Merge pull request #3179 from pawl/patch-1 | Jörn Friedrich Dreyer | 2013-05-28 | 1 | -1/+2 |
|\ \ | | | | | | | Improve IE Compatibility | ||||
| * | | Improve IE Compatibility | Paul Brown | 2013-04-29 | 1 | -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 Tanghus | 2013-05-20 | 1 | -1/+1 |
| | | | |||||
* | | | Dialogs: Loose up-button. | Thomas Tanghus | 2013-05-17 | 1 | -1/+0 |
| | | | |||||
* | | | Various cleanups in OC.dialogs | Thomas Tanghus | 2013-05-17 | 1 | -4/+4 |
| | | | |||||
* | | | Port OC.dialogs to use octemplate except for prompt() and form(). | Thomas Tanghus | 2013-05-16 | 2 | -0/+14 |
| | | | | | | | | | | | | Also load octemplate per default. | ||||
* | | | Add requesttoken to guest view | Lukas Reschke | 2013-05-13 | 1 | -1/+1 |
| | | | | | | | | | Should fix #3321 | ||||
* | | | Get config from template | Lukas Reschke | 2013-05-12 | 1 | -1/+1 |
|/ / | |||||
* | | Reword sentence and move HTML out of translation | Lukas Reschke | 2013-04-29 | 1 | -1/+1 |
| | | |||||
* | | Remove uneeded link | Lukas Reschke | 2013-04-24 | 1 | -1/+1 |
| | | |||||
* | | Add an update notification on every page for admin users | Lukas Reschke | 2013-04-24 | 1 | -0/+3 |
| | | |||||
* | | move password warning more relevant below password field, un-nest log in warning | Jan-Christoph Borchardt | 2013-04-17 | 1 | -17/+15 |
| | | |||||
* | | Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better | Bart Visscher | 2013-04-17 | 1 | -0/+1 |
|\ \ | | | | | | | Handle empty datafolder better. | ||||
| * | | Hint to default data directory | kondou | 2013-04-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | not to before submitted data directory. Thanks to bartv2 for the heads up. | ||||
| * | | Handle empty datafolder better. | kondou | 2013-04-13 | 1 | -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. | raghunayyar | 2013-04-13 | 1 | -2/+4 |
|/ | |||||
* | Long Application Names are ellipsis correctly. | raghunayyar | 2013-04-10 | 1 | -1/+3 |
| | |||||
* | Show a warning in the installer if the used PHP version is vulnerable to the ↵ | Lukas Reschke | 2013-03-20 | 1 | -0/+7 |
| | | | | NULL Byte attack | ||||
* | Restores keyboard accessibility for expandable settings area. | Henning Oschwald | 2013-03-16 | 1 | -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 hint | Lukas Reschke | 2013-03-06 | 1 | -1/+1 |
| | |||||
* | explicitly add empty placeholder to inputs which use infield labels, fix #2049 | Jan-Christoph Borchardt | 2013-03-04 | 2 | -9/+9 |
| | |||||
* | add ie css switch to layout templates | Jörn Friedrich Dreyer | 2013-03-03 | 3 | -3/+18 |
| | |||||
* | Avoid to display empty DisplayNames for menu and title | Brice Maron | 2013-03-02 | 1 | -2/+2 |
| | |||||
* | Typo... | Lukas Reschke | 2013-02-27 | 1 | -1/+1 |
| | |||||
* | Add a missing ) | Lukas Reschke | 2013-02-27 | 1 | -1/+1 |
| | |||||
* | [core] From echo to p | Lukas Reschke | 2013-02-27 | 11 | -116/+116 |
| | |||||
* | Remove uneeded file | Lukas Reschke | 2013-02-27 | 1 | -32/+0 |
| | |||||
* | Merge pull request #1902 from owncloud/angularcsp | Frank Karlitschek | 2013-02-26 | 3 | -3/+3 |
|\ | | | | | add CSP turned on for angularjs | ||||
| * | add CSP turned on for angularjs | Bernhard Posselt | 2013-02-25 | 3 | -3/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:owncloud/core into issue_1776 | Qingping Hou | 2013-02-25 | 2 | -5/+17 |
|\ \ | | | | | | | | | | | | | Conflicts: core/templates/layout.user.php | ||||
| * \ | Merge pull request #1837 from owncloud/fix-user-template | Lukas Reschke | 2013-02-25 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Remove unneeded code for user layout template | ||||
| | * | | Remove unneeded code for user layout template | Bart Visscher | 2013-02-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-22 | 6 | -27/+55 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: core/templates/installation.php | ||||
| * | | | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-18 | 2 | -3/+3 |
| |\ \ \ | | | |/ | | |/| |