Skip to content

Release 4.6#7

Open
spaghetty wants to merge 56 commits intoSIPfoundry:release-4.6from
spaghetty:release-4.6
Open

Release 4.6#7
spaghetty wants to merge 56 commits intoSIPfoundry:release-4.6from
spaghetty:release-4.6

Conversation

@spaghetty
Copy link
Copy Markdown
Contributor

here there are all changes we made.. gives a look and let me know.

thanks
Domenico Chierico

@dhubler
Copy link
Copy Markdown
Contributor

dhubler commented Mar 19, 2013

Looking thru some of these patches, what I'm missing are the issues
around what they solve. Some are obvious, some are not, but all need
a corresponding item in jira and then you can include the jira issue
in the commit message.

Example

git commit -m " XX-2323 Change voicemail label w/inbox"

Jira issue: XX-2323
Summary: Change the label Voicemail to Inbox
Description:
The term "Inbox" is a better label then "Voicemail" because ....

On Tue, Mar 19, 2013 at 5:04 AM, Domenico notifications@github.com wrote:

here there are all changes we made.. gives a look and let me know.

thanks
Domenico Chierico


You can merge this Pull Request by running

git pull https://github.com/spaghetty/sipxecs release-4.6

Or view, comment on, or merge it at:

#7

Commit Summary

patch UserPortalFixLabel
patch snom-fixes
patch cdr-privacy
patch CdrFilter
patch CallDestPlugin
Managing the setup on no network installation
patch gatewayTable_Id
patch cdrRendering
patch CdrImprovement
patch fwr_rule_and_dhcp_for_snom
Merge branch 'release-4.6' of github.com:spaghetty/sipxecs into release-4.6
Merge branch 'release-4.6' of github.com:spaghetty/sipxecs into release-4.6
Merge remote branch 'upstream/release-4.6' into release-4.6

File Changes

M sipXcdr/bin/sipxcdr.in (4)
M sipXcdr/etc/Makefile.am (3)
A sipXcdr/etc/database/gateway.sql (2)
M sipXcdr/lib/cdr.rb (23)
M sipXconfig/etc/sipxpbx/dhcp/dhcp.properties (2)
M sipXconfig/etc/sipxpbx/dhcp/dhcp.xml (7)
M sipXconfig/etc/sipxpbx/sipxcallresolver/sipxcallresolver.properties (9)
M sipXconfig/etc/sipxpbx/sipxcallresolver/sipxcallresolver.xml (16)
M sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/apache/ApacheManager.java
(1)
M
sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/apache/ApacheManagerImpl.java
(5)
M sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/cdr/Cdr.java (68)
M sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/cdr/CdrManagerImpl.java
(38)
M sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/cdr/CdrSearch.java (23)
M sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/cdr/CdrSettings.java (15)
M sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/dhcp/DhcpConfig.java (7)
M sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/dhcp/DhcpConfigTest.java
(3)
M sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/dhcp/expected-dhcpd.conf
(2)
M sipXconfig/web/context/WEB-INF/cdr/CdrTable.html (5)
M sipXconfig/web/context/WEB-INF/gateway/GatewayTable.html (3)
M sipXconfig/web/context/WEB-INF/gateway/GatewayTable.jwc (2)
M sipXconfig/web/context/WEB-INF/gateway/GatewayTable.properties (1)
M sipXconfig/web/context/WEB-INF/sipXconfig-web.properties (1)
M sipXconfig/web/context/WEB-INF/user_portal/UserPortalNavigation.html (2)
M sipXconfig/web/context/WEB-INF/user_portal/UserPortalNavigation.properties
(4)
M sipXconfig/web/context/WEB-INF/vm/ManageVoicemail.properties (4)
M sipXconfig/web/src/org/sipfoundry/sipxconfig/site/cdr/CdrTable.java (32)
M sipXproxy/lib/authplugins/CallDestination.cpp (3)
M sipXproxy/src/CallStateEventBuilder.cpp (1)
M sipXproxy/src/CallStateEventBuilder.h (1)
M sipXproxy/src/CallStateEventBuilder_DB.cpp (29)
M sipXproxy/src/CallStateEventBuilder_DB.h (1)
M sipXproxy/src/CallStateEventBuilder_XML.cpp (1)
M sipXproxy/src/CallStateEventBuilder_XML.h (1)
M sipXproxy/src/SipXProxyCseObserver.cpp (11)
M sipXsnom/etc/snom/line.xml (1)
M sipXsnom/etc/snom/phone.properties (3)
M sipXsnom/etc/snom/phone.xml (4)
A sipXsnom/etc/snom/snom-7_3_X.vm (99)
A sipXsnom/etc/snom/snom-8_4_X.vm (99)
M sipXsnom/etc/snom/snom.vm (37)
M sipXsnom/etc/snom/types.xml (8)
A sipXsnom/etc/snom/upload.xml (76)
M sipXsnom/src/common.am (1)
A sipXsnom/src/org/sipfoundry/sipxconfig/phone/snom/LangUploadListener.java
(33)
A sipXsnom/src/org/sipfoundry/sipxconfig/phone/snom/SnomLanguageFile.java
(52)
A sipXsnom/src/org/sipfoundry/sipxconfig/phone/snom/SnomModel.java (36)
M sipXsnom/src/org/sipfoundry/sipxconfig/phone/snom/SnomPhone.java (21)
M sipXsnom/src/org/sipfoundry/sipxconfig/phone/snom/SnomProfileContext.java
(52)
A sipXsnom/src/org/sipfoundry/sipxconfig/phone/snom/SnomUpload.java (29)
M sipXsnom/src/sipxplugin.beans.xml (30)
M sipXsnom/test/org/sipfoundry/sipxconfig/phone/snom/SnomTest.java (8)
M sipXsnom/test/org/sipfoundry/sipxconfig/phone/snom/expected-snom-320.xml
(33)
M sipXsnom/test/org/sipfoundry/sipxconfig/phone/snom/expected-snom-360.xml
(33)
M sipXsnom/test/org/sipfoundry/sipxconfig/phone/snom/expected-snom-m3.cfg
(2)
M sipXsupervisor/bin/sipxecs-setup.in (24)
M sipXsupervisor/etc/dhcpd.erb (8)
M sipXtackLib/include/net/Url.h (2)
M sipXtackLib/src/net/Url.cpp (5)

Patch Links:

https://github.com/dhubler/sipxecs/pull/7.patch
https://github.com/dhubler/sipxecs/pull/7.diff

@spaghetty
Copy link
Copy Markdown
Contributor Author

On Tue, Mar 19, 2013 at 11:04 AM, Douglas Hubler
notifications@github.comwrote:

he term "Inbox" is a better label then "Voicemail" because ....

OH ok i can try to fix this ..just I didn't know that all changes do need a
related jira issue.

Luciano Berardi and others added 28 commits May 8, 2013 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants