Commit graph

17 commits

Author SHA1 Message Date
813e19632f Settings and photo upload 2016-07-09 03:12:49 +03:00
e0a89d5149 added settings screen
also added camera connection
2016-07-08 14:23:13 +03:00
1caf758344 Merged Arans Map Code to Master 2016-07-06 22:14:41 +03:00
2ca5d59ee2 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
# Conflicts:
#	.idea/libraries/animated_vector_drawable_23_3_0.xml
#	.idea/libraries/appcompat_v7_23_3_0.xml
#	.idea/libraries/design_23_3_0.xml
#	.idea/libraries/recyclerview_v7_23_3_0.xml
#	.idea/libraries/support_annotations_23_4_0.xml
#	.idea/libraries/support_v4_23_3_0.xml
#	.idea/libraries/support_vector_drawable_23_3_0.xml
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/values/strings.xml
2016-07-06 20:30:57 +03:00
f2b53bc1eb Note List UI Tweaks 2016-07-06 19:26:13 +03:00
d85693d54f The Big Merge - Fixed Conflicts - Needs Cleaning 2016-07-06 14:00:51 +03:00
78dad1bd11 Refine UI - Splash + Login 2016-07-05 17:39:20 +03:00
002199a076 New Style - Fixed some layout issues 2016-07-04 17:54:05 +03:00
Matan Bar Yosef
5d2f040179 - add register activity and redirect to login after registration is successfully done 2016-07-03 23:25:58 +03:00
8cca1a447d Navbar experiment 2016-07-03 17:33:11 +03:00
Matan Bar Yosef
145fc0d76f Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
# Conflicts:
#	app/src/main/AndroidManifest.xml

- splash JPG added
2016-07-03 15:55:10 +03:00
Matan Bar Yosef
a3525d06d0 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
# Conflicts:
#	app/src/main/AndroidManifest.xml

- splash screen added and modified
2016-07-03 14:33:02 +03:00
Matan Bar Yosef
32263e8f43 - SplashScreen added 2016-07-03 13:18:23 +03:00
89fc1fe4b3 fix to geodecoder crash 2016-07-03 12:51:51 +03:00
aranzaiger
e393552fea added location logger & json 2016-07-02 00:28:39 +03:00
aranzaiger
cc97ac17a1 added personalSpaceActivity and Note 2016-07-01 16:34:32 +03:00
8e9c0f7397 Bare Android Project 2016-07-01 14:11:36 +03:00