AndyScherzinger
4dfad4b88f
use appcompat classes as parent
2017-07-10 16:44:43 +02:00
AndyScherzinger
bf35562785
Merge branch 'master' of https://github.com/nextcloud/android into userTheming
2017-07-10 14:37:45 +02:00
tobiasKaminsky
a98229d6fa
user server name instead of slogan
2017-07-10 14:17:42 +02:00
tobiasKaminsky
09435b49c9
remove wrong java doc
2017-07-10 13:56:24 +02:00
tobiasKaminsky
ac1984bf42
npe if toolbar null
2017-07-10 13:55:53 +02:00
Nextcloud bot
c493da52de
[tx-robot] updated from transifex
2017-07-10 00:27:56 +00:00
Andy Scherzinger
39ea8ebc27
Merge pull request #1169 from nextcloud/comradekingu-patch-1
...
Spelling and language fixes
2017-07-09 23:09:56 +02:00
Allan Nordhøy
d4de0af079
Spelling and language fixes
...
As per https://oauth.net/2/
Tab removed from:
"Your search returned no files modified
+ <string name="file_list_empty_recently_modified_filter">Search returned no files modified the last 7 days.</string>
- in the last 7 days."
/AutoUpload is now consistent with /InstantUpload
2017-07-09 19:55:36 +02:00
Nextcloud bot
684dde1795
[tx-robot] updated from transifex
2017-07-08 00:27:28 +00:00
tobiasKaminsky
24c198fb32
If file is shared to NC now the correct color is set for the chosen account
2017-07-06 10:06:18 +02:00
Nextcloud bot
0d8b5090af
[tx-robot] updated from transifex
2017-07-06 00:27:38 +00:00
Nextcloud bot
a361088838
[tx-robot] updated from transifex
2017-07-05 00:27:15 +00:00
tobiaskaminsky
434e5315be
Drawer: use primary dark color for active item
2017-07-04 13:02:04 +02:00
tobiaskaminsky
26a1257857
theme folder in receiveFilesActivity
2017-07-04 10:53:43 +02:00
tobiaskaminsky
17fcbc6e89
checkbox in upload files activity
2017-07-04 10:40:23 +02:00
tobiaskaminsky
2ff2eefb9c
checkbox in details screen for set available offline is now themed
2017-07-04 10:19:28 +02:00
tobiaskaminsky
6c3ffc8901
actionbar is always grey
2017-07-04 10:15:28 +02:00
tobiaskaminsky
ebe483b3ef
- fix wrong ref
...
- theme "choose date" button
2017-07-04 10:11:57 +02:00
tobiaskaminsky
b85d7947b1
Merge remote-tracking branch 'remotes/origin/master' into userTheming
2017-07-04 10:03:12 +02:00
Nextcloud bot
cd9b12a99c
[tx-robot] updated from transifex
2017-07-04 00:26:48 +00:00
Nextcloud bot
3603ca1d40
[tx-robot] updated from transifex
2017-07-03 00:27:00 +00:00
Nextcloud bot
5d735a84ca
[tx-robot] updated from transifex
2017-07-02 00:26:31 +00:00
Tobias Kaminsky
0fc61f10cc
Merge pull request #1157 from nextcloud/fixListView
...
URGENT: fix list view by removing wrong breaks
2017-07-01 08:44:01 +02:00
tobiaskaminsky
ac42e07c48
fix list view by removing wrong breaks
2017-07-01 08:27:58 +02:00
Nextcloud bot
8422555e6f
[tx-robot] updated from transifex
2017-07-01 00:27:19 +00:00
AndyScherzinger
c88d9205a2
Merge branch 'master' of https://github.com/nextcloud/android into userTheming
...
# Conflicts:
# scripts/lint/lint-results.txt
# src/main/java/com/owncloud/android/ui/activity/ActivitiesListActivity.java
# src/main/java/com/owncloud/android/ui/activity/FolderSyncActivity.java
# src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java
2017-06-30 22:43:37 +02:00
Andy Scherzinger
72e8888bd2
Merge pull request #1140 from nextcloud/autoUploadWithoutStoragePermission
...
Prevent NPE when disabling "storage permission" and then access auto upload
2017-06-30 22:25:27 +02:00
Andy Scherzinger
0c5f99a935
Merge pull request #1153 from nextcloud/activityListWrongClicks
...
Clicking on link in activity list shows correct file/folder
2017-06-30 22:22:05 +02:00
Mario Đanić
63efe2de4e
Merge pull request #1101 from nextcloud/codacy
...
codacy fixes: add break to switch statements
2017-06-30 20:45:31 +02:00
Mario Đanić
2fe0a9bb9c
Merge pull request #1102 from nextcloud/transactionTooLarge
...
Transaction too large
2017-06-30 20:45:18 +02:00
Mario Đanić
1912f7d6d2
Merge pull request #1103 from nextcloud/disableEmulator
...
Disable emulator as we currently do no instrumented tests
2017-06-30 20:45:04 +02:00
Mario Đanić
157c457d8e
Merge pull request #1119 from nextcloud/removedSDcard
...
Sdcard: test if writable before offering it
2017-06-30 20:43:41 +02:00
Mario Đanić
c2a9fcff27
Merge pull request #1133 from nextcloud/settingsOn4x
...
Fix settings on android 4.x
2017-06-30 20:43:13 +02:00
Mario Đanić
0bfd037f0a
Merge pull request #1149 from nextcloud/stopAsyncTasks
...
Cancel pending thumbnail tasks
2017-06-30 20:41:39 +02:00
Mario Đanić
f9d0fa6ead
Merge pull request #1027 from nextcloud/contactsBackupUI
...
Enhance UI"Contacts backup"
2017-06-30 20:40:07 +02:00
AndyScherzinger
40ad53b126
theme progress wheels notifications/activities
2017-06-30 17:35:59 +02:00
AndyScherzinger
efd009ce2c
theme links in activities
2017-06-30 17:25:30 +02:00
AndyScherzinger
8cafe7c5a3
fix primary button theming for external file reveiving
2017-06-30 17:14:48 +02:00
AndyScherzinger
532ac262bb
Merge branch 'userTheming' of https://github.com/nextcloud/android into userTheming
2017-06-30 17:07:09 +02:00
AndyScherzinger
4e0d2ffd71
fix imports
2017-06-30 17:06:18 +02:00
AndyScherzinger
0d34046375
Fix NPE
2017-06-30 16:59:49 +02:00
nextcloud-android-bot
467c703663
Drone: update Lint results to reflect reduced error/warning count [skip ci]
2017-06-30 14:57:33 +00:00
AndyScherzinger
ca260d5d70
theming for primary button log history
2017-06-30 16:53:12 +02:00
Tobias Kaminsky
f845448491
Merge 04ec5bf7d7 into ad3bf3c256
2017-06-30 14:46:25 +00:00
AndyScherzinger
04ec5bf7d7
Merge branch 'userTheming' of https://github.com/nextcloud/android into userTheming
2017-06-30 16:46:01 +02:00
AndyScherzinger
28a19bb004
move theming to ThemeUtils
2017-06-30 16:45:24 +02:00
nextcloud-android-bot
ec1222b1c9
Drone: update Lint results to reflect reduced error/warning count [skip ci]
2017-06-30 14:13:26 +00:00
Tobias Kaminsky
9e68200880
Merge b3c9b504c3 into ad3bf3c256
2017-06-30 13:58:58 +00:00
AndyScherzinger
b3c9b504c3
SDK is always >= 14
2017-06-30 15:58:47 +02:00
AndyScherzinger
018c136e4b
remove unused code for codacy scan
2017-06-30 15:36:14 +02:00
