merge from devel with conflict fixes

.gitignore

@@ -32,7 +32,6 @@ src/github.com/getlantern/autoupdate/_test_app/main.go
 src/github.com/getlantern/autoupdate/_test_app/autoupdate-binary-*
 src/github.com/getlantern/autoupdate/_test_app/main
 src/github.com/getlantern/flashlight/ui/resources.go
-src/github.com/getlantern/flashlight/*.syso
 src/github.com/getlantern/systray/sysdtray.sdf
 src/github.com/getlantern/systray/Debug
 src/github.com/getlantern/systray/Release
@@ -43,7 +42,7 @@ installer-resources/linux/.packaged-lantern.yaml
 installer-resources/darwin/lantern_versioned.dmg.json
 installer-resources/darwin/dmgbackground.png
 installer-resources/darwin/dmgbackground_versioned.svg
-src/github.com/getlantern/lantern-ui/dist
+lantern-ui/dist
 lantern.yaml
 LanternMobileTestbed/app/libs/
 *.apk
@@ -58,8 +57,12 @@ local.properties
 .gradle
 build
 keystore.release.jks
-src/github.com/getlantern/lantern-ui/app/js/revision.js
+lantern-ui/app/js/revision.js
 bns.pfx
 cmd.exe
 lantern-installer*
 src/github.com/getlantern/rotator/test_daily.log
+src/github.com/getlantern/flashlight/app/*.pem
+src/github.com/getlantern/flashlight/app/lantern-9999.99.99.yaml
+src/github.com/getlantern/flashlight/app/obfs4_bridgeline.txt
+src/github.com/getlantern/flashlight/app/obfs4_state.json

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/github.com/getlantern/http-proxy-lantern"]
+	path = src/github.com/getlantern/http-proxy-lantern
+	url = [email protected]:getlantern/http-proxy-lantern.git

.travis.yml

@@ -1,16 +1,26 @@
 language: go
 go:
 - 1.6
+node_js:
+- 5.1
+git:
+    # Handle git submodules ourselves
+    submodules: false
 install:
 - sudo apt-get install make -y
 - go get golang.org/x/tools/cmd/cover
 - go get -v github.com/mattn/goveralls
+before_script:
+- npm install -g gulp-cli
 script:
 - openssl aes-256-cbc -K $encrypted_f217260732a9_key -iv $encrypted_f217260732a9_iv
   -in envvars.bash.enc -out envvars.bash -d
 - make test-and-cover
 after_success:
 - GOPATH=`pwd`:$GOPATH $HOME/gopath/bin/goveralls -coverprofile=profile.cov -service=travis-ci
 before_install:
+- echo -e "machine github.com\n  login $CI_USER_TOKEN" >> ~/.netrc
 - openssl aes-256-cbc -K $encrypted_f217260732a9_key -iv $encrypted_f217260732a9_iv
   -in envvars.bash.enc -out envvars.bash -d
+- sed -i 's/[email protected]:/https:\/\/github.com\//' .gitmodules
+- git submodule update --init --recursive

Makefile

@@ -2,19 +2,22 @@ SHELL := /bin/bash
 
 OSX_MIN_VERSION := 10.9
 
-DOCKER := $(shell which docker 2> /dev/null)
-GO := $(shell which go 2> /dev/null)
-NODE := $(shell which node 2> /dev/null)
-NPM := $(shell which npm 2> /dev/null)
-S3CMD := $(shell which s3cmd 2> /dev/null)
-WGET := $(shell which wget 2> /dev/null)
-RUBY := $(shell which ruby 2> /dev/null)
+get-command = $(shell which="$$(which $(1) 2> /dev/null)" && if [[ ! -z "$$which" ]]; then printf %q "$$which"; fi)
 
-APPDMG := $(shell which appdmg 2> /dev/null)
-SVGEXPORT := $(shell which svgexport 2> /dev/null)
+DOCKER 		:= $(call get-command,docker)
+GO 		:= $(call get-command,go)
+NODE 		:= $(call get-command,node)
+NPM 		:= $(call get-command,npm)
+GULP 		:= $(call get-command,gulp)
+S3CMD 		:= $(call get-command,s3cmd)
+WGET 		:= $(call get-command,wget)
+RUBY 		:= $(call get-command,ruby)
 
-DOCKERMACHINE := $(shell which docker-machine 2> /dev/null)
-BOOT2DOCKER := $(shell which boot2docker 2> /dev/null)
+APPDMG 		:= $(call get-command,appdmg)
+SVGEXPORT 	:= $(call get-command,svgexport)
+
+DOCKERMACHINE 	:= $(call get-command,docker-machine)
+BOOT2DOCKER 	:= $(call get-command,boot2docker)
 
 GIT_REVISION_SHORTCODE := $(shell git rev-parse --short HEAD)
 GIT_REVISION := $(shell git describe --abbrev=0 --tags --exact-match 2> /dev/null || git rev-parse --short HEAD)
@@ -187,26 +190,31 @@ docker-%: system-checks
 all: binaries
 android-dist: genconfig android
 
-$(RESOURCES_DOT_GO): $(NPM)
+$(RESOURCES_DOT_GO): require-npm require-gulp
 	@source setenv.bash && \
-	LANTERN_UI="src/github.com/getlantern/lantern-ui" && \
+	LANTERN_UI="lantern-ui" && \
 	APP="$$LANTERN_UI/app" && \
 	DIST="$$LANTERN_UI/dist" && \
 	echo 'var LANTERN_BUILD_REVISION = "$(GIT_REVISION_SHORTCODE)";' > $$APP/js/revision.js && \
 	git update-index --assume-unchanged $$APP/js/revision.js && \
 	DEST="$@" && \
 	cd $$LANTERN_UI && \
-	npm install && \
+	$(NPM) install && \
 	rm -Rf dist && \
-	gulp build && \
+	$(GULP) build && \
 	cd - && \
-	rm -f bin/tarfs bin/rsrc && \
-	go install github.com/getlantern/tarfs/tarfs && \
+	rm -f bin/tarfs && \
+	go build -o bin/tarfs github.com/getlantern/tarfs/tarfs && \
 	echo "// +build !stub" > $$DEST && \
 	echo " " >> $$DEST && \
-	tarfs -pkg ui $$DIST >> $$DEST && \
+	bin/tarfs -pkg ui $$DIST >> $$DEST
+
+# Generates a syso file that embeds an icon for the Windows executable
+generate-windows-icon:
+	@source setenv.bash && \
+	rm -f bin/rsrc && \
 	go install github.com/akavel/rsrc && \
-	rsrc -ico installer-resources/windows/lantern.ico -o src/github.com/getlantern/flashlight/lantern_windows_386.syso
+  rsrc -ico installer-resources/windows/lantern.ico -o src/github.com/getlantern/flashlight/lantern_windows_386.syso
 
 assets: $(RESOURCES_DOT_GO)
 
@@ -303,6 +311,9 @@ require-mercurial:
 require-node:
 	@if [[ -z "$(NODE)" ]]; then echo 'Missing "node" command.'; exit 1; fi
 
+require-gulp: require-node
+	@if [[ -z "$(GULP)" ]]; then echo 'Missing "gulp" command. Try "npm install -g gulp-cli"'; exit 1; fi
+
 require-npm: require-node
 	@if [[ -z "$(NPM)" ]]; then echo 'Missing "npm" command.'; exit 1; fi
 
@@ -333,11 +344,19 @@ darwin: $(RESOURCES_DOT_GO)
 		echo "-> Skipped: Can not compile Lantern for OSX on a non-OSX host."; \
 	fi
 
+BUILD_RACE := '-race'
+
+ifeq ($(OS),Windows_NT)
+	  # Race detection is not supported by Go Windows 386, so disable it. The -x
+		# is just a hack to allow us to pass something in place of -race below.
+		BUILD_RACE = '-x'
+endif
+
 lantern: $(RESOURCES_DOT_GO)
 	@echo "Building development lantern" && \
-	source setenv.bash && \
 	$(call build-tags) && \
-	CGO_ENABLED=1 go build -race -o lantern -tags="$$BUILD_TAGS" -ldflags="$(LDFLAGS_NOSTRIP) $$EXTRA_LDFLAGS" github.com/getlantern/flashlight/main; \
+	source setenv.bash && \
+	CGO_ENABLED=1 go build $(BUILD_RACE) -o lantern -tags="$$BUILD_TAGS" -ldflags="$(LDFLAGS_NOSTRIP) $$EXTRA_LDFLAGS" github.com/getlantern/flashlight/main; \
 
 package-linux: require-version package-linux-386 package-linux-amd64
 
@@ -477,14 +496,18 @@ create-tag: require-version
 	@git tag -a "$$VERSION" -f --annotate -m"Tagged $$VERSION" && \
 	git push --tags -f
 
+# This target requires a file called testpackages.txt that lists all packages to
+# test, one package per line, with no trailing newline on the last package.
 test-and-cover: $(RESOURCES_DOT_GO)
 	@echo "mode: count" > profile.cov && \
 	source setenv.bash && \
 	if [ -f envvars.bash ]; then \
 		source envvars.bash; \
 	fi && \
-	for pkg in $$(cat testpackages.txt); do \
-		go test -race -v -tags="headless" -covermode=atomic -coverprofile=profile_tmp.cov $$pkg || exit 1; \
+	TP=$$(cat testpackages.txt) && \
+	CP=$$(echo -n $$TP | tr ' ', ',') && \
+	for pkg in $$TP; do \
+		go test -race -v -tags="headless" -covermode=atomic -coverpkg "$$CP" -coverprofile=profile_tmp.cov $$pkg || exit 1; \
 		tail -n +2 profile_tmp.cov >> profile.cov; \
 	done
 

MobileSDK/sdk/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         minSdkVersion 15

PubSub/sdk/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         minSdkVersion 15

README-translations.md

@@ -23,6 +23,8 @@ Check for typo or ambiguity before pushing anything to avoid creating unnecessar
 
 Login to Transifex site to add instructions on specific string to provide its context to translators.
 
+**Note also that Transifex will [automatically pull changes from GitHub once a day](http://docs.transifex.com/faq/#8-can-i-update-source-files-automatically), so you could simply wait for it to automatically update it.**
+
 ##Set up a new project.
 
 See the [Transifex tutorial](http://docs.transifex.com/tutorials/client/).

README.md

@@ -1,4 +1,4 @@
-# lantern [![Travis CI Status](https://travis-ci.org/getlantern/lantern.svg?branch=valencia)](https://travis-ci.org/getlantern/lantern) [![Coverage Status](https://coveralls.io/repos/getlantern/lantern/badge.png?branch=valencia)](https://coveralls.io/r/getlantern/lantern) [![ProjectTalk](http://www.projecttalk.io/images/gh_badge-3e578a9f437f841de7446bab9a49d103.svg?vsn=d)] (http://www.projecttalk.io/boards/getlantern%2Flantern?utm_campaign=gh-badge&utm_medium=badge&utm_source=github)
+# lantern [![Travis CI Status](https://travis-ci.org/getlantern/lantern.svg?branch=devel)](https://travis-ci.org/getlantern/lantern) [![Coverage Status](https://coveralls.io/repos/getlantern/lantern/badge.png?branch=devel)](https://coveralls.io/r/getlantern/lantern) [![ProjectTalk](http://www.projecttalk.io/images/gh_badge-3e578a9f437f841de7446bab9a49d103.svg?vsn=d)] (http://www.projecttalk.io/boards/getlantern%2Flantern?utm_campaign=gh-badge&utm_medium=badge&utm_source=github)
 
 **If you're looking for Lantern installers, you can find all of them at the following links:**
 - [Android](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-beta.apk)
@@ -16,12 +16,14 @@
 
 ### Prerequisites
 
+* An OSX or Linux host. Building on Windows is only partially supported with
+  the help of [Cygwin](https://www.cygwin.com/).
 * [Git](https://git-scm.com/downloads) - `brew install git`, `apt-get install git`, etc
 * [Go 1.6 or higher](https://golang.org/dl/).
 * [GNU Make](https://www.gnu.org/software/make/)
 * [Nodejs & NPM](https://nodejs.org/en/download/package-manager/)
 * GNU C Library (linux only) - `apt-get install libc6-dev-i386`, etc
-* [Gulp](http://gulpjs.com/) - `npm i gulp -g`
+* [Gulp](http://gulpjs.com/) - `npm i gulp-cli -g`
 
 To build and run Lantern desktop, just do:
 
@@ -47,7 +49,8 @@ Building the mobile library and app requires the following:
 1. Install Java JDK 7 or 8
 2. Install Go 1.6 or higher
 3. Install [Android SDK Tools](http://developer.android.com/sdk/index.html#Other)
-4. Install NDK(http://developer.android.com/ndk/downloads/index.html)
+4. Install [NDK](http://developer.android.com/ndk/downloads/index.html)
+5. Install [Gradle](http://gradle.org/)
 
 Make sure to set these environment variables before trying to build any Android
 components (replace the paths based on wherever you've installed the Android
@@ -270,15 +273,15 @@ Go code in Lantern must pass several tests:
 * Go vet
 * Go test -race
 
-You can find a generic [git-hook](https://github.com/getlantern/lantern/blob/valencia/pre-push)
+You can find a generic [git-hook](https://github.com/getlantern/lantern/blob/devel/pre-push)
 file, which can be used as a pre-push (or pre-commit) hook to automatically
 ensure these tests are passed before committing any code. Only Go packages in
 `src/github.com/getlantern` will be tested, and only those that have changes in
 them.
 
 Install by copying it into the local `.git/hooks/` directory, with the `pre-push`
 file name if you want to run it before pushing. Alternatively, you can copy
-[pre-commit.hook](https://github.com/getlantern/lantern/blob/valencia/pre-commit)
+[pre-commit.hook](https://github.com/getlantern/lantern/blob/devel/pre-commit)
 to `pre-commit` to run it before each commit.
 
 ```bash

src/github.com/getlantern/lantern-ui/app/_css/news.css → lantern-ui/app/_css/news.css

@@ -219,3 +219,4 @@
 #news .item:hover p.snippet:after {
   background-color: #eeeeee;
 }
+

src/github.com/getlantern/lantern-ui/app/angular-feed/styles/spinner.css → lantern-ui/app/angular-feed/styles/spinner.css

@@ -45,14 +45,13 @@
 }
 
 .spinner {
-    position:absolute;
+    position:relative;
     height:50px;
     -moz-border-radius:50px;
     -webkit-border-radius: 50px;
     border-radius: 50px;
     float:left;
-    top: 50%;
-    left: 50%;
+    left: 48%;
     -moz-transform:scale(0.5);
     -webkit-transform:scale(0.5);
 }
@@ -67,4 +66,4 @@
 @-webkit-keyframes spinner-fade {
     from {opacity: 1;}
     to {opacity: 0;}
-}
+}