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

147 commits

Author SHA1 Message Date
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
fc0b4dda2c 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 15:29:14 +03:00
Aran Zaiger
555805b320 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 15:24:54 +03:00
Aran Zaiger
1745ea0112 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 15:24:37 +03:00
Aran Zaiger
b339b72687 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 15:24:23 +03:00
Matan Bar Yosef
0c2e3f852b Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 15:23:54 +03:00
Matan Bar Yosef
de79c90836 - unlike icon added 2016-07-10 15:23:36 +03:00
Aran Zaiger
f07af145c9 added circle to map 2016-07-10 15:21:01 +03:00
Aran Zaiger
c984336a95 added filters to explore view 2016-07-10 15:20:41 +03:00
Sagi Dayan
a3ed2037b3 Merge branch 'master' of github.com:sagidayan/TheSocialNotework-Android 2016-07-10 15:17:49 +03:00
Sagi Dayan
fe6306af75 Movin fragment container to the proper place 2016-07-10 15:16:11 +03:00
Matan Bar Yosef
e5d126aeae Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 14:55:14 +03:00
Matan Bar Yosef
208351bd26 - likes system fixed and modified on map 2016-07-10 14:55:05 +03:00
Sagi Dayan
c5ffa81c3b Merge branch 'master' of github.com:sagidayan/TheSocialNotework-Android 2016-07-10 14:23:18 +03:00
Sagi Dayan
c3054ba127 Action bar settings button 2016-07-10 14:23:11 +03:00
Aran Zaiger
2462975975 updated filters view on all screens 2016-07-10 14:02:13 +03:00
Aran Zaiger
9c10a0dc26 added dialog "displayNote" in explore view 2016-07-10 13:55:25 +03:00
Aran Zaiger
5e23dd9789 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 13:19:35 +03:00
Aran Zaiger
a07934595c remove "newNote" dialog title 2016-07-10 13:19:07 +03:00
Aran Zaiger
21bf1c7b9d finished filters on gmap 2016-07-10 13:18:39 +03:00
Sagi Dayan
e7565ce98b New Note UI Fixes 2016-07-10 13:11:12 +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
db4af0dc2e - filters added on explore mode 2016-07-09 21:21:12 +03:00
Matan Bar Yosef
ce683b3191 - note_view_full modified 2016-07-09 21:03:16 +03:00
Matan Bar Yosef
9ffd24c101 - trash icon position fixed 
- layout note_display_full modified
 2016-07-09 20:47:33 +03:00
Matan Bar Yosef
9a7680c489 - filters do not take space anymore when they are invisible 2016-07-09 20:00:20 +03:00
Matan Bar Yosef
1f866ae494 - fragment_explore list align 2016-07-09 19:47:39 +03:00
Matan Bar Yosef
4fe2a0ab51 - note_display_full width bug fixed 2016-07-09 19:33:05 +03:00
Sagi Dayan
59a2504220 Explore works - Need filtering 2016-07-09 19:21:34 +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
86352c8669 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-09 19:04:27 +03:00
Matan Bar Yosef
c6184f1b97 - filter text changed 2016-07-09 19:04:11 +03:00
Sagi Dayan
9651eba02c Fixed Personal title when coming back to the fragment 2016-07-09 18:35:06 +03:00
Sagi Dayan
7b0856e903 Settings: UI tweak 2016-07-09 18:33:38 +03:00
Sagi Dayan
f4b86eb628 Button collor in the settings 2016-07-09 18:31:43 +03:00
Sagi Dayan
f7abe47671 Merge branch 'master' of github.com:sagidayan/TheSocialNotework-Android 2016-07-09 18:31:06 +03:00
Sagi Dayan
1a7f177cd2 Fixed The Fucking Email Buggit push 2016-07-09 18:28:31 +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
cba527375e Cleaning 2016-07-09 17:46:18 +03:00
Sagi Dayan
681f40d2e7 Cleaned repetitive code 2016-07-09 17:38:54 +03:00
Sagi Dayan
089e2c6966 Settings Small fix 2016-07-09 04:20:56 +03:00
Sagi Dayan
c1e05033d5 Settings - Changes users password + Photo 2016-07-09 04:19:00 +03:00