Branch: refs/heads/forever3000-master Home: https://github.com/RestComm/Restcomm-Connect Commit: f7f1b7ffb8ef6806235e668e9e0d045c95dd4f15 https://github.com/RestComm/Restcomm-Connect/commit/f7f1b7ffb8ef6806235e668e9e0d045c95dd4f15 Author: forever3000 <n.con...@gmail.com> Date: 2016-12-11 (Sun, 11 Dec 2016)
Changed paths: M restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/notifications.xml M restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/recordings.xml M restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/sms-messages.xml M restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/transcriptions.xml M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/NotificationsDao.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/RecordingsDao.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/SmsMessagesDao.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/TranscriptionsDao.java A restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/NotificationFilter.java A restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/RecordingFilter.java A restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/SmsMessageFilter.java A restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/TranscriptionFilter.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisNotificationsDao.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisRecordingsDao.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisSmsMessagesDao.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisTranscriptionsDao.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/NotificationsEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/NotificationsJsonEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/NotificationsXmlEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/RecordingsEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/RecordingsJsonEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/RecordingsXmlEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/SmsMessagesEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/SmsMessagesJsonEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/SmsMessagesXmlEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/TranscriptionsEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/TranscriptionsJsonEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/TranscriptionsXmlEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/NotificationListConverter.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/RecordingListConverter.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/SmsMessageListConverter.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/TranscriptionListConverter.java M restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/RestcommRvdProjectsMigratorTool.java M restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/sms/SmsEndpointTool.java M restcomm/restcomm.ui/src/main/webapp/modules/logs-messages.html M restcomm/restcomm.ui/src/main/webapp/modules/logs-notifications.html M restcomm/restcomm.ui/src/main/webapp/modules/logs-recordings.html M restcomm/restcomm.ui/src/main/webapp/modules/logs-transcriptions.html 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/services.js Log Message: ----------- Implement message, recording, notification, transcription filter on server side following this issue : https://github.com/RestComm/Restcomm-Connect/issues/1395 Commit: 90cb6ee621ca6cba48c383465ed109117480b847 https://github.com/RestComm/Restcomm-Connect/commit/90cb6ee621ca6cba48c383465ed109117480b847 Author: forever3000 <n.con...@gmail.com> Date: 2016-12-12 (Mon, 12 Dec 2016) Changed paths: M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/CallsEndpoint.java M restcomm/restcomm.ui/src/main/webapp/modules/logs-calls.html M restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/logs-calls.js Log Message: ----------- Fix date reverse ordering over multiple pages https://github.com/RestComm/Restcomm-Connect/issues/1635 Commit: 9f199439bc789642260587c86b0afa4738352add https://github.com/RestComm/Restcomm-Connect/commit/9f199439bc789642260587c86b0afa4738352add Author: forever3000 <n.con...@gmail.com> Date: 2016-12-12 (Mon, 12 Dec 2016) Changed paths: M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/CallsEndpoint.java Log Message: ----------- Fix coding convention Commit: f9eb133c4bdee16ed257ecea6c3ddaf380d6df7a https://github.com/RestComm/Restcomm-Connect/commit/f9eb133c4bdee16ed257ecea6c3ddaf380d6df7a Author: forever3000 <n.con...@gmail.com> Date: 2016-12-14 (Wed, 14 Dec 2016) Changed paths: M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/NotificationFilter.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/RecordingFilter.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/TranscriptionFilter.java Log Message: ----------- Fix header for RecordingFilter, NotificationFilter, TranscriptionFilter Commit: 158038b47e36442a298a516f182fd2f6dd55799e https://github.com/RestComm/Restcomm-Connect/commit/158038b47e36442a298a516f182fd2f6dd55799e Author: forever3000 <n.con...@gmail.com> Date: 2016-12-21 (Wed, 21 Dec 2016) Changed paths: M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/CallsEndpoint.java Log Message: ----------- Check NULL for reverse parameter in CALL GET API before handling Commit: 2218e707ae7d1a1ae8aaf5b36f1f7d6594215053 https://github.com/RestComm/Restcomm-Connect/commit/2218e707ae7d1a1ae8aaf5b36f1f7d6594215053 Author: forever3000 <n.con...@gmail.com> Date: 2016-12-21 (Wed, 21 Dec 2016) Changed paths: M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/NotificationFilter.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/RecordingFilter.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/TranscriptionFilter.java Log Message: ----------- Merge branch 'master' of https://github.com/forever3000/Restcomm-Connect Commit: 3092417dafc8c8eab603af84049c76eb1508afb3 https://github.com/RestComm/Restcomm-Connect/commit/3092417dafc8c8eab603af84049c76eb1508afb3 Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com> Date: 2016-12-22 (Thu, 22 Dec 2016) Changed paths: M restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/notifications.xml M restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/recordings.xml M restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/sms-messages.xml M restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/transcriptions.xml M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/NotificationsDao.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/RecordingsDao.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/SmsMessagesDao.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/TranscriptionsDao.java A restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/NotificationFilter.java A restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/RecordingFilter.java A restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/SmsMessageFilter.java A restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/TranscriptionFilter.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisNotificationsDao.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisRecordingsDao.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisSmsMessagesDao.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisTranscriptionsDao.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/CallsEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/NotificationsEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/NotificationsJsonEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/NotificationsXmlEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/RecordingsEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/RecordingsJsonEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/RecordingsXmlEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/SmsMessagesEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/SmsMessagesJsonEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/SmsMessagesXmlEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/TranscriptionsEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/TranscriptionsJsonEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/TranscriptionsXmlEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/NotificationListConverter.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/RecordingListConverter.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/SmsMessageListConverter.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/TranscriptionListConverter.java M restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/RestcommRvdProjectsMigratorTool.java M restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/sms/SmsEndpointTool.java M restcomm/restcomm.ui/src/main/webapp/modules/logs-calls.html M restcomm/restcomm.ui/src/main/webapp/modules/logs-messages.html M restcomm/restcomm.ui/src/main/webapp/modules/logs-notifications.html M restcomm/restcomm.ui/src/main/webapp/modules/logs-recordings.html M restcomm/restcomm.ui/src/main/webapp/modules/logs-transcriptions.html 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/services.js Log Message: ----------- Merge branch 'master' of https://github.com/forever3000/Restcomm-Connect into forever3000-master Commit: f4785e82bad712158546c4013210c3692aea1a58 https://github.com/RestComm/Restcomm-Connect/commit/f4785e82bad712158546c4013210c3692aea1a58 Author: forever3000 <n.con...@gmail.com> Date: 2017-01-01 (Sun, 01 Jan 2017) Changed paths: M release/build.xml M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/TranscriptionListConverter.java A restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/NotificationEndpointTest.java A restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/NotificationEndpointTool.java A restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/RecordingEndpointTest.java A restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/RecordingEndpointTool.java A restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/SmsMessagesEndpointTest.java A restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/TranscriptionEndpointTest.java A restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/TranscriptionEndpointTool.java M restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/sms/SmsEndpointTool.java M restcomm/restcomm.testsuite/src/test/resources/restcomm_with_Data.script Log Message: ----------- Adding test code for message, recording, notification, transcription log according this issue https://github.com/RestComm/Restcomm-Connect/issues/1395 Commit: 99a58525fe56f91170b379cea8e518815bdd5f76 https://github.com/RestComm/Restcomm-Connect/commit/99a58525fe56f91170b379cea8e518815bdd5f76 Author: forever3000 <n.con...@gmail.com> Date: 2017-01-02 (Mon, 02 Jan 2017) Changed paths: M restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/calls-api.adoc M restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/notifications-api.adoc M restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/recordings-api.adoc M restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/sms-api.adoc M restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/transcriptions-api.adoc M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/NotificationListConverter.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/RecordingListConverter.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/SmsMessageListConverter.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/TranscriptionListConverter.java M restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/TranscriptionEndpointTest.java Log Message: ----------- Correct parameter name in Sms, Notification, Recording, Transcription converter Remove debug log in TranscriptionEndpointTest Fill up document for Sms, Notification, Recording, Transcription log According to this issue https://github.com/RestComm/Restcomm-Connect/issues/1395 Commit: c409dffdd306d02327a1ac496164cbeddd82f4ab https://github.com/RestComm/Restcomm-Connect/commit/c409dffdd306d02327a1ac496164cbeddd82f4ab Author: forever3000 <n.con...@gmail.com> Date: 2017-01-02 (Mon, 02 Jan 2017) Changed paths: M restcomm/restcomm.testsuite/src/test/resources/restcomm_with_Data.script Log Message: ----------- Correct restcomm_with_Data.script for this issue https://github.com/RestComm/Restcomm-Connect/issues/1395 Commit: 701be31631245f21c3c6454c9445af29e110204a https://github.com/RestComm/Restcomm-Connect/commit/701be31631245f21c3c6454c9445af29e110204a Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com> Date: 2017-01-09 (Mon, 09 Jan 2017) Changed paths: M restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/calls-api.adoc M restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/notifications-api.adoc M restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/recordings-api.adoc M restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/sms-api.adoc M restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/transcriptions-api.adoc M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/NotificationListConverter.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/RecordingListConverter.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/SmsMessageListConverter.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/TranscriptionListConverter.java A restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/NotificationEndpointTest.java A restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/NotificationEndpointTool.java A restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/RecordingEndpointTest.java A restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/RecordingEndpointTool.java A restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/SmsMessagesEndpointTest.java A restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/TranscriptionEndpointTest.java A restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/TranscriptionEndpointTool.java M restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/sms/SmsEndpointTool.java M restcomm/restcomm.testsuite/src/test/resources/restcomm_with_Data.script Log Message: ----------- Merge branch 'master' of https://github.com/forever3000/Restcomm-Connect into forever3000-master Commit: d0c88af9170629891ec8a51a94d9a5ea9048eb0e https://github.com/RestComm/Restcomm-Connect/commit/d0c88af9170629891ec8a51a94d9a5ea9048eb0e Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com> Date: 2017-01-09 (Mon, 09 Jan 2017) Changed paths: M load_tests/tests/conference/conference-app.xml M restcomm/pom.xml M restcomm/restcomm.application/pom.xml M restcomm/restcomm.asr/pom.xml M restcomm/restcomm.commons/pom.xml M restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/cache/DiskCache.java M restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/cache/DiskCacheResponse.java M restcomm/restcomm.dao/pom.xml M restcomm/restcomm.docs/pom.xml M restcomm/restcomm.docs/sources-asciidoc/pom.xml M restcomm/restcomm.email.api/pom.xml M restcomm/restcomm.email/pom.xml M restcomm/restcomm.extension.api/pom.xml M restcomm/restcomm.extension.controller/pom.xml M restcomm/restcomm.fax/pom.xml M restcomm/restcomm.http/pom.xml M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/exceptionmappers/RestcommRuntimeExceptionMapper.java M restcomm/restcomm.identity/pom.xml M restcomm/restcomm.interpreter/pom.xml M restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/BaseVoiceInterpreter.java M restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java M restcomm/restcomm.mgcp/pom.xml M restcomm/restcomm.monitoring.service/pom.xml M restcomm/restcomm.mrb.api/pom.xml M restcomm/restcomm.mrb/pom.xml M restcomm/restcomm.mscontrol.api/pom.xml M restcomm/restcomm.mscontrol.jsr309/pom.xml M restcomm/restcomm.mscontrol.mms/pom.xml M restcomm/restcomm.provisioning.number.api/pom.xml M restcomm/restcomm.provisioning.number.bandwidth/pom.xml M restcomm/restcomm.provisioning.number.nexmo/pom.xml M restcomm/restcomm.provisioning.number.vi/pom.xml M restcomm/restcomm.provisioning.number.voxbone/pom.xml M restcomm/restcomm.routing/pom.xml M restcomm/restcomm.rvd.testsuite/pom.xml M restcomm/restcomm.rvd/pom.xml M restcomm/restcomm.sms.api/pom.xml M restcomm/restcomm.sms/pom.xml M restcomm/restcomm.telephony.api/pom.xml M restcomm/restcomm.telephony/pom.xml M restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Call.java M restcomm/restcomm.testsuite/pom.xml M restcomm/restcomm.tts.acapela/pom.xml M restcomm/restcomm.tts.api/pom.xml M restcomm/restcomm.tts.att/pom.xml M restcomm/restcomm.tts.voicerss/pom.xml M restcomm/restcomm.ui/pom.xml M restcomm/restcomm.ui/src/main/webapp/index.html M restcomm/restcomm.ui/src/main/webapp/modules/dashboard.html M restcomm/restcomm.ui/src/main/webapp/modules/login.html M restcomm/restcomm.ui/src/main/webapp/modules/logs-calls.html M restcomm/restcomm.ui/src/main/webapp/modules/logs-messages.html M restcomm/restcomm.ui/src/main/webapp/modules/logs-notifications.html M restcomm/restcomm.ui/src/main/webapp/modules/logs-recordings.html M restcomm/restcomm.ui/src/main/webapp/modules/logs-transcriptions.html M restcomm/restcomm.ui/src/main/webapp/modules/numbers-clients-details.html M restcomm/restcomm.ui/src/main/webapp/modules/numbers-clients.html M restcomm/restcomm.ui/src/main/webapp/modules/numbers-incoming-details.html M restcomm/restcomm.ui/src/main/webapp/modules/numbers-incoming-register.html M restcomm/restcomm.ui/src/main/webapp/modules/numbers-incoming.html A restcomm/restcomm.ui/src/main/webapp/resources/css/dashboard.css M restcomm/restcomm.ui/src/main/webapp/resources/css/restcomm.css A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/app-icons/sms-apps.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/app-icons/ussd-apps.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/app-icons/voice-apps.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/d-r-dashboard-logo.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/d-r-icon-advanced.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/d-r-icon-arrow-down.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/d-r-icon-calendar.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/d-r-icon-delete-hover.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/d-r-icon-delete.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/d-r-icon-edit.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/d-r-icon-feature-1.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/d-r-icon-feature-2.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/d-r-pass-visible.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/delete-number.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-dropdown/drop-down-icon-create-account.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-dropdown/drop-down-icon-settings.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-dropdown/drop-down-icon-sign-out.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-dropdown/drop-down-icon-sub-accounts.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-navbar/d-r-icon-apps-selected.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-navbar/d-r-icon-apps.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-navbar/d-r-icon-clients-selected.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-navbar/d-r-icon-clients.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-navbar/d-r-icon-home-selected.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-navbar/d-r-icon-home.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-navbar/d-r-icon-logs-selected.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-navbar/d-r-icon-logs.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-navbar/d-r-icon-numbers-selected.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-navbar/d-r-icon-numbers.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-navbar/d-r-icon-olympus-selected.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-navbar/d-r-icon-olympus.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-navbar/d-r-icon-v-d-selected.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/icons-navbar/d-r-icon-v-d.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/restcomm-dashboard-inside.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/restcomm-dashboard.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/s-m-facebook.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/s-m-google+.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/s-m-linkedin.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/s-m-twitter.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/s-m-youtube.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/search-button-hover.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/search-button.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/search-icon-light-blue.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/search-icon.png A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/telestax-footer.png M restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/numbers-incoming.js M restcomm/restcomm.ui/src/main/webapp/resources/js/directives.js M restcomm/restcomm.ui/src/main/webapp/resources/js/restcommApps/services.js M restcomm/restcomm.ui/src/main/webapp/resources/js/services.js M restcomm/restcomm.ui/src/main/webapp/templates/navbar.html M restcomm/restcomm.ui/src/main/webapp/templates/rc-endpoint-url.html M restcomm/restcomm.ussd/pom.xml Log Message: ----------- Merge branch 'master' into forever3000-master and resolved conflicts after AdminUI revamp Commit: 2eac59d2458b5d6e0dec43cbfb7d11bcc6da8b68 https://github.com/RestComm/Restcomm-Connect/commit/2eac59d2458b5d6e0dec43cbfb7d11bcc6da8b68 Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com> Date: 2017-01-09 (Mon, 09 Jan 2017) Changed paths: M restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java M restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Call.java M restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java M restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationTest.java Log Message: ----------- Merge branch 'master' into forever3000-master Compare: https://github.com/RestComm/Restcomm-Connect/compare/f7f1b7ffb8ef^...2eac59d2458b -- --- 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.