Commit graph

21 commits

Author SHA1 Message Date
tobiasKaminsky
9052abd9dd
rename "foldersync" -> "syncedFolder(s)" 2017-08-08 12:59:34 +02:00
tobiaskaminsky
da497abdb6
move/copy drawer icons 2017-05-18 12:20:55 +02:00
tobiasKaminsky
de9aa39c87
logout button in drawer 2017-04-27 09:19:11 +02:00
Mario Đanić
19705ff438 Merge branch 'master' into externalLinks 2017-04-20 22:37:56 +02:00
AndyScherzinger
cf7ccdfc65
Merge branch 'master' of https://github.com/nextcloud/android into contactBackupRestore
# Conflicts:
#	src/main/res/values/strings.xml
2017-04-19 23:38:31 +02:00
AndyScherzinger
cb8c8caf7d
WiP activity for notifications 2017-04-19 15:54:49 +02:00
tobiasKaminsky
35e683546c
contact backup & import 2017-04-18 08:23:55 +02:00
tobiasKaminsky
a5c2cc0fb6
display external links, disabled by default
stored in database
2017-04-06 11:45:54 +02:00
AndyScherzinger
ed771603ef
menu ordering 2017-03-31 11:09:33 +02:00
AndyScherzinger
a0f1b15b81
add proper star icon for menus 2017-03-31 11:02:44 +02:00
AndyScherzinger
6b2e0f54ce
fix menu 2017-03-31 10:07:20 +02:00
AndyScherzinger
3d17ac886b
Merge branch 'master' of https://github.com/nextcloud/android into favourites
# Conflicts:
#	build.gradle
#	src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
#	src/main/res/menu/drawer_menu.xml
2017-03-31 01:57:38 +02:00
Mario Danic
a57cb2e368 Working on everything 2017-03-30 12:10:11 +02:00
AndyScherzinger
95e90cbeae
initial menu add and empty activity 2017-03-27 11:38:52 +02:00
Mario Danic
3058682268
Continue work 2017-03-14 21:59:27 +01:00
Mario Danic
b0700a38e9
Progress on all fronts 2017-03-14 21:59:23 +01:00
Mario Danic
b0835b981f
Significant progress on various things 2017-03-14 21:59:22 +01:00
Mario Danic
bb3dfac2d4
Some progress on search 2017-03-14 21:59:21 +01:00
Mario Danic
40913110f0 Rename the variable 2017-02-25 02:44:31 +01:00
Mario Danic
0110e54ebe Add new customization options 2017-02-25 02:44:31 +01:00
Mario Danic
16f1243da6 Fix project structure and prepare for branding 2017-02-25 02:44:31 +01:00
Renamed from res/menu/drawer_menu.xml (Browse further)