Commit graph

160 commits

Author SHA1 Message Date
tobiasKaminsky
dfbfd051f4
added webview support 2017-04-06 11:45:53 +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
38f1cc0e28
First bits of user info code 2017-03-26 00:51:07 +01:00
AndyScherzinger
2fbc7d05cf
Merge branch 'master' of https://github.com/nextcloud/android into branding 2017-03-14 21:56:31 +01:00
Mario Danic
21e8f5530b Merge branch 'master' into branding 2017-03-06 08:10:16 +01:00
Mario Danic
0ffb67c506 Merge branch 'branding' into bring-branding-to-master
# Conflicts:
#	.drone.yml
#	build.gradle
#	src/main/java/com/owncloud/android/services/SyncedFolderJobService.java
#	src/main/java/com/owncloud/android/services/observer/SyncedFolderObserver.java
#	src/main/java/com/owncloud/android/utils/RecursiveFileObserver.java
2017-03-05 21:09:36 +01:00
Mario Danic
05367bf9ab Fix string 2017-02-25 03:47:31 +01:00
Mario Danic
1052986243 Fix authorities 2017-02-25 03:43:08 +01:00
Mario Danic
16f1243da6 Fix project structure and prepare for branding 2017-02-25 02:44:31 +01:00
Renamed from AndroidManifest.xml (Browse further)