Skip to content

Commit

Permalink
Merge branch 'release/1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
therouv committed Oct 27, 2014
2 parents 4d0f718 + 9ddde40 commit 1b6fa18
Show file tree
Hide file tree
Showing 242 changed files with 529 additions and 362 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<h1>Source of FireGento_AdminMonitoring</h1>
<p>
This project consists of 54 directories, containing
a total of 62 files.
a total of 63 files.
</p>
<ul class="path">
<li>
Expand Down Expand Up @@ -109,7 +109,7 @@
</td>
<td>1.9 KB
</td>
<td>2014-10-26T15:31:53+01:00</td>
<td>2014-10-26T15:34:44+01:00</td>
</tr>
<tr>
<td colspan="3">
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<h1>Source of FireGento_AdminMonitoring</h1>
<p>
This project consists of 54 directories, containing
a total of 62 files.
a total of 63 files.
</p>
<ul class="path">
<li>
Expand Down Expand Up @@ -109,7 +109,7 @@
</td>
<td>6.0 KB
</td>
<td>2014-10-26T15:31:53+01:00</td>
<td>2014-10-26T15:34:44+01:00</td>
</tr>
<tr>
<td colspan="3">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<h1>Source of FireGento_AdminMonitoring</h1>
<p>
This project consists of 54 directories, containing
a total of 62 files.
a total of 63 files.
</p>
<ul class="path">
<li>
Expand Down Expand Up @@ -112,7 +112,7 @@
</td>
<td>6.1 KB
</td>
<td>2014-10-26T15:31:53+01:00</td>
<td>2014-10-26T15:34:44+01:00</td>
</tr>
<tr>
<td>
Expand All @@ -129,7 +129,7 @@
</td>
<td>2.7 KB
</td>
<td>2014-10-26T15:31:53+01:00</td>
<td>2014-10-26T15:34:44+01:00</td>
</tr>
<tr>
<td colspan="3">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<h1>Source of FireGento_AdminMonitoring</h1>
<p>
This project consists of 54 directories, containing
a total of 62 files.
a total of 63 files.
</p>
<ul class="path">
<li>
Expand Down Expand Up @@ -106,7 +106,7 @@
</td>
<td>1.4 KB
</td>
<td>2014-10-26T15:31:53+01:00</td>
<td>2014-10-26T15:34:44+01:00</td>
</tr>
<tr>
<td colspan="3">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<h1>Source of FireGento_AdminMonitoring</h1>
<p>
This project consists of 54 directories, containing
a total of 62 files.
a total of 63 files.
</p>
<ul class="path">
<li>
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<h1>Source of FireGento_AdminMonitoring</h1>
<p>
This project consists of 54 directories, containing
a total of 62 files.
a total of 63 files.
</p>
<ul class="path">
<li>
Expand Down Expand Up @@ -91,7 +91,7 @@
</td>
<td>3.8 KB
</td>
<td>2014-10-26T15:31:53+01:00</td>
<td>2014-10-26T15:34:44+01:00</td>
</tr>
<tr>
<td colspan="3">
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<h1>Source of FireGento_AdminMonitoring</h1>
<p>
This project consists of 54 directories, containing
a total of 62 files.
a total of 63 files.
</p>
<ul class="path">
<li>
Expand Down Expand Up @@ -97,15 +97,15 @@
</td>
<td>3.1 KB
</td>
<td>2014-10-26T15:31:53+01:00</td>
<td>2014-10-26T15:34:44+01:00</td>
</tr>
<tr>
<td>
<a href="Diff.php.xhtml">Diff.php</a>
</td>
<td>2.6 KB
</td>
<td>2014-10-26T15:31:53+01:00</td>
<td>2014-10-26T15:34:44+01:00</td>
</tr>
<tr>
<td colspan="3">
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0"?>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><title>phpDox - Source of Delete.php</title><link rel="stylesheet" type="text/css" href="../../../../../../../../../css/style.css" media="screen"/><link rel="stylesheet" href="../../../../../../../../../css/source.css"/><meta http-equiv="content-type" content="text/html; charset=utf-8"/></head><body><nav class="topnav"><ul><li><div class="logo"><span>/**</span>phpDox</div></li><li class="separator"><a href="../../../../../../../../../index.xhtml">Overview</a></li><li class="separator"><a href="../../../../../../../../../namespaces.xhtml">Namespaces</a></li><li><a href="../../../../../../../../../classes.xhtml">Classes</a></li><li class="separator"><a href="../../../../../../../../../source/index.xhtml">Source</a></li></ul></nav><div id="mainstage"><div class="box"><ul class="breadcrumb"><li><a href="../../../../../../../../../index.xhtml">Overview</a></li><li class="separator"><a href="../../../../../../../../../source/index.xhtml">Source</a></li></ul></div><h1>Source of file Delete.php</h1><p>
Size: 1,293 Bytes - Last Modified: 2014-10-26T15:31:53+01:00</p><section><h2><small>/Users/rouven/Sites/firegento/.modman/firegento-adminmonitoring/src/app/code/community/FireGento/AdminMonitoring/Model/Observer/Model/</small>Delete.php</h2><table class="source"><tr><td class="no"><a class="anker" href="#line1">1</a><a class="anker" href="#line2">2</a><a class="anker" href="#line3">3</a><a class="anker" href="#line4">4</a><a class="anker" href="#line5">5</a><a class="anker" href="#line6">6</a><a class="anker" href="#line7">7</a><a class="anker" href="#line8">8</a><a class="anker" href="#line9">9</a><a class="anker" href="#line10">10</a><a class="anker" href="#line11">11</a><a class="anker" href="#line12">12</a><a class="anker" href="#line13">13</a><a class="anker" href="#line14">14</a><a class="anker" href="#line15">15</a><a class="anker" href="#line16">16</a><a class="anker" href="#line17">17</a><a class="anker" href="#line18">18</a><a class="anker" href="#line19">19</a><a class="anker" href="#line20">20</a><a class="anker" href="#line21">21</a><a class="anker" href="#line22">22</a><a class="anker" href="#line23">23</a><a class="anker" href="#line24">24</a><a class="anker" href="#line25">25</a><a class="anker" href="#line26">26</a><a class="anker" href="#line27">27</a><a class="anker" href="#line28">28</a><a class="anker" href="#line29">29</a><a class="anker" href="#line30">30</a><a class="anker" href="#line31">31</a><a class="anker" href="#line32">32</a><a class="anker" href="#line33">33</a><a class="anker" href="#line34">34</a><a class="anker" href="#line35">35</a><a class="anker" href="#line36">36</a><a class="anker" href="#line37">37</a><a class="anker" href="#line38">38</a><a class="anker" href="#line39">39</a><a class="anker" href="#line40">40</a><a class="anker" href="#line41">41</a></td><td class="line"><div id="line1"><pre><span class="token T_OPEN_TAG">&lt;?php</span></pre></div><div id="line2"><pre><span class="token T_DOC_COMMENT">/**</span></pre></div><div id="line3"><pre><span class="token T_DOC_COMMENT"> * This file is part of a FireGento e.V. module.</span></pre></div><div id="line4"><pre><span class="token T_DOC_COMMENT"> *</span></pre></div><div id="line5"><pre><span class="token T_DOC_COMMENT"> * This FireGento e.V. module is free software; you can redistribute it and/or</span></pre></div><div id="line6"><pre><span class="token T_DOC_COMMENT"> * modify it under the terms of the GNU General Public License version 3 as</span></pre></div><div id="line7"><pre><span class="token T_DOC_COMMENT"> * published by the Free Software Foundation.</span></pre></div><div id="line8"><pre><span class="token T_DOC_COMMENT"> *</span></pre></div><div id="line9"><pre><span class="token T_DOC_COMMENT"> * This script is distributed in the hope that it will be useful, but WITHOUT</span></pre></div><div id="line10"><pre><span class="token T_DOC_COMMENT"> * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS</span></pre></div><div id="line11"><pre><span class="token T_DOC_COMMENT"> * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</span></pre></div><div id="line12"><pre><span class="token T_DOC_COMMENT"> *</span></pre></div><div id="line13"><pre><span class="token T_DOC_COMMENT"> * PHP version 5</span></pre></div><div id="line14"><pre><span class="token T_DOC_COMMENT"> *</span></pre></div><div id="line15"><pre><span class="token T_DOC_COMMENT"> * @category FireGento</span></pre></div><div id="line16"><pre><span class="token T_DOC_COMMENT"> * @package FireGento_AdminMonitoring</span></pre></div><div id="line17"><pre><span class="token T_DOC_COMMENT"> * @author FireGento Team &lt;[email protected]&gt;</span></pre></div><div id="line18"><pre><span class="token T_DOC_COMMENT"> * @copyright 2014 FireGento Team (http://www.firegento.com)</span></pre></div><div id="line19"><pre><span class="token T_DOC_COMMENT"> * @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)</span></pre></div><div id="line20"><pre><span class="token T_DOC_COMMENT"> */</span></pre></div><div id="line21"><pre><span class="token T_DOC_COMMENT">/**</span></pre></div><div id="line22"><pre><span class="token T_DOC_COMMENT"> * Observes Model Delete</span></pre></div><div id="line23"><pre><span class="token T_DOC_COMMENT"> *</span></pre></div><div id="line24"><pre><span class="token T_DOC_COMMENT"> * @category FireGento</span></pre></div><div id="line25"><pre><span class="token T_DOC_COMMENT"> * @package FireGento_AdminMonitoring</span></pre></div><div id="line26"><pre><span class="token T_DOC_COMMENT"> * @author FireGento Team &lt;[email protected]&gt;</span></pre></div><div id="line27"><pre><span class="token T_DOC_COMMENT"> */</span></pre></div><div id="line28"><pre><span class="token T_CLASS">class</span><span class="token T_WHITESPACE"> </span><span class="token T_STRING">FireGento_AdminMonitoring_Model_Observer_Model_Delete</span></pre></div><div id="line29"><pre><span class="token T_WHITESPACE"> </span><span class="token T_EXTENDS">extends</span><span class="token T_WHITESPACE"> </span><span class="token T_STRING">FireGento_AdminMonitoring_Model_Observer_Model_Abstract</span></pre></div><div id="line30"><pre><span class="token T_PHPDOX_OPEN_CURLY">{</span></pre></div><div id="line31"><pre><span class="token T_WHITESPACE"> </span><span class="token T_DOC_COMMENT">/**</span></pre></div><div id="line32"><pre><span class="token T_DOC_COMMENT"> * Retrieve the current action id</span></pre></div><div id="line33"><pre><span class="token T_DOC_COMMENT"> *</span></pre></div><div id="line34"><pre><span class="token T_DOC_COMMENT"> * @return int Action ID</span></pre></div><div id="line35"><pre><span class="token T_DOC_COMMENT"> */</span></pre></div><div id="line36"><pre><span class="token T_WHITESPACE"> </span><span class="token T_PROTECTED">protected</span><span class="token T_WHITESPACE"> </span><span class="token T_FUNCTION">function</span><span class="token T_WHITESPACE"> </span><span class="token T_STRING">getAction</span><span class="token T_PHPDOX_OPEN_BRACKET">(</span><span class="token T_PHPDOX_CLOSE_BRACKET">)</span></pre></div><div id="line37"><pre><span class="token T_WHITESPACE"> </span><span class="token T_PHPDOX_OPEN_CURLY">{</span></pre></div><div id="line38"><pre><span class="token T_WHITESPACE"> </span><span class="token T_RETURN">return</span><span class="token T_WHITESPACE"> </span><span class="token T_STRING">FireGento_AdminMonitoring_Helper_Data</span><span class="token T_DOUBLE_COLON">::</span><span class="token T_STRING">ACTION_DELETE</span><span class="token T_PHPDOX_SEMICOLON">;</span></pre></div><div id="line39"><pre><span class="token T_WHITESPACE"> </span><span class="token T_PHPDOX_CLOSE_CURLY">}</span></pre></div><div id="line40"><pre><span class="token T_PHPDOX_CLOSE_CURLY">}</span></pre></div><div id="line41"><br/></div></td></tr></table></section></div><footer><span/></footer></body></html>
Size: 1,293 Bytes - Last Modified: 2014-10-26T15:34:44+01:00</p><section><h2><small>/Users/rouven/Sites/firegento/.modman/firegento-adminmonitoring/src/app/code/community/FireGento/AdminMonitoring/Model/Observer/Model/</small>Delete.php</h2><table class="source"><tr><td class="no"><a class="anker" href="#line1">1</a><a class="anker" href="#line2">2</a><a class="anker" href="#line3">3</a><a class="anker" href="#line4">4</a><a class="anker" href="#line5">5</a><a class="anker" href="#line6">6</a><a class="anker" href="#line7">7</a><a class="anker" href="#line8">8</a><a class="anker" href="#line9">9</a><a class="anker" href="#line10">10</a><a class="anker" href="#line11">11</a><a class="anker" href="#line12">12</a><a class="anker" href="#line13">13</a><a class="anker" href="#line14">14</a><a class="anker" href="#line15">15</a><a class="anker" href="#line16">16</a><a class="anker" href="#line17">17</a><a class="anker" href="#line18">18</a><a class="anker" href="#line19">19</a><a class="anker" href="#line20">20</a><a class="anker" href="#line21">21</a><a class="anker" href="#line22">22</a><a class="anker" href="#line23">23</a><a class="anker" href="#line24">24</a><a class="anker" href="#line25">25</a><a class="anker" href="#line26">26</a><a class="anker" href="#line27">27</a><a class="anker" href="#line28">28</a><a class="anker" href="#line29">29</a><a class="anker" href="#line30">30</a><a class="anker" href="#line31">31</a><a class="anker" href="#line32">32</a><a class="anker" href="#line33">33</a><a class="anker" href="#line34">34</a><a class="anker" href="#line35">35</a><a class="anker" href="#line36">36</a><a class="anker" href="#line37">37</a><a class="anker" href="#line38">38</a><a class="anker" href="#line39">39</a><a class="anker" href="#line40">40</a><a class="anker" href="#line41">41</a></td><td class="line"><div id="line1"><pre><span class="token T_OPEN_TAG">&lt;?php</span></pre></div><div id="line2"><pre><span class="token T_DOC_COMMENT">/**</span></pre></div><div id="line3"><pre><span class="token T_DOC_COMMENT"> * This file is part of a FireGento e.V. module.</span></pre></div><div id="line4"><pre><span class="token T_DOC_COMMENT"> *</span></pre></div><div id="line5"><pre><span class="token T_DOC_COMMENT"> * This FireGento e.V. module is free software; you can redistribute it and/or</span></pre></div><div id="line6"><pre><span class="token T_DOC_COMMENT"> * modify it under the terms of the GNU General Public License version 3 as</span></pre></div><div id="line7"><pre><span class="token T_DOC_COMMENT"> * published by the Free Software Foundation.</span></pre></div><div id="line8"><pre><span class="token T_DOC_COMMENT"> *</span></pre></div><div id="line9"><pre><span class="token T_DOC_COMMENT"> * This script is distributed in the hope that it will be useful, but WITHOUT</span></pre></div><div id="line10"><pre><span class="token T_DOC_COMMENT"> * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS</span></pre></div><div id="line11"><pre><span class="token T_DOC_COMMENT"> * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</span></pre></div><div id="line12"><pre><span class="token T_DOC_COMMENT"> *</span></pre></div><div id="line13"><pre><span class="token T_DOC_COMMENT"> * PHP version 5</span></pre></div><div id="line14"><pre><span class="token T_DOC_COMMENT"> *</span></pre></div><div id="line15"><pre><span class="token T_DOC_COMMENT"> * @category FireGento</span></pre></div><div id="line16"><pre><span class="token T_DOC_COMMENT"> * @package FireGento_AdminMonitoring</span></pre></div><div id="line17"><pre><span class="token T_DOC_COMMENT"> * @author FireGento Team &lt;[email protected]&gt;</span></pre></div><div id="line18"><pre><span class="token T_DOC_COMMENT"> * @copyright 2014 FireGento Team (http://www.firegento.com)</span></pre></div><div id="line19"><pre><span class="token T_DOC_COMMENT"> * @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)</span></pre></div><div id="line20"><pre><span class="token T_DOC_COMMENT"> */</span></pre></div><div id="line21"><pre><span class="token T_DOC_COMMENT">/**</span></pre></div><div id="line22"><pre><span class="token T_DOC_COMMENT"> * Observes Model Delete</span></pre></div><div id="line23"><pre><span class="token T_DOC_COMMENT"> *</span></pre></div><div id="line24"><pre><span class="token T_DOC_COMMENT"> * @category FireGento</span></pre></div><div id="line25"><pre><span class="token T_DOC_COMMENT"> * @package FireGento_AdminMonitoring</span></pre></div><div id="line26"><pre><span class="token T_DOC_COMMENT"> * @author FireGento Team &lt;[email protected]&gt;</span></pre></div><div id="line27"><pre><span class="token T_DOC_COMMENT"> */</span></pre></div><div id="line28"><pre><span class="token T_CLASS">class</span><span class="token T_WHITESPACE"> </span><span class="token T_STRING">FireGento_AdminMonitoring_Model_Observer_Model_Delete</span></pre></div><div id="line29"><pre><span class="token T_WHITESPACE"> </span><span class="token T_EXTENDS">extends</span><span class="token T_WHITESPACE"> </span><span class="token T_STRING">FireGento_AdminMonitoring_Model_Observer_Model_Abstract</span></pre></div><div id="line30"><pre><span class="token T_PHPDOX_OPEN_CURLY">{</span></pre></div><div id="line31"><pre><span class="token T_WHITESPACE"> </span><span class="token T_DOC_COMMENT">/**</span></pre></div><div id="line32"><pre><span class="token T_DOC_COMMENT"> * Retrieve the current action id</span></pre></div><div id="line33"><pre><span class="token T_DOC_COMMENT"> *</span></pre></div><div id="line34"><pre><span class="token T_DOC_COMMENT"> * @return int Action ID</span></pre></div><div id="line35"><pre><span class="token T_DOC_COMMENT"> */</span></pre></div><div id="line36"><pre><span class="token T_WHITESPACE"> </span><span class="token T_PROTECTED">protected</span><span class="token T_WHITESPACE"> </span><span class="token T_FUNCTION">function</span><span class="token T_WHITESPACE"> </span><span class="token T_STRING">getAction</span><span class="token T_PHPDOX_OPEN_BRACKET">(</span><span class="token T_PHPDOX_CLOSE_BRACKET">)</span></pre></div><div id="line37"><pre><span class="token T_WHITESPACE"> </span><span class="token T_PHPDOX_OPEN_CURLY">{</span></pre></div><div id="line38"><pre><span class="token T_WHITESPACE"> </span><span class="token T_RETURN">return</span><span class="token T_WHITESPACE"> </span><span class="token T_STRING">FireGento_AdminMonitoring_Helper_Data</span><span class="token T_DOUBLE_COLON">::</span><span class="token T_STRING">ACTION_DELETE</span><span class="token T_PHPDOX_SEMICOLON">;</span></pre></div><div id="line39"><pre><span class="token T_WHITESPACE"> </span><span class="token T_PHPDOX_CLOSE_CURLY">}</span></pre></div><div id="line40"><pre><span class="token T_PHPDOX_CLOSE_CURLY">}</span></pre></div><div id="line41"><br/></div></td></tr></table></section></div><footer><span/></footer></body></html>

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<h1>Source of FireGento_AdminMonitoring</h1>
<p>
This project consists of 54 directories, containing
a total of 62 files.
a total of 63 files.
</p>
<ul class="path">
<li>
Expand Down Expand Up @@ -103,23 +103,23 @@
</td>
<td>4.7 KB
</td>
<td>2014-10-26T15:31:53+01:00</td>
<td>2014-10-26T15:34:44+01:00</td>
</tr>
<tr>
<td>
<a href="Delete.php.xhtml">Delete.php</a>
</td>
<td>1.3 KB
</td>
<td>2014-10-26T15:31:53+01:00</td>
<td>2014-10-26T15:34:44+01:00</td>
</tr>
<tr>
<td>
<a href="Save.php.xhtml">Save.php</a>
</td>
<td>4.1 KB
</td>
<td>2014-10-26T15:31:53+01:00</td>
<td>2014-10-26T15:34:44+01:00</td>
</tr>
<tr>
<td colspan="3">
Expand Down
Loading

0 comments on commit 1b6fa18

Please sign in to comment.