Skip to content

Initial commit - #1

Open
rwy7 wants to merge 67 commits into
rwy7:masterfrom
igouss:master
Open

Initial commit#1
rwy7 wants to merge 67 commits into
rwy7:masterfrom
igouss:master

Conversation

@rwy7

@rwy7 rwy7 commented Jun 16, 2014

Copy link
Copy Markdown
Owner

No description provided.

dagar and others added 28 commits March 22, 2015 22:04
basic backend deploy info
-remove some of the default text from the webapp
Check for network status.
Conflicts:
	.gitignore
	.idea/.name
	.idea/compiler.xml
	.idea/copyright/profiles_settings.xml
	.idea/encodings.xml
	.idea/gradle.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/scopes/scope_settings.xml
	.idea/vcs.xml
	app/.gitignore
	app/app.iml
	app/build.gradle
	app/proguard-rules.pro
	app/src/main/AndroidManifest.xml
	app/src/main/res/mipmap-hdpi/ic_launcher.png
	app/src/main/res/mipmap-mdpi/ic_launcher.png
	app/src/main/res/mipmap-xhdpi/ic_launcher.png
	app/src/main/res/mipmap-xxhdpi/ic_launcher.png
	app/src/main/res/values-w820dp/dimens.xml
	app/src/main/res/values/dimens.xml
	app/src/main/res/values/strings.xml
	app/src/main/res/values/styles.xml
	build.gradle
	gradle.properties
	gradlew
	gradlew.bat
	settings.gradle
Check for network status.

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
Removed vote state
Removed AsyncTask. Need to rethink it.
 - network of main loop
 - code to getch restaurants from google
 - display crash message
 - use WebHelper everywhere
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants