Commit graph

7 commits

Author SHA1 Message Date
fd5c8d5ad3 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
2016-07-10 16:34:29 +03:00
Matan Bar Yosef
208351bd26 - likes system fixed and modified on map 2016-07-10 14:55:05 +03:00
2ff762fced Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
#	app/src/main/res/layout/fragment_personal.xml
2016-07-09 21:29:37 +03:00
Matan Bar Yosef
8c4b5fbd9b - note display full modified
- added avatar image class and implemented on map on note display (personal and map views)
2016-07-09 01:50:49 +03:00
867dc7d877 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
2016-07-08 03:20:03 +03:00
1caf758344 Merged Arans Map Code to Master 2016-07-06 22:14:41 +03:00
4f544308fb added skeleton for map 2016-07-04 01:01:20 +03:00
Renamed from .idea/libraries/animated_vector_drawable_23_3_0.xml (Browse further)