2454 Commits

Author SHA1 Message Date
Sean Mac Gillicuddy
97edd97d25 #1292 Rewrite of LanguageActivity 2019-07-18 12:51:01 +01:00
macgills
6ed73447c1
Merge pull request #1287 from kiwix/feature/macgills/update-docs
Update commitstyle and contributing
2019-07-16 14:58:20 +01:00
macgills
0ebd592d6f
Merge pull request #1284 from kiwix/feature/jhbiggs/#973-bottom-toolbar
Feature/jhbiggs/#973 bottom toolbar
2019-07-16 14:19:04 +01:00
Sean Mac Gillicuddy
1f7b615bff #973 remove extra transaltions 2019-07-16 12:19:14 +01:00
macgills
dc267d25e4
Merge pull request #1291 from jhbiggs/develop
Develop: delete unused strings per @macgills's suggestions
2019-07-16 10:26:18 +01:00
Justin Biggs
edab6bc26a
Merge pull request #3 from jhbiggs/master
other changes already added, plus my final change deleting unused strings
2019-07-15 10:55:10 -05:00
Justin Biggs
3b0e76550d delete unused strings per @macgills suggestion 2019-07-15 08:43:16 -07:00
macgills
5641a54176
Merge pull request #1281 from kiwix/feature/macgills/#1258-leakcanary-ci
#1258 upgrade leakcanary to 2.0 and fix strict mode issues
2019-07-15 11:17:18 +01:00
Sean Mac Gillicuddy
9f1149b507 Merge remote-tracking branch 'origin/develop' into feature/macgills/#1258-leakcanary-ci
# Conflicts:
#	app/build.gradle
2019-07-15 09:50:54 +01:00
macgills
38009d63d1
Merge pull request #1280 from kiwix/feature/macgills/#1279-android-storage-devices
#1279 add android storage devices, fix resource leak, visibility issu…
2019-07-15 09:46:28 +01:00
Sean Mac Gillicuddy
02bfae7067 Update commitstyle and contributing 2019-07-12 14:28:27 +01:00
Sean Mac Gillicuddy
b61f5913b5 #1258 reorder travis command 2019-07-12 14:22:09 +01:00
Kelson
f84684d2b2
Merge pull request #1286 from kiwix/feature/macgills/#1214-chmod-ssh-key
#1214 Change mode of ssh key
2019-07-12 14:09:55 +02:00
Sean Mac Gillicuddy
5607102456 #1214 Change mode of ssh key 2019-07-12 12:32:12 +01:00
Sean Mac Gillicuddy
1ee18f4eb4 #1258 inject test schedulers 2019-07-12 11:58:28 +01:00
Sean Mac Gillicuddy
3ab77f5ccd Merge branch 'develop' into feature/macgills/#1258-leakcanary-ci
# Conflicts:
#	app/build.gradle
2019-07-12 11:26:31 +01:00
Sean Mac Gillicuddy
f593ab9620 #1258 reduce severity of unknown nullness and reprioritise travis executions for linting 2019-07-12 10:21:24 +01:00
macgills
f25d26439c
Merge pull request #1285 from kiwix/feature/macgills/#1278-show-name-of-deletion
Feature/macgills/#1278 show name of deletion
2019-07-12 09:25:00 +01:00
Sean Mac Gillicuddy
1929b81c76 #1258 disable crashing on leak 2019-07-11 16:04:01 +01:00
Sean Mac Gillicuddy
150ab070a3 #1278 remove unused resources 2019-07-11 14:57:33 +01:00
Sean Mac Gillicuddy
c43109360e #1278 Add interface for supplying body format args 2019-07-11 14:57:09 +01:00
macgills
2c0e17fe25
Merge pull request #1197 from jhbiggs/master
set bottom toolbar to show by default resolve issue #973
2019-07-11 13:37:52 +01:00
Sean Mac Gillicuddy
7b90f4b5da Merge remote-tracking branch 'origin/develop' into feature/macgills/#1279-android-storage-devices
# Conflicts:
#	app/build.gradle
2019-07-11 13:23:25 +01:00
macgills
626e38bf35
Merge pull request #1283 from kiwix/feature/macgills/multiline-deploy-scripts-invalid
Chain deploy commands with && as Multinline is illegal syntax
2019-07-11 13:17:51 +01:00
Sean Mac Gillicuddy
cc55960fa7 Chain deploy commands with && as Multinline is illegal syntax 2019-07-11 12:38:08 +01:00
Sean Mac Gillicuddy
acd9fbd18e #1258 reduce network logs, move disk read operations onto IO thread 2019-07-11 12:07:05 +01:00
macgills
f06623b72c
Merge pull request #1268 from kiwix/macgills/feature/#1260-illegal-argument-exception-file-utils
#1260 convert fileUtils to kotlin and prevent crash by checking the c…
2019-07-11 11:27:27 +01:00
Sean Mac Gillicuddy
91f1fc8d1c #1279 resolve lint issues 2019-07-11 10:44:34 +01:00
Sean Mac Gillicuddy
c094fe125d Merge remote-tracking branch 'origin/develop' into macgills/feature/#1260-illegal-argument-exception-file-utils
# Conflicts:
#	app/build.gradle
2019-07-11 09:50:30 +01:00
macgills
b38a387307
Merge pull request #1264 from kiwix/new-translations
New translations for the UI
2019-07-11 09:45:27 +01:00
Sean Mac Gillicuddy
b856018a56 Merge remote-tracking branch 'origin/develop' into macgills/feature/#1260-illegal-argument-exception-file-utils 2019-07-10 16:41:06 +01:00
Sean Mac Gillicuddy
9281623efd Merge remote-tracking branch 'origin/develop' into feature/macgills/#1279-android-storage-devices 2019-07-10 16:40:38 +01:00
Sean Mac Gillicuddy
80b81a1ee2 Merge remote-tracking branch 'origin/develop' into feature/macgills/#1258-leakcanary-ci 2019-07-10 16:39:44 +01:00
macgills
7c24a0e803
Merge pull request #1282 from kiwix/feature/macgills/fail-fast-instrumentation
Move Instrumentation first and use TestOrchestrator to minimise memor…
2019-07-10 16:39:07 +01:00
Sean Mac Gillicuddy
d29994fdba Move Instrumentation first and use TestOrchestrator to minimise memory usage 2019-07-10 15:51:22 +01:00
Justin Biggs
b15ae33e6e Merge branch 'kiwix-develop'. Updated jhbiggs's fork and resolved conflict in gradle-wrapper.properties file 2019-07-10 09:43:29 -05:00
Justin Biggs
98ea04d21c resolved merge conflict in gradle-wrapper.properties 2019-07-10 09:41:09 -05:00
Justin Biggs
ff0705647a reverted all tests 2019-07-10 09:09:02 -05:00
Justin Biggs
40117c3f84 uncommented tests in HelpActivityTest, LanguageActivityTest, and NetworkTest 2019-07-10 09:03:24 -05:00
Sean Mac Gillicuddy
b986ff9192 #1258 upgrade leakcanary to 2.0 and enable crashing on instrumentation runs 2019-07-10 14:57:16 +01:00
Sean Mac Gillicuddy
081b7ac7ef #1279 add android storage devices, fix resource leak, visibility issues, potential concurrentmodification 2019-07-10 13:39:14 +01:00
macgills
882d94a6f2
Merge pull request #1246 from kiwix/feature/macgills/#692-build-all-variants
#692 invoke assemble command to build all variants
2019-07-10 10:59:13 +01:00
macgills
98d19dda14
Merge pull request #1269 from kiwix/feature/macgills/#1214-universal-apk-upload-fixes
#1214 Universal APK Upload fixes
2019-07-09 17:07:18 +01:00
Sean Mac Gillicuddy
e38ffb5c80 #1260 fix instrumentation compilation 2019-07-09 14:32:15 +01:00
Sean Mac Gillicuddy
1374f827b9 #1214 correct spelling of key, copy entire folders to kiwix.download.org so they are created 2019-07-09 14:22:30 +01:00
Sean Mac Gillicuddy
ff77b55fa4 #1260 convert fileUtils to kotlin and prevent crash by checking the column name exists before accessing it 2019-07-09 13:00:26 +01:00
macgills
ea399b9eb6
Merge pull request #1267 from kiwix/feature/macgills/#1262-anr-fat32checker
#1262 anr fat32checker
2019-07-09 12:04:15 +01:00
Sean Mac Gillicuddy
151519b5e2 Merge remote-tracking branch 'origin/develop' into feature/macgills/#1262-anr-fat32checker 2019-07-09 10:56:19 +01:00
Sean Mac Gillicuddy
6e882d4aff Ignore duplicate strings for now and delete incorrect format string 2019-07-09 10:55:23 +01:00
macgills
d1c9be033d
Merge pull request #1265 from kiwix/feature/macgills/#1214-nightly-and-release-uploads
#1214 upload debug nightlies and tagged releases to download.kiwix.org
2019-07-09 10:52:00 +01:00