Branch: refs/heads/rvdras_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


Compare: 
https://github.com/Mobicents/RestComm/compare/feee936d7d36^...bfa797b6a76c

-- 

--- 
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