[jitsi-dev] [jitsi] 3 way call pull request (#178)


#1

Call forwarding functionality for sip calls.
Adding custom cofig headers for sip calls.
Configurable domain for sip.
Request uri modifications for sip.
hold, unhold and merge functionalities for sip calls.
changing audio from sendrecv to inactive in case of hold functionality for sip.
You can view, comment on, or merge this pull request online at:

  https://github.com/jitsi/jitsi/pull/178

-- Commit Summary --

  * Updated for IMS
  * Changes to integrate configurable domain.
  * Changes to integrate configurable domain.
  * Changes to integrate configurable domain.
  * Making + configurable and customizations
  * Making + configurable and customizations
  * Making + configurable and customizations
  * Making + configurable and customizations
  * fix for configurable domain change
  * fix for configurable domain change
  * fix for configurable domain change
  * Change in the build of colibri packets
  * Revert "Change in the build of colibri packets"
  * Merge remote-tracking branch 'upstream/master'
  * Change in the build of colibri packets
  * Making value of 'tag' in From header dynamic.
  * Code cleanup.
  * Audit Logs implemented.
  * Merge remote-tracking branch 'upstream/master'
  * Code cleanup
  * Updated Jitsi
  * Sip-Call changes for custom headers
  * fixing plus disable for config headers
  * Updated Jitsi
  * Fix for domain name issue in From custom header
  * Updated with jitsi/Jitsi release #5475
  * Updated to Jitsi release #5478
  * Logging format changes
  * master synced with jitsi commit f5dc6edede237288d6b09dddcabd1ed47f55c8c2

-- File Changes --

    M .classpath (8)
    M .gitignore (19)
    T .project (0)
    T .settings/org.eclipse.jdt.core.prefs (0)
    T CONTRIBUTING.md (0)
    T LICENSE (0)
    T README.md (0)
    M build.xml (48)
    T jitsi.iml (0)
    T jitsi.ipr (0)
    T lib/accounts.properties.template (0)
    T lib/bundle/junit.jar (0)
    T lib/bundle/log4j.jar (0)
    T lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar (0)
    M lib/felix.client.run.properties (21)
    M lib/felix.jar (0)
    M lib/felix.unit.test.properties (19)
    T lib/installer-exclude/apache-ant-1.7.0.jar (0)
    T lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jar (0)
    T lib/installer-exclude/bcprov.manifest.mf (0)
    T lib/installer-exclude/cglib-nodep.osgi-2.1_3.jar (0)
    D lib/installer-exclude/commons-codec-1.4.jar (0)
    A lib/installer-exclude/commons-codec-1.6.jar (0)
    T lib/installer-exclude/commons-lang3-3.1.jar (0)
    T lib/installer-exclude/commons-lang3-3.1.manifest.mf (0)
    T lib/installer-exclude/cpptasks.jar (0)
    T lib/installer-exclude/dhcp4java-1.00.jar (0)
    T lib/installer-exclude/dnsjava.jar (0)
    T lib/installer-exclude/easymock-3.1.jar (0)
    A lib/installer-exclude/fmj-1.0-SNAPSHOT.jar (0)
    D lib/installer-exclude/fmj.jar (0)
    T lib/installer-exclude/forms-1.2.1.jar (0)
    T lib/installer-exclude/gdata-client-1.0.jar (0)
    T lib/installer-exclude/gdata-client-meta-1.0.jar (0)
    T lib/installer-exclude/gdata-contacts-3.0.jar (0)
    T lib/installer-exclude/gdata-contacts-meta-3.0.jar (0)
    T lib/installer-exclude/gdata-core-1.0.jar (0)
    T lib/installer-exclude/google-http-client-1.20.0.jar (0)
    T lib/installer-exclude/google-http-client-jackson2-1.20.0.jar (0)
    T lib/installer-exclude/google-oauth-client-1.20.0.jar (0)
    T lib/installer-exclude/guava-15.0.jar (0)
    T lib/installer-exclude/hexdump-0.2.jar (0)
    T lib/installer-exclude/hsqldb.jar (0)
    T lib/installer-exclude/hsqldb.jar.manifest.mf (0)
    T lib/installer-exclude/httpclient-osgi-4.2.3.jar (0)
    T lib/installer-exclude/httpclient.manifest.mf (0)
    T lib/installer-exclude/httpcore-osgi-4.2.3.jar (0)
    T lib/installer-exclude/ice4j.jar (0)
    T lib/installer-exclude/irc-api-1.0.jar (0)
    T lib/installer-exclude/jackson-core-2.5.3.jar (0)
    T lib/installer-exclude/jain-sdp.jar (0)
    T lib/installer-exclude/jain-sip-api.jar (0)
    T lib/installer-exclude/jain-sip-ri.jar (0)
    T lib/installer-exclude/jcalendar-1.4.jar (0)
    T lib/installer-exclude/jcommon-1.0.0.jar (0)
    T lib/installer-exclude/jdic_misc.jar (0)
    T lib/installer-exclude/jdom.jar (0)
    T lib/installer-exclude/jfontchooser-1.0.5.jar (0)
    T lib/installer-exclude/jfontchooser.manifest.mf (0)
    T lib/installer-exclude/jfreechart-1.0.1.jar (0)
    A lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar (0)
    D lib/installer-exclude/jitsi-lgpl-dependencies.jar (0)
    T lib/installer-exclude/jmdns.jar (0)
    T lib/installer-exclude/jmdns.manifest.mf (0)
    T lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar (0)
    T lib/installer-exclude/jmyspell-core.jar (0)
    T lib/installer-exclude/jna-platform.jar (0)
    T lib/installer-exclude/jna.jar (0)
    T lib/installer-exclude/jna.manifest.mf (0)
    T lib/installer-exclude/jnsapi.jar (0)
    T lib/installer-exclude/joscar-client.jar (0)
    T lib/installer-exclude/joscar-common.jar (0)
    T lib/installer-exclude/joscar-protocol.jar (0)
    T lib/installer-exclude/jsch-0.1.36.jar (0)
    T lib/installer-exclude/jsocks-klea.jar (0)
    M lib/installer-exclude/json-simple-1.1.1.jar (0)
    T lib/installer-exclude/junit.jar (0)
    T lib/installer-exclude/laf-widget.jar (0)
    T lib/installer-exclude/libdbus-java-2.7.jar (0)
    A lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar (0)
    D lib/installer-exclude/libjitsi.jar (0)
    T lib/installer-exclude/libphonenumber-5.9.jar (0)
    T lib/installer-exclude/mac_widgets-0.9.5.jar (0)
    T lib/installer-exclude/objenesis-1.2.jar (0)
    T lib/installer-exclude/otr4j.jar (0)
    T lib/installer-exclude/p4j-exclusions.txt (0)
    T lib/installer-exclude/profiler4j-1.0-beta3-SC.jar (0)
    A lib/installer-exclude/sdes4j-1.1.3.jar (0)
    D lib/installer-exclude/sdes4j.jar (0)
    T lib/installer-exclude/slf4j-api-1.7.5.jar (0)
    T lib/installer-exclude/slf4j-jdk14-1.7.5.jar (0)
    T lib/installer-exclude/smack.jar (0)
    T lib/installer-exclude/smack.manifest.mf (0)
    T lib/installer-exclude/smackx-debug.jar (0)
    T lib/installer-exclude/smackx.jar (0)
    T lib/installer-exclude/swing-worker-1.2.jar (0)
    T lib/installer-exclude/unix-0.5.jar (0)
    T lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar (0)
    T lib/installer-exclude/ymsg_network_v0_67.jar (0)
    T lib/installer-exclude/zrtp4j-light.jar (0)
    M lib/jitsi-defaults.properties (2)
    T lib/logging.properties (0)
    T lib/native/freebsd-64/libjdic_misc.so (0)
    T lib/native/freebsd/libjdic_misc.so (0)
    T lib/native/linux-64/libjng722.so (0)
    T lib/native/linux-64/libjnspeex.so (0)
    T lib/native/linux-64/libjunbound.so (0)
    T lib/native/linux-64/libsysactivitynotifications.so (0)
    T lib/native/linux-64/libunix-java.so (0)
    T lib/native/linux/libjdic_misc.so (0)
    T lib/native/linux/libjng722.so (0)
    T lib/native/linux/libjnspeex.so (0)
    T lib/native/linux/libjunbound.so (0)
    T lib/native/linux/libsysactivitynotifications.so (0)
    T lib/native/linux/libunix-java.so (0)
    T lib/native/mac/GrowlFramework/Growl.framework/Versions/A/Headers/Growl.h (0)
    T lib/native/mac/GrowlFramework/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h (0)
    T lib/native/mac/GrowlFramework/Growl.framework/Versions/A/Headers/GrowlDefines.h (0)
    T lib/native/mac/GrowlFramework/Growl.framework/Versions/A/Resources/Info.plist (0)
    T lib/native/mac/GrowlFramework/Growl.framework/Versions/A/_CodeSignature/CodeResources (0)
    T lib/native/mac/GrowlFramework/Legacy/Growl.framework/Versions/A/Headers/Growl.h (0)
    T lib/native/mac/GrowlFramework/Legacy/Growl.framework/Versions/A/Headers/GrowlApplicationBridge-Carbon.h (0)
    T lib/native/mac/GrowlFramework/Legacy/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h (0)
    T lib/native/mac/GrowlFramework/Legacy/Growl.framework/Versions/A/Headers/GrowlDefines.h (0)
    T lib/native/mac/GrowlFramework/Legacy/Growl.framework/Versions/A/Resources/Info.plist (0)
    D lib/native/mac/libjnawtrenderer.jnilib (0)
    D lib/native/mac/libjnffmpeg.jnilib (0)
    D lib/native/mac/libjng722.jnilib (0)
    D lib/native/mac/libjnmaccoreaudio.jnilib (0)
    D lib/native/mac/libjnopus.jnilib (0)
    D lib/native/mac/libjnportaudio.jnilib (0)
    D lib/native/mac/libjnquicktime.jnilib (0)
    D lib/native/mac/libjnscreencapture.jnilib (0)
    D lib/native/mac/libjnspeex.jnilib (0)
    D lib/native/mac/libjnvpx.jnilib (0)
    T lib/native/mac/libjunbound.jnilib (0)
    T lib/native/mac/libsysactivitynotifications.jnilib (0)
    T lib/native/solaris/libCvidPro.so (0)
    T lib/native/solaris/soundbank.gm (0)
    T lib/native/windows-64/IMsOutlookAddrBookClient.tlb (0)
    T lib/native/windows-64/IMsOutlookAddrBookServer.tlb (0)
    T lib/native/windows-64/LocalhostRetriever.dll (0)
    T lib/native/windows-64/globalshortcut.dll (0)
    T lib/native/windows-64/jdic_misc.dll (0)
    T lib/native/windows-64/jndirectshow.dll (0)
    T lib/native/windows-64/jnffmpeg.dll (0)
    T lib/native/windows-64/jng722.dll (0)
    T lib/native/windows-64/jnportaudio.dll (0)
    T lib/native/windows-64/jnspeex.dll (0)
    T lib/native/windows-64/jnvpx.dll (0)
    T lib/native/windows-64/jnwasapi.dll (0)
    T lib/native/windows-64/jnwincoreaudio.dll (0)
    T lib/native/windows-64/junbound.dll (0)
    T lib/native/windows-64/sysactivitynotifications.dll (0)
    T lib/native/windows/IMsOutlookAddrBookClient.tlb (0)
    T lib/native/windows/IMsOutlookAddrBookServer.tlb (0)
    T lib/native/windows/IeEmbed.exe (0)
    T lib/native/windows/LocalhostRetriever.dll (0)
    T lib/native/windows/globalshortcut.dll (0)
    T lib/native/windows/hid.dll (0)
    T lib/native/windows/jnawtrenderer.dll (0)
    T lib/native/windows/jndirectshow.dll (0)
    T lib/native/windows/jnffmpeg.dll (0)
    T lib/native/windows/jng722.dll (0)
    T lib/native/windows/jnportaudio.dll (0)
    T lib/native/windows/jnscreencapture.dll (0)
    T lib/native/windows/jnspeex.dll (0)
    T lib/native/windows/jnvpx.dll (0)
    T lib/native/windows/jnwasapi.dll (0)
    T lib/native/windows/jnwincoreaudio.dll (0)
    T lib/native/windows/junbound.dll (0)
    T lib/native/windows/sysactivitynotifications.dll (0)
    T lib/os-specific/mac/OrangeExtensions.jar (0)
    T lib/os-specific/mac/growl4j.jar (0)
    T lib/testing.properties (0)
    A m2/jitsi-configuration/pom.xml (64)
    A m2/jitsi-contactlist/pom.xml (52)
    A m2/jitsi-credentialsstorage/pom.xml (58)
    A m2/jitsi-dnsservice/pom.xml (51)
    A m2/jitsi-fileaccess/pom.xml (56)
    A m2/jitsi-netaddr/pom.xml (66)
    A m2/jitsi-packetlogging/pom.xml (56)
    A m2/jitsi-protocol-jabber/pom.xml (76)
    A m2/jitsi-protocol-media/pom.xml (60)
    A m2/jitsi-protocol/pom.xml (89)
    A m2/jitsi-resourcemanager/pom.xml (58)
    A m2/jitsi-ui-service/pom.xml (62)
    A m2/jitsi-util/pom.xml (68)
    A m2/pom.xml (80)
    T nbproject/ide-file-targets.xml (0)
    T nbproject/ide-targets.xml (0)
    T nbproject/project.properties (0)
    T nbproject/project.xml (0)
    T resources/colors/colors.properties (0)
    T resources/config/defaultkeybindings/keybindings-chat (0)
    T resources/config/defaultkeybindings/keybindings-main (0)
    M resources/config/defaults.properties (2)
    T resources/config/spellcheck/de_DE_frami.zip (0)
    T resources/config/spellcheck/es_ES.zip (0)
    T resources/config/spellcheck/fr_FR.zip (0)
    T resources/config/spellcheck/parameters.xml (0)
    T resources/images/images.properties (0)
    T resources/images/impl/gui/buttons/accountEditIcon.png (0)
    T resources/images/impl/gui/buttons/addAccount.png (0)
    T resources/images/impl/gui/buttons/addAccountMenu.png (0)
    T resources/images/impl/gui/buttons/addContactChatIcon.png (0)
    T resources/images/impl/gui/buttons/addContactSmall.png (0)
    T resources/images/impl/gui/buttons/addContactSmallPressed.png (0)
    T resources/images/impl/gui/buttons/addContactSmallRollover.png (0)
    T resources/images/impl/gui/buttons/addToCall.png (0)
    T resources/images/impl/gui/buttons/addToChat.png (0)
    T resources/images/impl/gui/buttons/alignCenter.png (0)
    T resources/images/impl/gui/buttons/alignCenterRollover.png (0)
    T resources/images/impl/gui/buttons/alignLeft.png (0)
    T resources/images/impl/gui/buttons/alignLeftRollover.png (0)
    T resources/images/impl/gui/buttons/alignRight.png (0)
    T resources/images/impl/gui/buttons/alignRightRollover.png (0)
    T resources/images/impl/gui/buttons/autoJoinOff.png (0)
    T resources/images/impl/gui/buttons/autoJoinOffOver.png (0)
    T resources/images/impl/gui/buttons/autoJoinOffPressed.png (0)
    T resources/images/impl/gui/buttons/autoJoinOn.png (0)
    T resources/images/impl/gui/buttons/autoJoinOnOver.png (0)
    T resources/images/impl/gui/buttons/autoJoinOnPressed.png (0)
    T resources/images/impl/gui/buttons/callButton.png (0)
    T resources/images/impl/gui/buttons/callButtonPressed.png (0)
    T resources/images/impl/gui/buttons/callButtonRollover.png (0)
    T resources/images/impl/gui/buttons/callDesktopSharing.png (0)
    T resources/images/impl/gui/buttons/callHistoryButton.png (0)
    T resources/images/impl/gui/buttons/callHistoryButtonPressed.png (0)
    T resources/images/impl/gui/buttons/callInfo.png (0)
    T resources/images/impl/gui/buttons/callSettingButton.png (0)
    T resources/images/impl/gui/buttons/callSettingButtonPressed.png (0)
    T resources/images/impl/gui/buttons/callSmall.png (0)
    T resources/images/impl/gui/buttons/callSmallPressed.png (0)
    T resources/images/impl/gui/buttons/callSmallRollover.png (0)
    T resources/images/impl/gui/buttons/callVideoSmall.png (0)
    T resources/images/impl/gui/buttons/callVideoSmallPressed.png (0)
    T resources/images/impl/gui/buttons/callVideoSmallRollover.png (0)
    T resources/images/impl/gui/buttons/chatCall.png (0)
    T resources/images/impl/gui/buttons/chatConfigureIcon.png (0)
    T resources/images/impl/gui/buttons/chatDesktopSharing.png (0)
    T resources/images/impl/gui/buttons/chatRoomCall.png (0)
    T resources/images/impl/gui/buttons/chatRoomConfig.png (0)
    T resources/images/impl/gui/buttons/chatRoomMembersListConfig.png (0)
    T resources/images/impl/gui/buttons/chatRoomVideoCall.png (0)
    T resources/images/impl/gui/buttons/chatSmall.png (0)
    T resources/images/impl/gui/buttons/chatSmallAway.png (0)
    T resources/images/impl/gui/buttons/chatSmallDND.png (0)
    T resources/images/impl/gui/buttons/chatSmallExtendedAway.png (0)
    T resources/images/impl/gui/buttons/chatSmallFree.png (0)
    T resources/images/impl/gui/buttons/chatSmallOffline.png (0)
    T resources/images/impl/gui/buttons/chatSmallOnline.png (0)
    T resources/images/impl/gui/buttons/chatSmallPhone.png (0)
    T resources/images/impl/gui/buttons/chatSmallPressed.png (0)
    T resources/images/impl/gui/buttons/chatSmallRollover.png (0)
    T resources/images/impl/gui/buttons/chatSmallWhite.png (0)
    T resources/images/impl/gui/buttons/chatVideoCall.png (0)
    T resources/images/impl/gui/buttons/close.png (0)
    T resources/images/impl/gui/buttons/closeTab.png (0)
    T resources/images/impl/gui/buttons/closeVideo.png (0)
    T resources/images/impl/gui/buttons/comboBoxArrow.png (0)
    T resources/images/impl/gui/buttons/contactListButtonBgLeft.png (0)
    T resources/images/impl/gui/buttons/contactListButtonBgMiddle.png (0)
    T resources/images/impl/gui/buttons/contactListButtonBgRight.png (0)
    T resources/images/impl/gui/buttons/contactListButtonSeparator.png (0)
    T resources/images/impl/gui/buttons/contactListDialButton.png (0)
    T resources/images/impl/gui/buttons/contactListOneButtonBg.png (0)
    T resources/images/impl/gui/buttons/copy.png (0)
    T resources/images/impl/gui/buttons/copyRollover.png (0)
    T resources/images/impl/gui/buttons/crm.png (0)
    T resources/images/impl/gui/buttons/cut.png (0)
    T resources/images/impl/gui/buttons/cutRollover.png (0)
    T resources/images/impl/gui/buttons/delete.png (0)
    T resources/images/impl/gui/buttons/desktopSharingSmall.png (0)
    T resources/images/impl/gui/buttons/desktopSharingSmallPressed.png (0)
    T resources/images/impl/gui/buttons/desktopSharingSmallRollover.png (0)
    T resources/images/impl/gui/buttons/destroyChat.png (0)
    T resources/images/impl/gui/buttons/destroyChatOver.png (0)
    T resources/images/impl/gui/buttons/destroyChatPressed.png (0)
    T resources/images/impl/gui/buttons/dialButton.png (0)
    T resources/images/impl/gui/buttons/dialButtonBg.png (0)
    T resources/images/impl/gui/buttons/dialPadCallButtonBg.png (0)
    T resources/images/impl/gui/buttons/diez.png (0)
    T resources/images/impl/gui/buttons/diezMac.png (0)
    T resources/images/impl/gui/buttons/diezMacRollover.png (0)
    T resources/images/impl/gui/buttons/diezPressed.png (0)
    T resources/images/impl/gui/buttons/diezRollover.png (0)
    T resources/images/impl/gui/buttons/eight.png (0)
    T resources/images/impl/gui/buttons/eightMac.png (0)
    T resources/images/impl/gui/buttons/eightMacRollover.png (0)
    T resources/images/impl/gui/buttons/eightPressed.png (0)
    T resources/images/impl/gui/buttons/eightRollover.png (0)
    T resources/images/impl/gui/buttons/enterFullScreen.png (0)
    T resources/images/impl/gui/buttons/exitFullScreen.png (0)
    T resources/images/impl/gui/buttons/five.png (0)
    T resources/images/impl/gui/buttons/fiveMac.png (0)
    T resources/images/impl/gui/buttons/fiveMacRollover.png (0)
    T resources/images/impl/gui/buttons/fivePressed.png (0)
    T resources/images/impl/gui/buttons/fiveRollover.png (0)
    T resources/images/impl/gui/buttons/fontIcon.png (0)
    I resources/images/impl/gui/buttons/four.png (0)

-- Patch Links --

https://github.com/jitsi/jitsi/pull/178.patch
https://github.com/jitsi/jitsi/pull/178.diff

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/178


#2

Closed #178.

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/178#event-451923900


#3

Ahm, well. This is probably the biggest pull request I've ever seen - and coming totally out of the blue.

Before I'm even trying to look at it, please:
- Rebase your commits on master (instead of merging changes from master into your branch)
- Don't modify file permissions in Git
- Create separate, independent pull requests for each of the items you listed in the comment and explain in those what that change does and why existing functionality isn't enough
- While working on it, make sure your changes adhere to the [code convention](https://jitsi.org/Documentation/CodeConvention) and sign the [CLA](https://jitsi.org/icla)

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/178#issuecomment-153008047