Commit graph

105 commits

Author SHA1 Message Date
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