Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump 1.9.x #13

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Bump 1.9.x #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f49ff93
new fork
Oct 31, 2014
64e35f9
bump up a whole 0.x.0
Oct 31, 2014
a310267
Merge branch 'release-0.3.0'
Oct 31, 2014
9e30c7c
fix button style
Oct 31, 2014
0446801
bump
Oct 31, 2014
c63f011
Merge branch 'hotfix-0.3.1' into develop
Oct 31, 2014
efc17da
Fixed merge conflict version number, lead is upstream of course
Nov 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...Adminhtml/System/Config/Fieldset/Hint.php → ...Adminhtml/System/Config/Fieldset/Hint.php
View file
Open in desktop
File renamed without changes.
0 ...inTheme/Block/Adminhtml/Themes/Select.php → ...inTheme/Block/Adminhtml/Themes/Select.php
View file
Open in desktop
File renamed without changes.
0 ...mmunity/Bubble/AdminTheme/Helper/Data.php → ...mmunity/Bubble/AdminTheme/Helper/Data.php
View file
Open in desktop
File renamed without changes.
0 ...e/AdminTheme/Model/Adminhtml/Observer.php → ...e/AdminTheme/Model/Adminhtml/Observer.php
View file
Open in desktop
File renamed without changes.
0 ...Adminhtml/System/Config/Source/Themes.php → ...Adminhtml/System/Config/Source/Themes.php
View file
Open in desktop
File renamed without changes.
0 ...controllers/Adminhtml/ThemeController.php → ...controllers/Adminhtml/ThemeController.php
View file
Open in desktop
File renamed without changes.
0 ...unity/Bubble/AdminTheme/etc/adminhtml.xml → ...unity/Bubble/AdminTheme/etc/adminhtml.xml
View file
Open in desktop
File renamed without changes.
0 ...ommunity/Bubble/AdminTheme/etc/config.xml → ...ommunity/Bubble/AdminTheme/etc/config.xml
View file
Open in desktop
File renamed without changes.
0 ...ommunity/Bubble/AdminTheme/etc/system.xml → ...ommunity/Bubble/AdminTheme/etc/system.xml
View file
Open in desktop
File renamed without changes.
0 ...base/default/layout/bubble/admintheme.xml → ...ault/default/layout/bubble/admintheme.xml
View file
Open in desktop
File renamed without changes.
0 ...plate/bubble/admintheme/page/footer.phtml → ...plate/bubble/admintheme/page/footer.phtml
View file
Open in desktop
File renamed without changes.
0 ...intheme/system/config/fieldset/hint.phtml → ...intheme/system/config/fieldset/hint.phtml
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions bubble/app/design/adminhtml/default/go/etc/theme.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0"?>
<theme>
<parent>default/go</package>
</theme>
4 changes: 2 additions & 2 deletions ...ign/adminhtml/default/go/layout/local.xml → ...ign/adminhtml/default/go/layout/local.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<action method="removeItem"><type>js</type><name>mage/adminhtml/sales.js</name></action>
<action method="addItem"><type>skin_js</type><script>js/sales.js</script></action>
<action method="removeItem"><type>js_css</type><name>calendar/calendar-win2k-1.css</name></action>
<action method="addItem"><type>skin_css</type><name>calendar.css</name><params/></action>
<action method="addItem"><type>skin_css</type><name>css/calendar.css</name><params/></action>
</reference>
<reference name="footer">
<action method="setTemplate">
Expand All @@ -14,4 +14,4 @@
</action>
</reference>
</default>
</layout>
</layout>
0 .../default/go/template/backup/dialogs.phtml → .../default/go/template/backup/dialogs.phtml
View file
Open in desktop
File renamed without changes.
0 ...te/catalog/product/edit/price/group.phtml → ...te/catalog/product/edit/price/group.phtml
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions .../default/go/template/forgotpassword.phtml → .../default/go/template/forgotpassword.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo Mage::helper('adminhtml')->__('Log into Magento Admin Page'); ?></title>
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('reset.css'); ?>" media="all" />
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('boxes.css'); ?>" media="all" />
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('css/reset.css'); ?>" media="all" />
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('css/boxes.css'); ?>" media="all" />
<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico'); ?>" type="image/x-icon" />
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico'); ?>" type="image/x-icon" />

<script type="text/javascript" src="<?php echo $this->getJsUrl(); ?>index.php/x.js?f=prototype/prototype.js,prototype/validation.js,mage/adminhtml/events.js,mage/adminhtml/form.js,scriptaculous/effects.js"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>

<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css'); ?>" type="text/css" media="all" /> <![endif]-->
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
<!--[if IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('css/iestyles.css'); ?>" type="text/css" media="all" /> <![endif]-->
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('css/below_ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
<!--[if IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('css/ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->
</head>
<body id="page-login">
<div class="login-container">
Expand Down
10 changes: 5 additions & 5 deletions ...adminhtml/default/go/template/login.phtml → ...adminhtml/default/go/template/login.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo Mage::helper('adminhtml')->__('Log into Magento Admin Page') ?></title>
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('reset.css') ?>" media="all" />
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('boxes.css') ?>" media="all" />
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('css/reset.css') ?>" media="all" />
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('css/boxes.css') ?>" media="all" />
<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />

Expand All @@ -40,9 +40,9 @@
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/adminhtml/form.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('mage/captcha.js') ?>"></script>

<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css') ?>" type="text/css" media="all" /> <![endif]-->
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css') ?>" type="text/css" media="all" /> <![endif]-->
<!--[if IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('ie7.css') ?>" type="text/css" media="all" /> <![endif]-->
<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('css/iestyles.css') ?>" type="text/css" media="all" /> <![endif]-->
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('css/below_ie7.css') ?>" type="text/css" media="all" /> <![endif]-->
<!--[if IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('css/ie7.css') ?>" type="text/css" media="all" /> <![endif]-->
</head>
<body id="page-login" onload="document.forms.loginForm.username.focus();">
<div class="login-container">
Expand Down
0 .../adminhtml/default/go/template/page.phtml → .../adminhtml/default/go/template/page.phtml
View file
Open in desktop
File renamed without changes.
0 ...tml/default/go/template/page/footer.phtml → ...tml/default/go/template/page/footer.phtml
View file
Open in desktop
File renamed without changes.
0 ...nhtml/default/go/template/page/menu.phtml → ...nhtml/default/go/template/page/menu.phtml
View file
Open in desktop
File renamed without changes.
0 app/etc/modules/Bubble_AdminTheme.xml → bubble/app/etc/modules/Bubble_AdminTheme.xml
View file
Open in desktop
File renamed without changes.
0 app/locale/fr_FR/Bubble_AdminTheme.csv → ...le/app/locale/fr_FR/Bubble_AdminTheme.csv
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions bubble/skin/adminhtml/default/go/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.sass-cache/

0 skin/adminhtml/default/go/below_ie7.css → ...e/skin/adminhtml/default/go/below_ie7.css
View file
Open in desktop
File renamed without changes.
Loading