JCE-Projects/the-social-notebook-android
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
171 commits 1 branch 0 tags 1.7 MiB
Commit graph

38 commits

Author SHA1 Message Date
Aran Zaiger cf405e21e3 changed max chars in note default to 200 2016-07-12 21:50:48 +03:00
Sagi Dayan aae20aa1cc Docs 2016-07-10 17:50:26 +03:00
Aran Zaiger e9ba4dbddd Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 17:11:55 +03:00
Matan Bar Yosef 2ab96a1cfa - string consts added 
- personal space filter 24 hours fixed
- added documentation
 2016-07-10 17:11:07 +03:00
Aran Zaiger 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
Aran Zaiger 9c10a0dc26 added dialog "displayNote" in explore view 2016-07-10 13:55:25 +03:00
Aran Zaiger a07934595c remove "newNote" dialog title 2016-07-10 13:19:07 +03:00
Aran Zaiger 8ed984a871 added filter logics and colors to map - WiP 2016-07-10 11:05:18 +03:00
Aran Zaiger 9c29617b00 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 10:22:43 +03:00
Aran Zaiger 1a217c6c77 added selected filters colors 2016-07-10 10:22:31 +03:00
Matan Bar Yosef c8d33749f5 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-09 22:20:47 +03:00
Matan Bar Yosef b360b4a1b7 - title not displaying on note_view_full bug fixed 
- note_view_full title text color changed to black
 2016-07-09 22:20:25 +03:00
Aran Zaiger b9e37f88b0 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:26 +03:00
Aran Zaiger 5b33ee7bf5 added filters to personal space 2016-07-09 21:23:55 +03:00
Matan Bar Yosef 9a7680c489 - filters do not take space anymore when they are invisible 2016-07-09 20:00:20 +03:00
Sagi Dayan 2eff535e7e Merge branch 'master' of github.com:sagidayan/TheSocialNotework-Android 2016-07-09 19:14:12 +03:00
Sagi Dayan 01aaf28247 Explore 2016-07-09 19:14:07 +03:00
Matan Bar Yosef c6184f1b97 - filter text changed 2016-07-09 19:04:11 +03:00
Matan Bar Yosef 43c34b9316 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-09 18:26:49 +03:00
Matan Bar Yosef 688602529a - filters added on map and personal space 
- note view mini modified
 2016-07-09 18:20:13 +03:00
Sagi Dayan c1e05033d5 Settings - Changes users password + Photo 2016-07-09 04:19:00 +03:00
Matan Bar Yosef c2fdbc6a22 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-09 02:37:58 +03:00
Aran Zaiger 92138f26bb added permissions checks and handling 2016-07-09 02:24:32 +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
Aran Zaiger c3d445c593 added delete option to user notes on map 2016-07-08 15:21:04 +03:00
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