Commit graph

8085 commits

Author SHA1 Message Date
nextcloud-android-bot
3a73f95b1e Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-08-04 12:50:16 +00:00
Tobias Kaminsky
7eaba89ae3 Merge a1be1064d2 into 75d6de9b7c 2017-08-04 12:46:34 +00:00
tobiasKaminsky
a1be1064d2
Merge remote-tracking branch 'origin/reduceLintErrors' into reduceLintErrors2 2017-08-04 14:46:31 +02:00
tobiasKaminsky
e9f16c1bcf
add lint.xml to ignore invalidPackage from freemarker 2017-08-04 14:46:22 +02:00
nextcloud-android-bot
4752cb4a03 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-08-04 12:04:17 +00:00
Tobias Kaminsky
d55ae20e97 Merge fccf72e7db into 75d6de9b7c 2017-08-04 10:46:53 +00:00
Tobias Kaminsky
fccf72e7db Merge branch 'master' into reduceLintErrors 2017-08-04 12:46:51 +02:00
Andy Scherzinger
75d6de9b7c Merge pull request #1253 from nextcloud/domAPI
Enabling dom storage api
2017-08-03 08:27:18 +01:00
Nextcloud bot
3a00aa8930
[tx-robot] updated from transifex 2017-08-03 00:27:18 +00:00
Nextcloud bot
fc8afbd18e
[tx-robot] updated from transifex 2017-08-02 00:27:56 +00:00
nextcloud-android-bot
28b86fea57 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-08-01 13:04:35 +00:00
Tobias Kaminsky
9ca37d4de6 Merge 58832b176d into 12cd1ba651 2017-08-01 12:03:33 +00:00
tobiasKaminsky
58832b176d
fix: Wrong argument count, format string media_event_done requires 1 but format call supplies 0 2017-08-01 14:03:16 +02:00
nextcloud-android-bot
8f80f7ce57 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-08-01 10:13:11 +00:00
nextcloud-android-bot
abf952c919 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-08-01 10:11:21 +00:00
Tobias Kaminsky
6a71cac2a2 Merge bd897d856c into 12cd1ba651 2017-08-01 10:07:39 +00:00
tobiasKaminsky
bd897d856c
enabling dom storage api 2017-08-01 12:06:52 +02:00
Tobias Kaminsky
393874eab6 Merge da5f6ef7e1 into 12cd1ba651 2017-08-01 09:59:00 +00:00
tobiasKaminsky
da5f6ef7e1
Merge remote-tracking branch 'remotes/origin/master' into reduceErrors 2017-08-01 11:58:23 +02:00
Nextcloud bot
12cd1ba651
[tx-robot] updated from transifex 2017-08-01 09:56:50 +00:00
tobiasKaminsky
e5bbb7101c
Merge remote-tracking branch 'remotes/origin/master' into reduceErrors 2017-08-01 11:31:54 +02:00
tobiasKaminsky
c7d605c9d7
remove path 2017-08-01 11:11:01 +02:00
tobiasKaminsky
fba917684c
Conflict_message does not show file name/remote path so removing 2017-08-01 11:08:42 +02:00
tobiasKaminsky
0dcf16c362
String "Do you not have a server yet?\nClick here to get one from a provider" does not contain name 2017-08-01 10:49:28 +02:00
tobiasKaminsky
6763093efd
fix: AppCompatActivity.invalidateOptionsMenu can only be called from within the same library group (groupId=com.android.support) 2017-08-01 10:37:59 +02:00
tobiasKaminsky
28e7caedda
fix: Call requires API level 23 (current min is 14): isFingerprintReady 2017-08-01 10:30:23 +02:00
tobiasKaminsky
d8cf4f8464
fix: The WIFI_SERVICE must be looked up on the Application context or memory will leak on devices < Android N. Try changing to .getApplicationContext() 2017-08-01 10:08:32 +02:00
Andy Scherzinger
3f87ea011d Merge pull request #1206 from nextcloud/newWebLoginUntrustedCert
On receiving untrusted ssl cert, test if it was previously accepted user
2017-08-01 08:19:18 +01:00
Nextcloud bot
058b7bad6f
[tx-robot] updated from transifex 2017-08-01 00:27:42 +00:00
Nextcloud bot
a4db5bc8de
[tx-robot] updated from transifex 2017-07-31 00:26:22 +00:00
Nextcloud bot
9f8e1a0bac
[tx-robot] updated from transifex 2017-07-30 00:27:41 +00:00
Nextcloud bot
8e43cee7f8
[tx-robot] updated from transifex 2017-07-29 00:28:26 +00:00
Mario Đanić
3baa17f3e5 Merge pull request #1240 from nextcloud/comradekingu-patch-1
Lowercase "groups"
2017-07-28 21:24:09 +02:00
Allan Nordhøy
f70c7fc5a7 Lowercase "groups" 2017-07-28 18:05:45 +02:00
tobiasKaminsky
73a3c1578b
use logger 2017-07-28 14:45:39 +02:00
tobiasKaminsky
52c6ac11fa
on receiving untrusted ssl cert, test if it was previous accepted by user, otherwise cancel 2017-07-28 14:45:39 +02:00
Andy Scherzinger
13b841b67f Merge pull request #1201 from nextcloud/autoUploadCrashIfFilepathIsNull
Auto upload crash if filepath is null
2017-07-28 14:36:48 +02:00
tobiasKaminsky
7986682da6
images can be deleted thus no filepath, but are still in media store.
Failed images are substracted from the "real" count.
2017-07-28 14:25:31 +02:00
tobiasKaminsky
26ab00d989
+ is now also white 2017-07-28 14:25:31 +02:00
Andy Scherzinger
982be34a5f Merge pull request #1203 from nextcloud/fixDepVersions
Split up play services to avoid support version conflict
2017-07-28 14:10:21 +02:00
nextcloud-android-bot
5e09d16563 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-07-28 10:33:46 +00:00
Tobias Kaminsky
a32a6de067 Merge 790652de3f into fc6dee08e9 2017-07-28 10:24:30 +00:00
tobiasKaminsky
790652de3f
comment gms again 2017-07-28 12:24:10 +02:00
tobiasKaminsky
e681b6edbf
change drone uncomment command 2017-07-28 12:24:09 +02:00
tobiasKaminsky
5c9870d3f3
split up play services to avoid support version conflict: All com.android.support libraries must use the exact same version specification (mixing versions can lead to runtime crashes). Found versions 25.0.0, 24.0.0. 2017-07-28 12:24:06 +02:00
Mario Đanić
fc6dee08e9 Merge pull request #1224 from nextcloud/participateUrls
Extract html code and make it non-translatable
2017-07-28 11:50:52 +02:00
nextcloud-android-bot
ebf3d1ca87 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-07-28 07:44:43 +00:00
Tobias Kaminsky
22360f8d5d Merge b0b66c6f8e into f239d52098 2017-07-28 07:26:23 +00:00
tobiasKaminsky
b0b66c6f8e
extract html code and make it non-translatable 2017-07-28 09:26:02 +02:00
Andy Scherzinger
f239d52098 Merge pull request #1208 from nextcloud/dailyBackupString
resolves: #1207 make daily contact backup string translatable
2017-07-28 09:20:42 +02:00