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

36 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
Matan Bar Yosef 208351bd26 - likes system fixed and modified on map 2016-07-10 14:55:05 +03:00
Aran Zaiger 2ff762fced 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:37 +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 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
Aran Zaiger 26c272fbe5 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:06:21 +03:00
Sagi Dayan 1caf758344 Merged Arans Map Code to Master 2016-07-06 22:14:41 +03:00
Aran Zaiger 2ca5d59ee2 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	.idea/libraries/animated_vector_drawable_23_3_0.xml
#	.idea/libraries/appcompat_v7_23_3_0.xml
#	.idea/libraries/design_23_3_0.xml
#	.idea/libraries/recyclerview_v7_23_3_0.xml
#	.idea/libraries/support_annotations_23_4_0.xml
#	.idea/libraries/support_v4_23_3_0.xml
#	.idea/libraries/support_vector_drawable_23_3_0.xml
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/values/strings.xml
 2016-07-06 20:30:57 +03:00
Sagi Dayan d85693d54f The Big Merge - Fixed Conflicts - Needs Cleaning 2016-07-06 14:00:51 +03:00
Aran Zaiger d57f338207 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	.idea/libraries/animated_vector_drawable_23_3_0.xml
#	.idea/libraries/appcompat_v7_23_3_0.xml
#	.idea/libraries/design_23_3_0.xml
#	.idea/libraries/recyclerview_v7_23_3_0.xml
#	.idea/libraries/support_annotations_23_4_0.xml
#	.idea/libraries/support_v4_23_3_0.xml
#	.idea/libraries/support_vector_drawable_23_3_0.xml
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/values/strings.xml
 2016-07-04 23:11:10 +03:00
Sagi Dayan 002199a076 New Style - Fixed some layout issues 2016-07-04 17:54:05 +03:00
Aran Zaiger 15fce6daa2 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	.idea/libraries/animated_vector_drawable_23_3_0.xml
#	.idea/libraries/appcompat_v7_23_3_0.xml
#	.idea/libraries/design_23_3_0.xml
#	.idea/libraries/recyclerview_v7_23_3_0.xml
#	.idea/libraries/support_annotations_23_4_0.xml
#	.idea/libraries/support_v4_23_3_0.xml
#	.idea/libraries/support_vector_drawable_23_3_0.xml
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/values/strings.xml
 2016-07-04 01:05:52 +03:00
Aran Zaiger 4f544308fb added skeleton for map 2016-07-04 01:01:20 +03:00
Matan Bar Yosef 5d2f040179 - add register activity and redirect to login after registration is successfully done 2016-07-03 23:25:58 +03:00
Aran Zaiger e6af9bce68 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-03 16:41:21 +03:00
Aran Zaiger c27d2aadf9 UI improve in Display Note 2016-07-03 16:41:11 +03:00
Matan Bar Yosef aef9568ba6 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	.idea/libraries/animated_vector_drawable_23_3_0.xml
#	.idea/libraries/appcompat_v7_23_3_0.xml
#	.idea/libraries/design_23_3_0.xml
#	.idea/libraries/recyclerview_v7_23_3_0.xml
#	.idea/libraries/support_annotations_23_3_0.xml
#	.idea/libraries/support_v4_23_3_0.xml
#	.idea/libraries/support_vector_drawable_23_3_0.xml
#	app/src/main/res/values/strings.xml
 2016-07-03 16:07:27 +03:00
Matan Bar Yosef 145fc0d76f Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/AndroidManifest.xml

- splash JPG added
 2016-07-03 15:55:10 +03:00
Aran Zaiger 0817d86fce Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-03 15:26:36 +03:00
Sagi Dayan 77970845cb New Login Look 2016-07-03 15:17:11 +03:00
Matan Bar Yosef a3525d06d0 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	app/src/main/AndroidManifest.xml

- splash screen added and modified
 2016-07-03 14:33:02 +03:00
Aran Zaiger 52f7808a70 added limitation in adding note 2016-07-03 14:32:08 +03:00
Aran Zaiger 8c711b6cf5 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 2016-07-03 12:52:10 +03:00
Aran Zaiger 89fc1fe4b3 fix to geodecoder crash 2016-07-03 12:51:51 +03:00
Matan Bar Yosef 394a32dac4 - fixed validation for null users 2016-07-02 21:21:16 +03:00
Aran Zaiger 19bde85244 added runtime internet permission request 2016-07-02 20:18:19 +03:00
Matan Bar Yosef fe3ffda650 - login button id bug fix 
- register button (in-progress)
 2016-07-02 17:03:47 +03:00
aranzaiger 87ed78c680 change in volley post function 2016-07-02 16:55:44 +03:00
Matan Bar Yosef 49785a5608 - constants added to the project (in-progress a constant file will be added soon)) 2016-07-02 15:27:01 +03:00
aranzaiger 41b4b47a36 integrated new note dialog 2016-07-01 18:45:31 +03:00
Matan Bar Yosef fccbfe9346 - added throw button to note_view_full 
- ui layout modify
 2016-07-01 17:51:52 +03:00
aranzaiger a935dc7ef3 change new note dialog 
now matches parent
 2016-07-01 17:09:38 +03:00
aranzaiger e341fe119d Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android 
# Conflicts:
#	.idea/gradle.xml
#	.idea/libraries/animated_vector_drawable_23_3_0.xml
#	.idea/libraries/appcompat_v7_23_3_0.xml
#	.idea/libraries/design_23_3_0.xml
#	.idea/libraries/recyclerview_v7_23_3_0.xml
#	.idea/libraries/support_annotations_23_3_0.xml
#	.idea/libraries/support_v4_23_3_0.xml
#	.idea/libraries/support_vector_drawable_23_3_0.xml
#	app/src/main/res/layout/note_view_full.xml
#	build.gradle
 2016-07-01 17:04:06 +03:00
aranzaiger cc97ac17a1 added personalSpaceActivity and Note 2016-07-01 16:34:32 +03:00
Matan Bar Yosef 944d1d91fa - added new layout - note_view_full 2016-07-01 16:21:19 +03:00
Sagi Dayan 8e9c0f7397 Bare Android Project 2016-07-01 14:11:36 +03:00