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

167 commits

Author SHA1 Message Date
Aran Zaiger
ffe73a159e Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 17:57:54 +03:00
Matan Bar Yosef
9273c8a35e Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 17:57:28 +03:00
Matan Bar Yosef
65b0e1dfb3 - documentation added 2016-07-10 17:57:21 +03:00
Aran Zaiger
871b8dc75c Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 17:56:55 +03:00
Aran Zaiger
76f582d864 added Documentation 2016-07-10 17:56:36 +03:00
Sagi Dayan
aae20aa1cc Docs 2016-07-10 17:50:26 +03:00
Matan Bar Yosef
2ca32ca356 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 17:26:54 +03:00
Matan Bar Yosef
9a2fd3194d - filters map fixed 2016-07-10 17:26:45 +03:00
Sagi Dayan
1e092db5f7 ExplorFragment Doc 2016-07-10 17:24:15 +03:00
Sagi Dayan
22bb04b0d2 Changed Update toast text 2016-07-10 17:19:30 +03:00
Aran Zaiger
3a9df2db68 change zoom default 2016-07-10 17:14:07 +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
bf397919ef Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-10 17:11:16 +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
Sagi Dayan
990be679f7 Clean 2016-07-10 17:09:04 +03:00
Sagi Dayan
6cd2624ec2 Merge branch 'master' of github.com:sagidayan/TheSocialNotework-Android 2016-07-10 17:05:03 +03:00
Sagi Dayan
d24176ec47 Smaller Images 2016-07-10 17:04:57 +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
Matan Bar Yosef
58519d2431 - likes on explore implemented 
- likes on explore update the list as well
 2016-07-10 16:14:35 +03:00
Sagi Dayan
b2c68a11a7 Merge branch 'master' of github.com:sagidayan/TheSocialNotework-Android 2016-07-10 15:35:50 +03:00
Sagi Dayan
1009fe2467 Black like button + less threads 2016-07-10 15:35:41 +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