|
|
1caf758344
|
Merged Arans Map Code to Master
|
2016-07-06 22:14:41 +03:00 |
|
|
|
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 |
|
|
|
d85693d54f
|
The Big Merge - Fixed Conflicts - Needs Cleaning
|
2016-07-06 14:00:51 +03:00 |
|
|
|
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 |
|
|
|
002199a076
|
New Style - Fixed some layout issues
|
2016-07-04 17:54:05 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
c27d2aadf9
|
UI improve in Display Note
|
2016-07-03 16:41:11 +03:00 |
|
|
|
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 |
|
|
|
89fc1fe4b3
|
fix to geodecoder crash
|
2016-07-03 12:51:51 +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 |
|
|
|
8e9c0f7397
|
Bare Android Project
|
2016-07-01 14:11:36 +03:00 |
|
