Aran Zaiger 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
..
GmapFragment.java	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-08 03:20:03 +03:00
GPSUtils.java	The Big Merge - Fixed Conflicts - Needs Cleaning	2016-07-06 14:00:51 +03:00
HeavyWorker.java	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-08 00:16:47 +03:00
ListAdapter.java	Added Animations To List View :)	2016-07-08 00:04:46 +03:00
LoginActivity.java	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-08 00:16:47 +03:00
LruBitmapCache.java	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-08 00:16:47 +03:00
MainActivity.java	Added Utils.URLtoImageView	2016-07-08 02:35:50 +03:00
MarkerNoteStruct.java	added MarkerNoteStruct and dialog box for note in map	2016-07-08 02:05:58 +03:00
Note.java	added note ownerId	2016-07-08 02:40:10 +03:00
PersonalFragment.java	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-08 03:20:03 +03:00
RegisterActivity.java	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-08 00:16:47 +03:00
SplashActivity.java	Created User Class.	2016-07-07 23:40:25 +03:00
User.java	Nav Avater - Changes	2016-07-08 01:09:29 +03:00
Utils.java	Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android	2016-07-08 03:20:03 +03:00
VolleyUtilSingleton.java	added map Features	2016-07-07 23:41:16 +03:00