Merge branch 'release-0.24'

Author: longsleep

.travis.yml

@@ -10,7 +10,8 @@ go:
   - tip
 
 env:
-  - GEM_HOME=/var/lib/gems/1.9.1
+  - GEM_HOME=/var/lib/gems/1.9.1 USE_GODEPS=0
+  - GEM_HOME=/var/lib/gems/1.9.1 USE_GODEPS=1
 
 before_install:
   - sudo add-apt-repository -y ppa:chris-lea/node.js
@@ -21,11 +22,13 @@ install:
   - sudo gem1.9.1 install compass
   - sudo gem1.9.1 install scss-lint
   - npm install
+  - if [ "$USE_GODEPS" = "1" ]; then wget https://raw.githubusercontent.com/pote/gpm/v1.3.2/bin/gpm && chmod +x gpm && sudo mv gpm /usr/local/bin; fi
 
 script:
   - ./autogen.sh
   - ./configure
-  - make get
+  - if [ "$USE_GODEPS" = "0" ]; then make get; fi
+  - if [ "$USE_GODEPS" = "1" ]; then make gpm; fi
   - make styleshint
   # TODO(fancycode): enable styleslint once all styles have been fixed
   # - make styleslint

Godeps

@@ -0,0 +1,11 @@
+github.com/gorilla/context						215affda49addc4c8ef7e2534915df2c8c35c6cd
+github.com/gorilla/mux							ba336c9cfb43552c90de6cb2ceedd3271c747558
+github.com/gorilla/securecookie					aeade84400a85c6875264ae51c7a56ecdcb61751
+github.com/gorilla/websocket					6eb6ad425a89d9da7a5549bc6da8f79ba5c17844
+github.com/longsleep/pkac						0.0.1
+github.com/satori/go.uuid						afe1e2ddf0f05b7c29d388a3f8e76cb15c2231ca
+github.com/strukturag/goacceptlanguageparser	goacceptlanguageparser_v100
+github.com/strukturag/httputils					httputils_v012
+github.com/strukturag/phoenix					phoenix_v0131
+github.com/strukturag/sloth						v0.9.2
+code.google.com/p/goconf/...					a4db5c465ed1

Makefile.am

@@ -42,7 +42,7 @@ DIST_BIN := $(DIST)/bin
 
 all: build
 
-build: binary assets
+build: get binary assets
 
 gopath:
 	@echo GOPATH=$(GOPATH)
@@ -59,7 +59,11 @@ endif
 
 getupdate: vendorclean get
 
-binary: get
+gpm:
+	@if [ "$(GPM)" = "" ]; then echo "Command 'gpm' not found"; exit 1; fi
+	$(GPM) install
+
+binary:
 	$(GO) build $(GOBUILDFLAGS) -o bin/$(EXENAME) -ldflags '$(LDFLAGS)' app/$(EXENAME)
 
 binaryrace: GOBUILDFLAGS := $(GOBUILDFLAGS) -race

configure.ac

@@ -57,6 +57,13 @@ AC_PROG_AWK
 
 AC_PATH_PROGS([FIND],[find])
 
+AC_PATH_PROGS([GPM],[gpm])
+if test x"${GPM}" != x"" ; then
+    AC_MSG_CHECKING([for version of gpm])
+    GPM_VERSION=`$GPM version 2>&1 | $SED 's/^>> gpm v//'`
+    AC_MSG_RESULT([$GPM_VERSION])
+fi
+
 AC_PATH_PROG([JSHINT],jshint, [], [$PWD/node_modules/.bin$PATH_SEPARATOR$PATH])
 if test x"${JSHINT}" != x"" ; then
     AC_MSG_CHECKING([for version of jshint])

debian/changelog

@@ -1,3 +1,21 @@
+spreed-webrtc-server (0.24.3) precise; urgency=low
+ 
+  * Removed deprecated API to fix Chromium 47 compatibility.
+  * Improved UI usability for smaller devices.
+  * Increased the width of buddy list and chat.
+  * Cleaned up sized, borders and default colors.
+  * Cleaned up chat ui.
+  * Chat animations no longer comnsume GPU power.
+  * Chat icons are now shown in their proper color again.
+  * Chat arrows are displayed properly again.
+  * Updated WebRTC adapter to latest version (fixing Chromium 45).
+  * Fixed CSP example for Chromium 45 and later.
+  * Added GPM Godebs file to track Golang dependencies.
+  * Fixed a problem where screen sharing streams were not cleaned up.
+  * Added support for custom type dialogs.
+
+ -- Simon Eisenmann <[email protected]>  Tue, 28 Jul 2015 19:22:28 +0200
+
 spreed-webrtc-server (0.24.2) precise; urgency=low
 
   * Fixed javascript load order, so compiled scripts load properly. 

server.conf.in

@@ -118,6 +118,7 @@ serverRealm = local
 ;   img-src 'self' data: blob:;
 ;   connect-src 'self' wss://server:port/ws blob:;
 ;   font-src 'self' data: blob:;
+;   media-src 'self' blob:;
 ;contentSecurityPolicy =
 ; Content-Security-Policy-Report-Only HTTP response header value. Use this
 ; to test your CSP before putting it into production.

src/i18n/messages-de.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spreed WebRTC 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2015-04-30 19:22+0200\n"
-"PO-Revision-Date: 2015-04-30 19:27+0100\n"
+"POT-Creation-Date: 2015-07-08 11:02+0200\n"
+"PO-Revision-Date: 2015-07-08 11:02+0100\n"
 "Last-Translator: Simon Eisenmann <[email protected]>\n"
 "Language-Team: struktur AG <[email protected]>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -365,6 +365,9 @@ msgstr "Standard Raum"
 msgid "Set alternative room to join at start."
 msgstr " Raum wird beim Start automatisch betreten."
 
+msgid "Notification sounds"
+msgstr "Klänge"
+
 msgid "Desktop notification"
 msgstr "Desktop-Benachrichtigung"
 

src/i18n/messages-ja.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spreed WebRTC 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2015-04-30 19:22+0200\n"
+"POT-Creation-Date: 2015-07-08 11:02+0200\n"
 "PO-Revision-Date: 2014-04-23 22:25+0100\n"
 "Last-Translator: Curt Frisemo <[email protected]>\n"
 "Language-Team: Curt Frisemo <[email protected]>\n"
@@ -357,6 +357,10 @@ msgstr "デフォルト・ルーム"
 msgid "Set alternative room to join at start."
 msgstr "スタート時に別のルームに参加する."
 
+#, fuzzy
+msgid "Notification sounds"
+msgstr "デスクトップ通知"
+
 msgid "Desktop notification"
 msgstr "デスクトップ通知"
 

src/i18n/messages-ko.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spreed WebRTC 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2015-04-30 19:22+0200\n"
+"POT-Creation-Date: 2015-07-08 11:02+0200\n"
 "PO-Revision-Date: 2014-04-13 20:30+0900\n"
 "Last-Translator: Curt Frisemo <[email protected]>\n"
 "Language-Team: Curt Frisemo <[email protected]>\n"
@@ -357,6 +357,10 @@ msgstr "기본 방"
 msgid "Set alternative room to join at start."
 msgstr "시작시에 다른 방에 합류하도록 설정 되었습니다"
 
+#, fuzzy
+msgid "Notification sounds"
+msgstr "데스크탑에 통보"
+
 msgid "Desktop notification"
 msgstr "데스크탑에 통보"
 

src/i18n/messages-zh-cn.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spreed WebRTC 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2015-04-30 19:22+0200\n"
+"POT-Creation-Date: 2015-07-08 11:02+0200\n"
 "PO-Revision-Date: 2014-05-21 09:54+0800\n"
 "Last-Translator: Michael P.\n"
 "Language-Team: Curt Frisemo <[email protected]>\n"
@@ -357,6 +357,10 @@ msgstr "系统默认房间"
 msgid "Set alternative room to join at start."
 msgstr "重设初始默认房间"
 
+#, fuzzy
+msgid "Notification sounds"
+msgstr "桌面提醒"
+
 msgid "Desktop notification"
 msgstr "桌面提醒"