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 |
|
Tobias Kaminsky
|
ad3bf3c256
|
Update CONTRIBUTING.md
add link to fdroid
|
2017-06-30 15:30:06 +02:00 |
|
tobiaskaminsky
|
158f069435
|
color missing header divider
|
2017-06-30 14:19:44 +02:00 |
|
tobiaskaminsky
|
b41bd77daa
|
accent color: if dark theme then light color, else darker color than primary
|
2017-06-30 14:03:15 +02:00 |
|
tobiaskaminsky
|
4dafe39bba
|
color action bar
|
2017-06-30 14:02:43 +02:00 |
|
tobiasKaminsky
|
ce9d48d08d
|
remove obsolete strings
|
2017-06-30 13:11:00 +02:00 |
|
tobiasKaminsky
|
4d123d0b73
|
fix npe if folder on server does not exist
|
2017-06-30 13:10:59 +02:00 |
|
tobiasKaminsky
|
a5f83d9d02
|
change ui for public release
|
2017-06-30 13:10:59 +02:00 |
|
tobiasKaminsky
|
e049b56c66
|
show "contacts backup" eithen in drawer or settings
|
2017-06-30 13:10:58 +02:00 |
|
AndyScherzinger
|
4dd37f2863
|
codacy: add break to switch statements
|
2017-06-30 13:05:06 +02:00 |
|
tobiaskaminsky
|
ee42373837
|
load file infos only when clicking on activity item
|
2017-06-30 13:02:02 +02:00 |
|
nextcloud-android-bot
|
28cff47275
|
Drone: update Lint results to reflect reduced error/warning count [skip ci]
|
2017-06-30 13:02:02 +02:00 |
|
tobiasKaminsky
|
af094a570f
|
clicking on link in activity list shows correct file/folder
|
2017-06-30 13:01:58 +02:00 |
|
Nextcloud bot
|
baf33b6b17
|
[tx-robot] updated from transifex
|
2017-06-30 00:27:29 +00:00 |
|
Tobias Kaminsky
|
2a57a54b27
|
Update README.md
add dev version link to fdroid
|
2017-06-29 07:46:20 +02:00 |
|
Nextcloud bot
|
b2f99131f2
|
[tx-robot] updated from transifex
|
2017-06-29 00:27:06 +00:00 |
|
nextcloud-android-bot
|
47f981bb26
|
Drone: update Lint results to reflect reduced error/warning count [skip ci]
|
2017-06-28 13:04:18 +00:00 |
|
tobiaskaminsky
|
2cc1487f27
|
adapt import for codacy
|
2017-06-28 14:57:57 +02:00 |
|
tobiaskaminsky
|
3ac7496452
|
- set priority of image processing to higher value
- cancel all pending async tasks when leaving FDA: needs to be done by get.abort() as this is a blocking command and needs to be accessed directly
|
2017-06-28 13:00:09 +02:00 |
|