<h1>Project "FreeSWITCH user-contributed scripts, etc" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
discards b98a258f545eea7976d80c2bb6450a73caa9dd3c (commit)
discards 55ef55a5a9e951b26c52b3d2f0e5f902e568f1f9 (commit)
discards ca8489d71e127d5ff7beafbd91bcf5f9c683dd8d (commit)
discards 0cb41713987185aec7f42c9cff174b6d2757e460 (commit)
discards c2e63f1d8fc269cf17bd85d534c9099af8a454b6 (commit)
discards ee436d35144c7d85629d2c7356db64d5f392d1ff (commit)
via: 32250fa69ff8b942ca99c4eaabafde285cc27c9a (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (b98a258f545eea7976d80c2bb6450a73caa9dd3c)
\
N -- N -- N (32250fa69ff8b942ca99c4eaabafde285cc27c9a)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Mitch Capper
comments:
Added option to delete contacts
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/SimpleContactPluginBase.cs b/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #000080; font-weight: bold">index 3c1b33b..66c3918 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/SimpleContactPluginBase.cs</span>
<span style="color: #800080; font-weight: bold">@@ -23,6 +23,12 @@ namespace FSClient</span>
{
return number;
}
<span style="color: #00A000">+ protected virtual void DeleteNumber(string number){</span>
<span style="color: #00A000">+ number_to_alias.Remove(number);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ protected virtual bool CanDeleteContact(){</span>
<span style="color: #00A000">+ return true;</span>
<span style="color: #00A000">+ }</span>
protected virtual string IsValidAlias(String str)//return null to abort updating, otherwire return string
{
return str;
<span style="color: #800080; font-weight: bold">@@ -49,14 +55,34 @@ namespace FSClient</span>
MenuItem item = new MenuItem();
item.Click += item_Click;
item.Header = "Edit Contact";
<span style="color: #A00000">- items.Add(item);</span>
<span style="color: #00A000">+ items.Add(item);</span>
<span style="color: #00A000">+ if (CanDeleteContact()){</span>
<span style="color: #00A000">+ item = new MenuItem();</span>
<span style="color: #00A000">+ item.Click += delete_item_click;</span>
<span style="color: #00A000">+ item.Header = "Delete Contact";</span>
<span style="color: #00A000">+ items.Add(item);</span>
<span style="color: #00A000">+ }</span>
item = new MenuItem();
item.Click +=contact_call_click;
item.Header = "Call";
items.Add(item);
return items;
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ private void delete_item_click(object sender, RoutedEventArgs e){</span>
<span style="color: #00A000">+ MenuItem item = sender as MenuItem;</span>
<span style="color: #00A000">+ if (item == null)</span>
<span style="color: #00A000">+ return;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ SearchAutoCompleteEntry entry = item.DataContext as SearchAutoCompleteEntry ?? search_box.SelectedItem as SearchAutoCompleteEntry;</span>
<span style="color: #00A000">+ if (entry == null)</span>
<span style="color: #00A000">+ return;</span>
<span style="color: #00A000">+ String number = entry.number;</span>
<span style="color: #00A000">+ number = NormalizeNumber(number);</span>
<span style="color: #00A000">+ DeleteNumber(number);</span>
<span style="color: #00A000">+ refresh_search_box();</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
private void contact_call_click(object sender, RoutedEventArgs e){
MenuItem item = sender as MenuItem;
if (item == null)
<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.cs b/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.cs</span>
<span style="color: #000080; font-weight: bold">index 55da854..3077954 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.cs</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/SimpleXmlContactPlugin/SimpleXmlContactPlugin.cs</span>
<span style="color: #800080; font-weight: bold">@@ -88,6 +88,10 @@ namespace SimpleXmlContactPlugin {</span>
protected override void UpdateDatabase(string number, string alias){
SaveDatabase();
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ protected override void DeleteNumber(string number) {</span>
<span style="color: #00A000">+ base.DeleteNumber(number);</span>
<span style="color: #00A000">+ SaveDatabase();</span>
}
}
</pre></div>
========================================================================<pre>
Summary of changes:
mitchcapper/FSClient/SimpleContactPluginBase.cs | 32 +++++++++-
.../SimpleXmlContactPlugin.cs | 4 +
sathieu/cisco-xml/lib/Cisco-XML/Cisco-XML.php | 2 +-
sathieu/cisco-xml/lib/MediaBrotha/Backend.php | 10 ---
sathieu/cisco-xml/lib/MediaBrotha/Backend/LDAP.php | 66 +++++---------------
sathieu/cisco-xml/lib/MediaBrotha/Core.php | 11 +---
sathieu/cisco-xml/lib/MediaBrotha/Form.php | 1 -
.../lib/MediaBrotha/Frontend/CiscoXML.php | 31 +--------
.../cisco-xml/lib/MediaBrotha/Frontend/HTML.php | 41 +++++--------
9 files changed, 72 insertions(+), 126 deletions(-)
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH user-contributed scripts, etc</p>