 Aran Zaiger
|
bd992f1beb
|
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:21:29 +03:00 |
|
|
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 |
|
 Sagi Dayan
|
7347bcb8c4
|
Added Utils.URLtoImageView
|
2016-07-08 02:35:50 +03:00 |
|
|
Aran Zaiger
|
f042f9a46b
|
added "avatar" property to Note
|
2016-07-08 00:58:22 +03:00 |
|
|
Aran Zaiger
|
f7eb10433f
|
Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
# Conflicts:
# app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
# app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
|
2016-07-08 00:16:34 +03:00 |
|
|
Aran Zaiger
|
49faa9a8e2
|
created Utils class
migrated functions used all over the app to Utils
|
2016-07-08 00:06:09 +03:00 |
|
|
Sagi Dayan
|
01de134c7a
|
Created User Class.
User is now saved on Login. and then passed as serialised String to the Class.
MainActivity Has getUser()
|
2016-07-07 23:40:25 +03:00 |
|
|
Sagi Dayan
|
4921ffd9e2
|
Deleted Activities (Personal space)
|
2016-07-07 21:57:45 +03:00 |
|
|
Sagi Dayan
|
884e29a1ee
|
Added automatic login - if user exists
|
2016-07-06 20:30:51 +03:00 |
|
|
Sagi Dayan
|
f2b53bc1eb
|
Note List UI Tweaks
|
2016-07-06 19:26:13 +03:00 |
|
|
Sagi Dayan
|
d85693d54f
|
The Big Merge - Fixed Conflicts - Needs Cleaning
|
2016-07-06 14:00:51 +03:00 |
|
|
Sagi Dayan
|
b6111e6b5a
|
Getting Bundle from LoginActivity
|
2016-07-06 12:35:20 +03:00 |
|
|
Sagi Dayan
|
8cca1a447d
|
Navbar experiment
|
2016-07-03 17:33:11 +03:00 |
|