Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'develop' of https://github.com/rsanchez/github_addon_in…

…staller into develop
  • Loading branch information...
commit 818864f20f6b872ce13aa367b76b373c6a505da1 2 parents d3f9477 + f43f424
@curtisblackwell authored
View
25 README.markdown
@@ -1,5 +1,9 @@
# GitHub Addon Installer for ExpressionEngine #
+## Warning
+
+This addon is not considered stable, and does not work in many environments. Do NOT use it in a production environment. For experimental usage only.
+
![GitHub Addon Installer Screenshot](http://f.cl.ly/items/0b1z031o2l3g2X221E1Z/Screen%20shot%202011-07-04%20at%2012.09.38%20PM.png)
## Installation
@@ -28,7 +32,8 @@ Manifest entry examples:
If your repo directory structure is like:
- my_addon/
+ -my_addon
+ -pi.my_addon.php
Manifest Entry:
@@ -39,7 +44,7 @@ Manifest Entry:
If your repo directory structure is like:
- pi.my_addon.php
+ -pi.my_addon.php
Manifest Entry:
@@ -51,7 +56,11 @@ Manifest Entry:
If your repo directory structure is like:
- system/expressionengine/third_party/my_addon/
+ -system
+ -expressionengine
+ -third_party
+ -my_addon
+ -pi.my_addon.php
Manifest Entry:
@@ -63,8 +72,14 @@ Manifest Entry:
If your repo directory structure is like:
- ee2/third_party/my_addon/
- themes/third_party/my_addon/
+ -ee2
+ -third_party
+ -my_addon
+ -pi.my_addon.php
+ -themes
+ -third_party
+ -my_addon
+ -my_addon.css
Manifest Entry:
View
41 system/expressionengine/third_party/github_addon_installer/config/manifest.js
@@ -209,28 +209,28 @@
"addon_path": "third_party/"
},
"cp_css_js": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "cp_css_js",
"add_folder": true
},
"matrix_comments": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "matrix_comments",
"add_folder": true
},
"matrix_multi_upload": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "matrix_multi_upload",
"addon_path": "ee2/third_party/",
"theme_path": "themes/third_party/"
},
"matrix_radio_group": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "matrix_radio_group",
"add_folder": true
},
"matrix_url_title": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "matrix_url_title",
"addon_path": "ee2/third_party/",
"theme_path": "themes/third_party/"
@@ -241,7 +241,7 @@
"add_folder": true
},
"numstyle": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "numstyle",
"add_folder": true
},
@@ -251,50 +251,50 @@
"add_folder": true
},
"pt_field_pack": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "pt_field_pack",
"addon_path": "ee2/third_party/"
},
"pt_list": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "pt_list",
"addon_path": "ee2/third_party/",
"theme_path": "themes/third_party/"
},
"pt_pill": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "pt_pill",
"addon_path": "ee2/third_party/",
"theme_path": "themes/third_party/"
},
"pt_switch": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "pt_switch",
"addon_path": "ee2/third_party/",
"theme_path": "themes/third_party/"
},
"wygwam_no_upload_tab": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "wygwam_no_upload_tab",
"add_folder": true
},
"wygwam_structure_pages": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "wygwam_structure_pages",
"addon_path": "ee2/third_party/"
},
"wygwam_super_admin_source": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "wygwam_super_admin_source",
"add_folder": true
},
"wygwam_template_links": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "wygwam_template_links",
"addon_path": "ee2/third_party/"
},
"wygwam_upload_tags": {
- "user": "brandonkelly",
+ "user": "pixelandtonic",
"repo": "wygwam_upload_tags",
"add_folder": true
},
@@ -309,6 +309,12 @@
"addon_path": "system/expressionengine/third_party/",
"theme_path": "themes/third_party"
},
+ "devotee": {
+ "user": "mdesign",
+ "repo": "devot-ee-addon",
+ "addon_path": "system/third_party/",
+ "theme_path": "themes/third_party/"
+ },
"md_detect_page_type": {
"user": "mdesign",
"repo": "md.detect_page_type.ee2_addon",
@@ -320,6 +326,11 @@
"addon_path": "EE2/system/expressionengine/third_party/",
"theme_path": "themes/third_party/"
},
+ "md_character_count": {
+ "user": "mdesign",
+ "repo": "md.character_count.ee_addon",
+ "addon_path": "EE2/system/expressionengine/third_party/"
+ },
"shortn_tweet": {
"user": "mdesign",
"repo": "shortn-tweet.ee_addon",
View
1  ...ngine/third_party/github_addon_installer/language/english/github_addon_installer_lang.php
@@ -26,6 +26,7 @@
'addon_reinstall' => 'Re-install/Update',
'addon_update' => 'Update Available',// %s',
'addon_author' => 'Author',
+ 'addon_branch' => 'Branch',
'addon_github_url' => 'GitHub URL',
'filter_by_status' => 'Filter By Status',
'filter_by_author' => 'Filter By Author',
View
16 system/expressionengine/third_party/github_addon_installer/mcp.github_addon_installer.php
@@ -110,18 +110,21 @@ public function index()
//$install = (in_array($addon, $current_addons)) ? lang('addon_install') : lang('addon_reinstall');
$url = 'https://github.com/'.$params['user'].'/'.$params['repo'];
-
+
if (isset($params['branch']))
{
$url .= '/tree/'.$params['branch'];
}
-
+
+ $branch = isset($params['branch']) ? $params['branch'] : 'master';
+
$vars['addons'][] = array(
'name' => $name,//.$description,
'github_url' => anchor($url, $url, 'rel="external"'),
+ 'branch' => form_input("", $branch, 'class="branch '.$addon.'-branch"'),
'author' => $params['user'],
'status' => $status,
- 'install' => anchor($this->base.AMP.'method=install'.AMP.'addon='.$addon, lang('addon_install'))
+ 'install' => anchor($this->base.AMP.'method=install'.AMP.'addon='.$addon, lang('addon_install'), 'data-addon="'.$addon.'"')
);
}
@@ -142,7 +145,7 @@ public function index()
a.html("'.lang('addon_installing').'");
$.get(
$(this).attr("href"),
- "",
+ {branch: $("."+$(this).data("addon")+"-branch").val()},
function(data){
tds.animate({backgroundColor:originalColor});
a.html(originalText);
@@ -235,6 +238,11 @@ public function install()
$params = $this->manifest[$addon];
$params['name'] = $addon;
+
+ if ($this->EE->input->get('branch'))
+ {
+ $params['branch'] = $this->EE->input->get('branch');
+ }
$this->EE->session->set_flashdata('addon', $addon);
View
2  system/expressionengine/third_party/github_addon_installer/views/index.php
@@ -27,6 +27,7 @@
<tr>
<th class="addon_name"><?=lang('addon_name')?></th>
<th class="addon_github_url"><?=lang('addon_github_url')?></th>
+ <th class="addon_branch"><?=lang('addon_branch')?></th>
<th class="addon_author"><?=lang('addon_author')?></th>
<th class="addon_status"><?=lang('addon_status')?></th>
<th>&nbsp;</th>
@@ -37,6 +38,7 @@
<tr class="<?=alternator('even', 'odd')?>">
<td class="addon_name"><?=element('name', $addon)?></td>
<td class="addon_github_url"><?=element('github_url', $addon)?></td>
+ <td class="addon_branch"><?=element('branch', $addon)?></td>
<td class="addon_author"><?=element('author', $addon)?></td>
<td class="addon_status"><?=element('status', $addon)?></td>
<td class="addon_install"><?=element('install', $addon)?></td>
Please sign in to comment.
Something went wrong with that request. Please try again.