Merge branch 'release-0.23'

Author: longsleep

.hound.yml

@@ -2,3 +2,7 @@ java_script:
   enabled: true
   config_file: .jshint
   ignore_file: .javascript_ignore
+
+scss:
+  enabled: true
+  config_file: .scss.yml

.travis.yml

@@ -9,16 +9,16 @@ go:
   - tip
 
 env:
-  - GEM_HOME=/var/lib/gems/1.8
+  - GEM_HOME=/var/lib/gems/1.9.1
 
 before_install:
   - sudo add-apt-repository -y ppa:chris-lea/node.js
   - sudo apt-get update
 
 install:
-  - sudo apt-get -y install nodejs rubygems python-babel
-  - sudo gem install oj
-  - sudo gem install compass
+  - sudo apt-get -y install nodejs python-babel ruby1.9.1-dev
+  - sudo gem1.9.1 install compass
+  - sudo gem1.9.1 install scss-lint
   - npm install
 
 script:

Makefile.am

@@ -95,6 +95,9 @@ styles: fonts
 styleshint:
 	cd $(CURDIR)/src/styles && $(MAKE) styleshint
 
+styleslint:
+	cd $(CURDIR)/src/styles && $(MAKE) styleslint
+
 jshint:
 	@if [ "$(JSHINT)" = "" ]; then echo "Command 'jshint' not found"; exit 1; fi
 	$(FIND) static/ -wholename static/js/libs -prune -o -name "*.js" -print0 | xargs -0 -n1 $(JSHINT) --config .jshint

README.md

@@ -1,9 +1,11 @@
 Spreed WebRTC
 ===================
 
-The latest version of Spreed WebRTC can be found on GitHub:
+Spreed WebRTC implements a WebRTC audio/video call and conferencing server
+and web client.
 
-  https://github.com/strukturag/spreed-webrtc
+The latest version of Spreed WebRTC can be found on GitHub:
+https://github.com/strukturag/spreed-webrtc
 
 
 ## Build prerequisites
@@ -16,119 +18,124 @@ The latest version of Spreed WebRTC can be found on GitHub:
 
 ## Runtime dependencies
 
-  Spreed WebRTC compiles directly to native code and has no
-  external runtime dependencies. See http://golang.org/doc/faq#How_is_the_run_time_support_implemented for details.
+Spreed WebRTC compiles directly to native code and has no
+external runtime dependencies. See [here](http://golang.org/doc/faq#How_is_the_run_time_support_implemented)
+for details.
 
 
 ## Building
 
-  [![Build Status](https://travis-ci.org/strukturag/spreed-webrtc.png?branch=master)](https://travis-ci.org/strukturag/spreed-webrtc)
+[![Build Status](https://travis-ci.org/strukturag/spreed-webrtc.png?branch=master)](https://travis-ci.org/strukturag/spreed-webrtc)
 
-  If you got spreed-webrtc from the git repository, you will first need
-  to run the included `autogen.sh` script to generate the `configure`
-  script.
+If you got spreed-webrtc from the git repository, you will first need
+to run the included `autogen.sh` script to generate the `configure`
+script.
 
-  Configure does try to find all the tools on your system at the standard
-  locations. If the dependencies are somewhere else, add the corresponding
-  parameters to the ./configure call.
+Configure does try to find all the tools on your system at the standard
+locations. If the dependencies are somewhere else, add the corresponding
+parameters to the ./configure call.
 
-  ```bash
-  $ ./configure
-  $ make
+```bash
+$ ./configure
+$ make
   ```
 
 
 ## Build seperately
 
-  Get Go external dependencies first with ``make get``.
+Get Go external dependencies first with ``make get``.
 
-  ```bash
-  $ make assets
-  $ make binary
-  ```
+```bash
+$ make assets
+$ make binary
+```
 
 
 ## Server startup
 
-  ```bash
-  spreed-webrtc-server [OPTIONS]
-  ```
+```bash
+spreed-webrtc-server [OPTIONS]
+```
 
-  Options
+### Options
 
-    -c="./server.conf": Configuration file.
-    -cpuprofile="": Write cpu profile to file.
-    -h=false: Show this usage information and exit.
-    -l="": Log file, defaults to stderr.
-    -memprofile="": Write memory profile to this file.
-    -v=false: Display version number and exit.
+```
+-c="./server.conf": Configuration file.
+-cpuprofile="": Write cpu profile to file.
+-h=false: Show this usage information and exit.
+-l="": Log file, defaults to stderr.
+-memprofile="": Write memory profile to this file.
+-v=false: Display version number and exit.
+```
 
-  An example configuration file can be found in server.conf.in.
+An example configuration file can be found in server.conf.in.
 
 
 ## Usage
 
-  Connect to the server URL and port with a web browser and the
-  web client will launch.
+Connect to the server URL and port with a web browser and the
+web client will launch.
 
 
 ## Development
 
-  To build styles and translations, further dependencies are required.
-  The source tree contains already built styles and translations, so
-  these are only required if you want to make changes.
+To build styles and translations, further dependencies are required.
+The source tree contains already built styles and translations, so
+these are only required if you want to make changes.
 
   - [NodeJS](http://nodejs.org/) >= 0.10.0
   - [Compass](http://compass-style.org/) >= 1.0.0
   - [Sass](http://sass-lang.com/) >= 3.3.0
   - [Babel](http://babel.pocoo.org/)
 
-  The following Node.js modules are required, these may be installed
-  locally by running `npm install` from the project root. Consult the
-  `package.json` file for more details.
+The following Node.js modules are required, these may be installed
+locally by running `npm install` from the project root. Consult the
+`package.json` file for more details.
 
-  - [JSHint](http://www.jshint.com/) >= 2.0.0
   - [autoprefixer](https://www.npmjs.org/package/autoprefixer) >= 1.1
   - [po2json](https://github.com/mikeedwards/po2json)
+  - [JSHint](http://www.jshint.com/) >= 2.0.0
+  - [scss-lint](https://github.com/causes/scss-lint) >= 0.33.0
 
-  Styles can be found in src/styles. Translations are found in src/i18n.
-  Each folder has its own Makefile to build the corresponding files.
+Styles can be found in src/styles. Translations are found in src/i18n.
+Each folder has its own Makefile to build the corresponding files. Check the
+Makefile.am templates for available make targets.
 
 
 ## Running server for development
 
-  Copy the server.conf.in to server.conf.
+Copy the server.conf.in to server.conf.
 
-  Build styles, javascript and binary using make. Then run
-  ``./spreed-webrtc-server``
+Build styles, javascript and binary using make. Then run
+``./spreed-webrtc-server``
 
-  The server runs on http://localhost:8080/ per default.
+The server runs on http://localhost:8080/ per default.
 
-  HTML changes and Go rebuilds need a server restart. Javascript
-  and CSS reload directly.
+HTML changes and Go rebuilds need a server restart. Javascript
+and CSS reload directly.
 
 
 ## Running for production
 
-  Spreed WebRTC should be run through a SSL frontend proxy with
-  support for Websockets. Example configuration for Nginx can be
-  found in `doc/NGINX.txt`.
+Spreed WebRTC should be run through a SSL frontend proxy with
+support for Websockets. Example configuration for Nginx can be
+found in `doc/NGINX.txt`.
 
-  In addion for real work use one also needs a STUN/TURN server
-  configured with shared secret support.
+In addion for real work use one also needs a STUN/TURN server
+configured with shared secret support.
 
-  See https://code.google.com/p/rfc5766-turn-server/ for a free
-  open source TURN server implementation. Make sure to use a recent
-  version (We recommend 3.2). Versions below 2.5 are not supported.
+See https://code.google.com/p/rfc5766-turn-server/ for a free
+open source TURN server implementation. Make sure to use a recent
+version (We recommend 3.2). Versions below 2.5 are not supported.
 
 
 ## Contributing
 
-1. "Fork".
-2. Make a feature branch.
+1. "Fork" develop branch.
+2. Create a feature branch.
 3. Make changes.
 4. Do your commits (run ``make fmt`` and ``make jshint`` before commit).
-5. Send "pull request".
+5. Send "pull request" for develop branch.
 
 
 ## License

configure.ac

@@ -37,6 +37,7 @@ GO_VERSION_MIN=1.1
 NODEJS_VERSION_MIN=0.6.0
 NODEJS_VERSION_STYLES_MIN=0.10.0
 SASS_VERSION_MIN=3.3.0
+SCSS_LINT_VERSION_MIN=0.33.0
 
 AC_CONFIG_SRCDIR([src/app/spreed-webrtc-server/main.go])
 AC_CONFIG_MACRO_DIR([m4])
@@ -123,6 +124,15 @@ else
         SASS_SUPPORT_STYLES=no],[SASS_SUPPORT_STYLES=yes])
 fi
 
+AC_PATH_PROG([SCSS_LINT],scss-lint, [], [$PWD/node_modules/.bin$PATH_SEPARATOR$PATH])
+if test x"${SCSS_LINT}" == x"" ; then
+    AC_MSG_WARN([Please install scss-lint to lint styles.])
+else
+    AC_MSG_CHECKING([for version of scss-lint])
+    SCSS_LINT_VERSION=`$SCSS_LINT --version | $SED 's/^scss-lint //' | $SED 's/ .*//'`
+    AC_MSG_RESULT([$SCSS_LINT_VERSION])
+fi
+
 if test x"${SASS}" != x"" ; then
     AC_MSG_CHECKING([for compass support in sass])
     tempfile=`mktemp -t XXXXXXblah`

debian/changelog

@@ -1,3 +1,17 @@
+spreed-webrtc-server (0.23.6) precise; urgency=low
+
+  * Fixed Youtube module.
+  * Contacts is now a module and can be disabled in server configuration.
+  * Fixed stereo send support.
+  * Improved Firefox support and added support for Firefox 36 and later.
+  * Dropped support for Chrome < 34.
+  * Account button in settings now use button style.
+  * Added support for scss-lint validation.
+  * Text.js was updated.
+  * CPU overuse detection (Chrome) is no longe experimental and now enabled by default.
+
+ -- Simon Eisenmann <[email protected]>  Fri, 20 Feb 2015 18:30:16 +0100
+
 spreed-webrtc-server (0.23.5) precise; urgency=low
 
   * No longer install config file in install target of Makefile. We leave it to the packaging.

package.json

@@ -1,8 +1,8 @@
 {
   "private": true,
   "dependencies": {
-    "jshint": ">= 2.5.5",
     "autoprefixer": ">= 3.1.0",
-    "po2json": ">= 0.3.0"
+    "po2json": ">= 0.3.0",
+    "jshint": ">= 2.5.5"
   }
 }

server.conf.in

@@ -124,6 +124,7 @@ serverRealm = local
 ;screensharing = true
 ;youtube = true
 ;presentation = true
+;contacts = true
 
 [log]
 ;logfile = /var/log/spreed-webrtc-server.log

src/app/spreed-webrtc-server/channelling_api.go

@@ -139,6 +139,9 @@ func (api *channellingAPI) OnIncoming(c ResponseSender, session *Session, msg *D
 			}
 		} else {
 			if msg.Chat.Chat.Status != nil && msg.Chat.Chat.Status.ContactRequest != nil {
+				if !api.Config.WithModule("contacts") {
+					return
+				}
 				if err := api.contactrequestHandler(session, msg.Chat.To, msg.Chat.Chat.Status.ContactRequest); err != nil {
 					log.Println("Ignoring invalid contact request.", err)
 					return
@@ -173,10 +176,14 @@ func (api *channellingAPI) OnIncoming(c ResponseSender, session *Session, msg *D
 		var users []*DataSession
 		switch msg.Sessions.Sessions.Type {
 		case "contact":
-			if userID, err := api.getContactID(session, msg.Sessions.Sessions.Token); err == nil {
-				users = api.GetUserSessions(session, userID)
+			if api.Config.WithModule("contacts") {
+				if userID, err := api.getContactID(session, msg.Sessions.Sessions.Token); err == nil {
+					users = api.GetUserSessions(session, userID)
+				} else {
+					log.Printf(err.Error())
+				}
 			} else {
-				log.Printf(err.Error())
+				log.Printf("Incoming contacts session request with contacts disabled")
 			}
 		case "session":
 			id, err := session.attestation.Decode(msg.Sessions.Sessions.Token)