Branch: refs/heads/issue58_SSO
  Home:   https://github.com/Mobicents/RestComm
  Commit: b924a5cd094523478bd72cc438e75fbb2961f2ad
      
https://github.com/Mobicents/RestComm/commit/b924a5cd094523478bd72cc438e75fbb2961f2ad
  Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
  Date:   2015-04-23 (Thu, 23 Apr 2015)

  Changed paths:
    M restcomm/restcomm.application/pom.xml
    A restcomm/restcomm.application/src/main/webapp/WEB-INF/keycloak.json
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/web.xml
    M restcomm/restcomm.http/pom.xml
    A 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/MyTestEndpoint.java

  Log Message:
  -----------
  Set up basic requirements for integrating Restcomm REST endpoints with 
keycloak. Refers #58.
In detail:
 - Added keycloak.json descriptor file
 - Modified web.xml so that all endpoints can also be accessed under /keycloak 
path with respective restrictions
 - Added MyTestEndoint, a sample endpoint for testing


  Commit: 00afb684c34963718ffe066c15448c4f3e6ab07f
      
https://github.com/Mobicents/RestComm/commit/00afb684c34963718ffe066c15448c4f3e6ab07f
  Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
  Date:   2015-04-23 (Thu, 23 Apr 2015)

  Changed paths:
    M restcomm/restcomm.ui/src/main/webapp/index.html
    A restcomm/restcomm.ui/src/main/webapp/keycloak-app.js
    A restcomm/restcomm.ui/src/main/webapp/keycloak.json
    M restcomm/restcomm.ui/src/main/webapp/resources/js/restcomm.js

  Log Message:
  -----------
  Started adding keycloak support to adminUI. Refers #58.
 - Disabled old authentication mechanism
 - Added keycloak dependencies and 'stub' file (keycloak-app.js)

Conflicts:

        restcomm/restcomm.ui/src/main/webapp/index.html


  Commit: 788209bf6e8bfb6da2bcc3069503919c440755cc
      
https://github.com/Mobicents/RestComm/commit/788209bf6e8bfb6da2bcc3069503919c440755cc
  Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
  Date:   2015-04-23 (Thu, 23 Apr 2015)

  Changed paths:
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/keycloak.json
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/AbstractEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/AccountsEndpoint.java
    M restcomm/restcomm.ui/src/main/webapp/index.html
    M restcomm/restcomm.ui/src/main/webapp/keycloak-app.js
    M restcomm/restcomm.ui/src/main/webapp/keycloak.json
    M restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/dashboard.js
    M restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/navbar.js
    M restcomm/restcomm.ui/src/main/webapp/resources/js/services.js

  Log Message:
  -----------
  Switched common operations on accounts REST endpoint to keycloak. Diverted 
AdminUI authentication to keycloak too. Currently AdminUI should be able to 
login and display basic account info (account sid). Refers #58.


  Commit: 537c5415991861a82a5091a236ff7ce33faeca20
      
https://github.com/Mobicents/RestComm/commit/537c5415991861a82a5091a236ff7ce33faeca20
  Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
  Date:   2015-04-23 (Thu, 23 Apr 2015)

  Changed paths:
    M 
restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Bootstrapper.java
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/AbstractEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/MyTestEndpoint.java
    A 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/RestcommRoles.java

  Log Message:
  -----------
  Secured MyTestEndpoint using keycloak provided roles and shiro based 
permission. Need to tidy up the code. Refers #58


  Commit: 2382568eeecac88e97b67d09859c301a5edfc31a
      
https://github.com/Mobicents/RestComm/commit/2382568eeecac88e97b67d09859c301a5edfc31a
  Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/AccountsEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/AccountsJsonEndpoint.java
    A 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/keycloak/KeycloakClient.java
    M restcomm/restcomm.ui/src/main/webapp/keycloak-app.js

  Log Message:
  -----------
  Added automatic import mechanism for users existing in keycloak but missing 
from Restcomm. Refers #58.


  Commit: 0ac5cd379ab089aa1932d43b1bba1a92371a0868
      
https://github.com/Mobicents/RestComm/commit/0ac5cd379ab089aa1932d43b1bba1a92371a0868
  Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/AbstractEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/AccountsEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/IncomingPhoneNumbersEndpoint.java
    M restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/dashboard.js
    M 
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/numbers-incoming.js
    M restcomm/restcomm.ui/src/main/webapp/resources/js/restcomm.js
    M restcomm/restcomm.ui/src/main/webapp/resources/js/services.js

  Log Message:
  -----------
  Secured Number endpoints. Also encapsulated permission checking in a clean 
secureKeycloak() function. DID listing, registration and removal now work. 
Refers #58.


  Commit: b37391c9d7a49686a65e8509b6584455f7f2ac23
      
https://github.com/Mobicents/RestComm/commit/b37391c9d7a49686a65e8509b6584455f7f2ac23
  Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/AbstractEndpoint.java
    M 
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/logs-calls.js
    M 
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/logs-messages.js
    M 
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/logs-notifications.js
    M 
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/logs-recordings.js
    M 
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/logs-transcriptions.js
    M 
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/numbers-outgoing.js
    M 
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/numbers-sip-clients.js

  Log Message:
  -----------
  Switched all remaining endponts to keycloak based security. Refers #58.


  Commit: 56722c658d3a99a9c260ddd77278157b075c670b
      
https://github.com/Mobicents/RestComm/commit/56722c658d3a99a9c260ddd77278157b075c670b
  Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M release/build.xml
    M release/build.xml~
    M 
release/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-media-server.sh
    M 
release/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.sh
    M 
release/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-sip-connectors.sh
    A release/config-scripts/as7-config-scripts/restcomm/proxy.conf
    M release/config-scripts/as7-config-scripts/restcomm/restcomm.conf
    M release/config-scripts/as7-config-scripts/restcomm/start-restcomm.sh
    M release/mss-sip-stack.properties
    M restcomm/pom.xml
    M restcomm/restcomm.application/pom.xml
    M 
restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Bootstrapper.java
    M 
restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Ping.java
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/mybatis.xml
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/restcomm.xml
    M 
restcomm/restcomm.application/src/main/webapp/WEB-INF/data/hsql/restcomm.properties
    M 
restcomm/restcomm.application/src/main/webapp/WEB-INF/data/hsql/restcomm.script
    M 
restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/init.sql
    M 
restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/sql/incoming-phone-numbers.xml
    A 
restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/sql/usage.xml
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/sql/init.sql
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/sip.xml
    M 
restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/incoming-phone-numbers.xml
    A restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/usage.xml
    M restcomm/restcomm.commons/pom.xml
    A 
restcomm/restcomm.commons/src/main/java/org/mobicents/servlet/restcomm/amazonS3/S3AccessTool.java
    M restcomm/restcomm.dao/pom.xml
    M 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/dao/DaoManager.java
    A 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/dao/UsageDao.java
    M 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/dao/mybatis/MybatisDaoManager.java
    M 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/dao/mybatis/MybatisIncomingPhoneNumbersDao.java
    M 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/dao/mybatis/MybatisRecordingsDao.java
    A 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/dao/mybatis/MybatisUsageDao.java
    M 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/entities/IncomingPhoneNumber.java
    M 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/entities/Recording.java
    A 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/entities/Usage.java
    A 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/entities/UsageList.java
    M restcomm/restcomm.dao/src/test/resources/data/restcomm.script
    M restcomm/restcomm.dao/src/test/resources/restcomm.script
    M restcomm/restcomm.http/pom.xml
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/CallsEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/GatewaysEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/IncomingPhoneNumbersEndpoint.java
    A 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/UsageEndpoint.java
    A 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/UsageJsonEndpoint.java
    A 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/UsageXmlEndpoint.java
    A 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/converter/UsageConverter.java
    A 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/converter/UsageListConverter.java
    M 
restcomm/restcomm.http/src/test/java/org/mobicents/servlet/restcomm/http/client/DownloaderTest.java
    M restcomm/restcomm.interpreter/pom.xml
    M 
restcomm/restcomm.interpreter/src/main/java/org/mobicents/servlet/restcomm/interpreter/BaseVoiceInterpreter.java
    M 
restcomm/restcomm.interpreter/src/main/java/org/mobicents/servlet/restcomm/interpreter/ConfVoiceInterpreter.java
    M 
restcomm/restcomm.interpreter/src/main/java/org/mobicents/servlet/restcomm/interpreter/StopInterpreter.java
    M 
restcomm/restcomm.interpreter/src/main/java/org/mobicents/servlet/restcomm/interpreter/VoiceInterpreter.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/mobicents/servlet/restcomm/mgcp/BridgeEndpoint.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/mobicents/servlet/restcomm/mgcp/Connection.java
    R 
restcomm/restcomm.mgcp/src/main/java/org/mobicents/servlet/restcomm/mgcp/InspectConnection.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/mobicents/servlet/restcomm/mgcp/Link.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/mobicents/servlet/restcomm/mgcp/MediaGateway.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/mobicents/servlet/restcomm/mgcp/MockMediaGateway.java
    M 
restcomm/restcomm.provisioning.number.api/src/main/java/org/mobicents/servlet/restcomm/provisioning/number/api/PhoneNumberProvisioningManager.java
    A 
restcomm/restcomm.provisioning.number.api/src/main/java/org/mobicents/servlet/restcomm/provisioning/number/api/ProvisionProvider.java
    M 
restcomm/restcomm.provisioning.number.bandwidth/src/main/java/org/mobicents/servlet/restcomm/provisioning/number/bandwidth/BandwidthNumberProvisioningManager.java
    M 
restcomm/restcomm.provisioning.number.nexmo/src/main/java/org/mobicents/servlet/restcomm/provisioning/number/nexmo/NexmoPhoneNumberProvisioningManager.java
    M 
restcomm/restcomm.provisioning.number.vi/src/main/java/org/mobicents/servlet/restcomm/provisioning/number/vi/VoIPInnovationsNumberProvisioningManager.java
    A restcomm/restcomm.provisioning.number.voxbone/lib/ws-voxbone-client.jar
    A restcomm/restcomm.provisioning.number.voxbone/pom.xml
    A 
restcomm/restcomm.provisioning.number.voxbone/src/main/java/org/mobicents/servlet/restcomm/provisioning/number/voxbone/VoxbonePhoneNumberProvisioningManager.java
    A restcomm/restcomm.routing/pom.xml
    M restcomm/restcomm.rvd/src/main/webapp/js/controllers/packaging.js
    M restcomm/restcomm.rvd/src/main/webapp/js/controllers/projectManager.js
    M restcomm/restcomm.rvd/src/main/webapp/languages/en-US.json
    M restcomm/restcomm.rvd/src/main/webapp/languages/pt-BR.json
    M restcomm/restcomm.rvd/src/main/webapp/templates/packaging/form.html
    M restcomm/restcomm.rvd/src/main/webapp/templates/steps/ussdCollectStep.html
    M 
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsService.java
    M 
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsServiceProxy.java
    A 
restcomm/restcomm.telephony.api/src/main/java/org/mobicents/servlet/restcomm/telephony/ChangeCallDirection.java
    A 
restcomm/restcomm.telephony.api/src/main/java/org/mobicents/servlet/restcomm/telephony/GetOutboundCall.java
    M 
restcomm/restcomm.telephony.api/src/main/java/org/mobicents/servlet/restcomm/telephony/InitializeOutbound.java
    A 
restcomm/restcomm.telephony.api/src/main/java/org/mobicents/servlet/restcomm/telephony/RecordingStarted.java
    M 
restcomm/restcomm.telephony.api/src/main/java/org/mobicents/servlet/restcomm/telephony/RegisterGateway.java
    M 
restcomm/restcomm.telephony.api/src/main/java/org/mobicents/servlet/restcomm/telephony/UpdateCallScript.java
    M 
restcomm/restcomm.telephony.api/src/main/java/org/mobicents/servlet/restcomm/telephony/util/B2BUAHelper.java
    M restcomm/restcomm.telephony/pom.xml
    M 
restcomm/restcomm.telephony/src/main/java/org/mobicents/servlet/restcomm/telephony/Call.java
    M 
restcomm/restcomm.telephony/src/main/java/org/mobicents/servlet/restcomm/telephony/CallManager.java
    M 
restcomm/restcomm.telephony/src/main/java/org/mobicents/servlet/restcomm/telephony/CallManagerProxy.java
    M 
restcomm/restcomm.telephony/src/main/java/org/mobicents/servlet/restcomm/telephony/Conference.java
    M 
restcomm/restcomm.telephony/src/main/java/org/mobicents/servlet/restcomm/telephony/MediaGroup.java
    M 
restcomm/restcomm.telephony/src/main/java/org/mobicents/servlet/restcomm/telephony/proxy/ProxyManager.java
    M 
restcomm/restcomm.telephony/src/main/java/org/mobicents/servlet/restcomm/telephony/proxy/ProxyManagerProxy.java
    M 
restcomm/restcomm.telephony/src/main/java/org/mobicents/servlet/restcomm/telephony/ua/UserAgentManagerProxy.java
    M restcomm/restcomm.testsuite/pom.xml
    M 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/http/CallsEndpointTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/http/GatewaysEndpointTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/http/LiveCallModificationTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/provisioning/number/bandwidth/BandwidthIncomingPhoneNumbersEndpointTest.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/provisioning/number/voxbone/VoxboneAvailablePhoneNumbersEndpointTest.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/provisioning/number/voxbone/VoxboneAvailablePhoneNumbersEndpointTestUtils.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/provisioning/number/voxbone/VoxboneIncomingPhoneNumbersEndpointTest.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/provisioning/number/voxbone/VoxboneIncomingPhoneNumbersEndpointTestUtils.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/sms/SmsTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/telephony/ClientMessageTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/telephony/ClientsDialTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/telephony/DialActionTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/telephony/DialTest.java
    M restcomm/restcomm.testsuite/src/test/resources/log4j.xml
    M 
restcomm/restcomm.testsuite/src/test/resources/org/mobicents/servlet/restcomm/telephony/restcomm_no_auth.xml
    M 
restcomm/restcomm.testsuite/src/test/resources/org/mobicents/servlet/restcomm/ussd/restcomm.script_ussdPullTest
    M 
restcomm/restcomm.testsuite/src/test/resources/org/mobicents/servlet/restcomm/ussd/restcomm_conf_ussd_push.xml
    M restcomm/restcomm.testsuite/src/test/resources/restcomm-embeddedMMS.xml
    M restcomm/restcomm.testsuite/src/test/resources/restcomm.script
    M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_SmsTest
    M 
restcomm/restcomm.testsuite/src/test/resources/restcomm.script_accounts_test
    M 
restcomm/restcomm.testsuite/src/test/resources/restcomm.script_dialActionTest
    M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_dialTest
    M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_playTest
    M restcomm/restcomm.testsuite/src/test/resources/restcomm.xml
    M 
restcomm/restcomm.testsuite/src/test/resources/restcomm_AvailablePhoneNumbers_Test.xml
    M restcomm/restcomm.testsuite/src/test/resources/restcomm_SmsTest.xml
    M restcomm/restcomm.testsuite/src/test/resources/restcomm_bandwidth_test.xml
    M 
restcomm/restcomm.testsuite/src/test/resources/restcomm_for_SMSEndpointTest.xml
    M restcomm/restcomm.testsuite/src/test/resources/restcomm_nexmo_test.xml
    A restcomm/restcomm.testsuite/src/test/resources/restcomm_voxbone_test.xml
    M restcomm/restcomm.testsuite/src/test/resources/sip.xml
    M restcomm/restcomm.ui/src/main/webapp/index.html
    A restcomm/restcomm.ui/src/main/webapp/lib/angular-nvd3/angular-nvd3.js
    A restcomm/restcomm.ui/src/main/webapp/lib/angular-nvd3/angular-nvd3.min.js
    A 
restcomm/restcomm.ui/src/main/webapp/lib/angular-sanitize/angular-sanitize.js
    A 
restcomm/restcomm.ui/src/main/webapp/lib/angular-sanitize/angular-sanitize.min.js
    A 
restcomm/restcomm.ui/src/main/webapp/lib/angular-sanitize/angular-sanitize.min.js.map
    A restcomm/restcomm.ui/src/main/webapp/lib/d3/d3.js
    A restcomm/restcomm.ui/src/main/webapp/lib/d3/d3.min.js
    A restcomm/restcomm.ui/src/main/webapp/lib/nvd3/nv.d3.css
    A restcomm/restcomm.ui/src/main/webapp/lib/nvd3/nv.d3.js
    A restcomm/restcomm.ui/src/main/webapp/lib/nvd3/nv.d3.min.css
    A restcomm/restcomm.ui/src/main/webapp/lib/nvd3/nv.d3.min.js
    M restcomm/restcomm.ui/src/main/webapp/modules/dashboard.html
    M restcomm/restcomm.ui/src/main/webapp/modules/rappmanager-config.html
    M restcomm/restcomm.ui/src/main/webapp/resources/css/restcomm.css
    M restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/dashboard.js
    M 
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/numbers-incoming.js
    M restcomm/restcomm.ui/src/main/webapp/resources/js/restcomm.js
    M 
restcomm/restcomm.ui/src/main/webapp/resources/js/restcommApps/appConfig.js
    M restcomm/restcomm.ui/src/main/webapp/resources/js/services.js

  Log Message:
  -----------
  Merge branch 'ghub_master' into ghub_issue58_SSO_merge

Conflicts:
        
restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Bootstrapper.java
        
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/dashboard.js


  Commit: a917427d7a0d3f6f7eacff15325d8cd179a99ae3
      
https://github.com/Mobicents/RestComm/commit/a917427d7a0d3f6f7eacff15325d8cd179a99ae3
  Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/AccountsJsonEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/MyTestEndpoint.java

  Log Message:
  -----------
  Fixed /import account endpoint order. All REST endpoints seem to work except 
for SIP number registration. Refers #58.


Compare: 
https://github.com/Mobicents/RestComm/compare/b924a5cd0945^...a917427d7a0d

-- 

--- 
You received this message because you are subscribed to the Google Groups 
"mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to mobicents-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to