Branch: refs/heads/master
Home: https://github.com/Mobicents/RestComm
Commit: feee936d7d3661e2f4fa3906823abb409e7e5980
https://github.com/Mobicents/RestComm/commit/feee936d7d3661e2f4fa3906823abb409e7e5980
Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
Date: 2014-10-30 (Thu, 30 Oct 2014)
Changed paths:
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/RvdConfiguration.java
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/http/RasRestService.java
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/client/SettingsModel.java
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/ras/RasService.java
A
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/ras/exceptions/InvalidRestcommAppPackage.java
R
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/security/RvdResourceFilter.java
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/storage/ProjectStorage.java
M restcomm/restcomm.rvd/src/main/webapp/app.js
M restcomm/restcomm.rvd/src/main/webapp/controllers.js
M restcomm/restcomm.rvd/src/main/webapp/css/rvd.css
M restcomm/restcomm.rvd/src/main/webapp/js/app/directives.js
M restcomm/restcomm.rvd/src/main/webapp/js/app/services.js
M restcomm/restcomm.rvd/src/main/webapp/js/controllers/packaging.js
M restcomm/restcomm.rvd/src/main/webapp/templates/designer.html
M restcomm/restcomm.rvd/src/main/webapp/templates/designerSettingsModal.html
A
restcomm/restcomm.rvd/src/main/webapp/templates/directive/variableLookup.html
M restcomm/restcomm.rvd/src/main/webapp/templates/packaging/form.html
Log Message:
-----------
Manually merged rvd ras-specific code over ghub_rvd_master.
Commit: 207bc2523f2c47f6f36dc94d9637f448aeade89f
https://github.com/Mobicents/RestComm/commit/207bc2523f2c47f6f36dc94d9637f448aeade89f
Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
Date: 2014-10-31 (Fri, 31 Oct 2014)
Changed paths:
M restcomm/restcomm.ui/src/main/webapp/index.html
A
restcomm/restcomm.ui/src/main/webapp/lib/bootstrap-multiselect/css/bootstrap-multiselect.css
A
restcomm/restcomm.ui/src/main/webapp/lib/bootstrap-multiselect/js/bootstrap-multiselect.js
A restcomm/restcomm.ui/src/main/webapp/lib/file-upload/FileAPI.flash.swf
A restcomm/restcomm.ui/src/main/webapp/lib/file-upload/FileAPI.min.js
A
restcomm/restcomm.ui/src/main/webapp/lib/file-upload/angular-file-upload-html5-shim.min.js
A
restcomm/restcomm.ui/src/main/webapp/lib/file-upload/angular-file-upload-shim.min.js
A
restcomm/restcomm.ui/src/main/webapp/lib/file-upload/angular-file-upload.min.js
A restcomm/restcomm.ui/src/main/webapp/lib/ng-password-strength/css/main.css
A
restcomm/restcomm.ui/src/main/webapp/lib/ng-password-strength/js/ng-password-strength.js
A
restcomm/restcomm.ui/src/main/webapp/lib/ng-password-strength/js/ng-password-strength.min.js
A restcomm/restcomm.ui/src/main/webapp/lib/ng-password-strength/js/vendor.js
A restcomm/restcomm.ui/src/main/webapp/lib/underscore/underscore.js
A restcomm/restcomm.ui/src/main/webapp/lib/underscore/underscore.string.js
A restcomm/restcomm.ui/src/main/webapp/lib/world-flags/images/flags16.png
A restcomm/restcomm.ui/src/main/webapp/lib/world-flags/images/flags32.png
A
restcomm/restcomm.ui/src/main/webapp/lib/world-flags/stylesheets/flags16.css
A
restcomm/restcomm.ui/src/main/webapp/lib/world-flags/stylesheets/flags16.scss
A
restcomm/restcomm.ui/src/main/webapp/lib/world-flags/stylesheets/flags32.css
A
restcomm/restcomm.ui/src/main/webapp/lib/world-flags/stylesheets/flags32.scss
M restcomm/restcomm.ui/src/main/webapp/modules/login.html
M
restcomm/restcomm.ui/src/main/webapp/modules/modals/modal-register-account.html
A
restcomm/restcomm.ui/src/main/webapp/modules/numbers-incoming-register.html
M restcomm/restcomm.ui/src/main/webapp/modules/numbers-incoming.html
M restcomm/restcomm.ui/src/main/webapp/modules/profile.html
A restcomm/restcomm.ui/src/main/webapp/modules/rappmanager-config.html
A restcomm/restcomm.ui/src/main/webapp/modules/rappmanager.html
M restcomm/restcomm.ui/src/main/webapp/resources/css/restcomm.css
M
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/numbers-incoming.js
A
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/rappmanager.js
M restcomm/restcomm.ui/src/main/webapp/resources/js/restcomm.js
M restcomm/restcomm.ui/src/main/webapp/resources/js/services.js
A restcomm/restcomm.ui/src/main/webapp/resources/json/area-codes.json
A restcomm/restcomm.ui/src/main/webapp/resources/json/available.json
A restcomm/restcomm.ui/src/main/webapp/resources/json/countries.json
M restcomm/restcomm.ui/src/main/webapp/templates/rc-numbers-pills.html
Log Message:
-----------
Manually merged latest AdminUI additions from master
Commit: bfa797b6a76c6f0179b380ec51817b9a0dc90810
https://github.com/Mobicents/RestComm/commit/bfa797b6a76c6f0179b380ec51817b9a0dc90810
Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
Date: 2014-10-31 (Fri, 31 Oct 2014)
Changed paths:
M restcomm/restcomm.ui/src/main/webapp/index.html
M restcomm/restcomm.ui/src/main/webapp/modules/rappmanager-config.html
M restcomm/restcomm.ui/src/main/webapp/modules/rappmanager.html
M restcomm/restcomm.ui/src/main/webapp/resources/css/restcomm.css
M
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/rappmanager.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:
-----------
Manually merged latest RAS additions to AdminUI
Commit: e709b826f98d9ec1eb21180e740e4a84ed57ce28
https://github.com/Mobicents/RestComm/commit/e709b826f98d9ec1eb21180e740e4a84ed57ce28
Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
Date: 2014-11-03 (Mon, 03 Nov 2014)
Changed paths:
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/RvdConfiguration.java
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/interpreter/Interpreter.java
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/security/AuthenticationService.java
Log Message:
-----------
Merge branch 'ghub_rvd_master' into ghub_rvdras_master
Commit: 27a64139dac89713d2547f72f7d54b717b9f7814
https://github.com/Mobicents/RestComm/commit/27a64139dac89713d2547f72f7d54b717b9f7814
Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
Date: 2014-11-03 (Mon, 03 Nov 2014)
Changed paths:
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/dial/ClientDialNoun.java
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/dial/ConferenceDialNoun.java
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/dial/NumberDialNoun.java
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/dial/SipuriDialNoun.java
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/fax/FaxStep.java
M restcomm/restcomm.rvd/src/main/webapp/js/app/directives.js
M restcomm/restcomm.rvd/src/main/webapp/js/app/services.js
M
restcomm/restcomm.rvd/src/main/webapp/templates/directive/variableLookup.html
M restcomm/restcomm.rvd/src/main/webapp/templates/steps/dialStep.html
M
restcomm/restcomm.rvd/src/main/webapp/templates/steps/externalServiceStep.html
M restcomm/restcomm.rvd/src/main/webapp/templates/steps/faxStep.html
M restcomm/restcomm.rvd/src/main/webapp/templates/steps/gatherStep.html
M restcomm/restcomm.rvd/src/main/webapp/templates/steps/playStep.html
M restcomm/restcomm.rvd/src/main/webapp/templates/steps/sayStep.html
M restcomm/restcomm.rvd/src/main/webapp/templates/steps/smsStep.html
M restcomm/restcomm.rvd/src/main/webapp/templates/steps/ussdCollectStep.html
M restcomm/restcomm.rvd/src/main/webapp/templates/steps/ussdSayStep.html
Log Message:
-----------
Merge branch 'ghub_rvd_master' into ghub_rvdras_master
Conflicts:
restcomm/restcomm.rvd/src/main/webapp/js/app/directives.js
restcomm/restcomm.rvd/src/main/webapp/js/app/services.js
restcomm/restcomm.rvd/src/main/webapp/templates/directive/variableLookup.html
Commit: cbce14b6d34ee6ac16a72891d455ee27d0e6df4f
https://github.com/Mobicents/RestComm/commit/cbce14b6d34ee6ac16a72891d455ee27d0e6df4f
Author: Orestis Tsakiridis <orestis.tsakiri...@telestax.com>
Date: 2014-11-04 (Tue, 04 Nov 2014)
Changed paths:
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/RvdConfiguration.java
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/http/RasRestService.java
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/client/SettingsModel.java
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/ras/RasService.java
A
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/ras/exceptions/InvalidRestcommAppPackage.java
R
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/security/RvdResourceFilter.java
M
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/storage/ProjectStorage.java
M restcomm/restcomm.rvd/src/main/webapp/app.js
M restcomm/restcomm.rvd/src/main/webapp/controllers.js
M restcomm/restcomm.rvd/src/main/webapp/css/rvd.css
M restcomm/restcomm.rvd/src/main/webapp/js/app/services.js
M restcomm/restcomm.rvd/src/main/webapp/js/controllers/packaging.js
M restcomm/restcomm.rvd/src/main/webapp/templates/designer.html
M restcomm/restcomm.rvd/src/main/webapp/templates/designerSettingsModal.html
M restcomm/restcomm.rvd/src/main/webapp/templates/packaging/form.html
M restcomm/restcomm.ui/src/main/webapp/index.html
M restcomm/restcomm.ui/src/main/webapp/modules/rappmanager-config.html
M restcomm/restcomm.ui/src/main/webapp/modules/rappmanager.html
M restcomm/restcomm.ui/src/main/webapp/resources/css/restcomm.css
M
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/rappmanager.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:
-----------
Merged RAS-specific code into master
Compare:
https://github.com/Mobicents/RestComm/compare/167bf7aee653...cbce14b6d34e
--
---
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.
