Sean Mac Gillicuddy
|
76f085681e
|
#1214 update secrets with ssh key
|
2019-07-01 14:18:21 +01:00 |
|
Sean Mac Gillicuddy
|
65a28a2f66
|
#1214 upload universal apk to download.kiwix on nightly build and to Github Releases on a tagged release
|
2019-06-26 15:09:14 +01:00 |
|
Kelson
|
63599fa685
|
Merge pull request #1233 from kiwix/https
Replace a few HTTP links with HTTPS
|
2019-06-26 15:53:18 +02:00 |
|
Kelson
|
23347677d0
|
More links using HTTPS in README
|
2019-06-26 15:40:37 +02:00 |
|
macgills
|
2481ead365
|
Merge pull request #1225 from kiwix/feature/macgills/#1224-fix-crash-reporting
#1224 use correct fileProvider suffix
|
2019-06-26 09:32:39 +01:00 |
|
Sean Mac Gillicuddy
|
5635a50920
|
#1224 remove extraneous dash in .travis.yml
|
2019-06-25 15:52:30 +01:00 |
|
Sean Mac Gillicuddy
|
afb62ba9f1
|
#1224 attempt to fix build
|
2019-06-25 15:16:59 +01:00 |
|
Sean Mac Gillicuddy
|
4bf2d2a3f9
|
#1224 use correct fileProvider suffix
|
2019-06-25 11:18:46 +01:00 |
|
macgills
|
f1dcc82103
|
Merge pull request #1208 from kiwix/macgills/update-travis-for-build-pushed-option
Prevent builds of pushed branches unless it is a tag
|
2019-06-24 16:11:21 +01:00 |
|
Sean Mac Gillicuddy
|
3a329a95f0
|
Prevent builds of pushed branches unless it is a tag
|
2019-06-20 11:42:45 +01:00 |
|
macgills
|
55aa28e7d2
|
Merge pull request #1192 from kiwix/macgills/2.5-mergeable-to-dev
Merge 2.5 to dev
|
2019-06-20 09:55:30 +01:00 |
|
Sean Mac Gillicuddy
|
5431afa1f7
|
Merge branch 'release' into macgills/2.5-mergeable-to-dev
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
# app/src/main/java/org/kiwix/kiwixmobile/di/modules/NetworkModule.java
# app/src/main/res/xml/network_security_config.xml
|
2019-06-19 11:55:07 +01:00 |
|
macgills
|
7da84c0b90
|
Merge pull request #1204 from kiwix/macgills/hotfix/use-http
- Use http instead of https - Increase read timeout - bump abi codes …
2.5.1
|
2019-06-19 09:34:02 +01:00 |
|
Sean Mac Gillicuddy
|
e680155430
|
- add network security config from master
|
2019-06-18 13:05:08 +01:00 |
|
Sean Mac Gillicuddy
|
f7b263280b
|
- Use http instead of https - Increase read timeout - bump abi codes to remove shadowing complaint - increase version to 2.5.1
|
2019-06-18 12:39:03 +01:00 |
|
macgills
|
d91e500897
|
Merge pull request #1194 from kiwix/macgills/#1193-migrate-db
Macgills/#1193 migrate db
|
2019-06-18 10:05:53 +01:00 |
|
Sean Mac Gillicuddy
|
6f0eecf79b
|
#1193 fix null pointer in test
|
2019-06-17 17:43:15 +01:00 |
|
Sean Mac Gillicuddy
|
0099e45dfd
|
#1193 fix tests and ignore broken one
|
2019-06-17 17:09:11 +01:00 |
|
Sean Mac Gillicuddy
|
d9b45ddeaa
|
#1193 correct migration of zimId
|
2019-06-17 16:57:31 +01:00 |
|
Sean Mac Gillicuddy
|
22b651a79e
|
Merge branch 'macgills/2.5-mergeable-to-dev' into macgills/#1193-migrate-db
|
2019-06-17 16:06:26 +01:00 |
|
Sean Mac Gillicuddy
|
51aa3a4939
|
- Readd deleted depndency - fix import
|
2019-06-17 15:42:34 +01:00 |
|
Sean Mac Gillicuddy
|
08099255ee
|
fix lint errors
|
2019-06-17 15:34:49 +01:00 |
|
Sean Mac Gillicuddy
|
d88b39eec9
|
Merge branch 'release' into macgills/2.5-mergeable-to-dev
# Conflicts:
# .travis.yml
|
2019-06-17 15:16:06 +01:00 |
|
Sean Mac Gillicuddy
|
09ba7a34a5
|
tidy up dependencies
|
2019-06-17 15:12:47 +01:00 |
|
Sean Mac Gillicuddy
|
dc6b1ff63c
|
Merge branch 'develop' into macgills/2.5-mergeable-to-dev
|
2019-06-17 14:54:57 +01:00 |
|
Sean Mac Gillicuddy
|
d10c2e3b60
|
- increase numbering for abi splits to resolve error on play store
2.5.0
|
2019-06-17 12:25:41 +01:00 |
|
Sean Mac Gillicuddy
|
f35c2e44f4
|
-attempt draft release - remove branchname as tags do not build on a branch
|
2019-06-17 11:39:42 +01:00 |
|
Sean Mac Gillicuddy
|
4924eea71c
|
-build release variant so apks can be uploaded to github releases - playstore does not accept universal apks for abi splits that have a total mapping for the available code, deactivate
|
2019-06-17 09:44:35 +01:00 |
|
Sean Mac Gillicuddy
|
d2726c80b9
|
set play publisher to be enabled because branchname is unreliable on travis
|
2019-06-14 16:44:33 +01:00 |
|
Sean Mac Gillicuddy
|
d4363ae951
|
disable body of github release, broken on travis
|
2019-06-14 16:32:37 +01:00 |
|
Sean Mac Gillicuddy
|
14df2a1dbd
|
update deployment to be on any tag
|
2019-06-14 15:45:40 +01:00 |
|
macgills
|
5fd479c9fb
|
Merge pull request #1185 from kiwix/macgills/2.5-kotlin
2.5
|
2019-06-14 14:56:26 +01:00 |
|
macgills
|
1a37cb0f09
|
Merge pull request #1199 from kiwix/macgills/2.5-contribution-update
Update CONTRIBUTING.md
|
2019-06-14 13:27:33 +01:00 |
|
Kelson
|
92cf08c233
|
Remove SquiDB from README.md
|
2019-06-14 13:53:49 +02:00 |
|
Kelson
|
a24818ff9a
|
Light reformatting of CONTRIBUTING.md
|
2019-06-14 13:52:12 +02:00 |
|
Sean Mac Gillicuddy
|
54eed3fc9c
|
Merge branch 'macgills/2.5-kotlin' into macgills/2.5-mergeable-to-dev
# Conflicts:
# .travis.yml
# app/build.gradle
# app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/di/components/TestComponent.java
# app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/di/modules/TestJNIModule.java
# app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/DownloadTest.java
# app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/NetworkTest.java
# app/src/main/AndroidManifest.xml
# build.gradle
|
2019-06-14 12:14:19 +01:00 |
|
Sean Mac Gillicuddy
|
3ddebc3096
|
Update CONTRIBUTING.md
|
2019-06-14 11:06:29 +01:00 |
|
macgills
|
45295e5455
|
Merge pull request #1176 from kiwix/macgills/2.5-coverage
#1175 automate code coverage
|
2019-06-14 09:15:56 +01:00 |
|
Sean Mac Gillicuddy
|
38020ed874
|
#1175 Use new lib with v7a support, re-enable emulator for instrumented tests
|
2019-06-13 13:58:06 +01:00 |
|
soloturn
|
d4d9af2975
|
update androidx.test to 1.2.0, androidx.test.ext:junit to 1.1.1
|
2019-06-09 22:56:16 +02:00 |
|
Sean Mac Gillicuddy
|
24cc545eb0
|
#1193 fully replace RecentSearchesDao with objectbox version
|
2019-06-07 16:47:13 +01:00 |
|
Sean Mac Gillicuddy
|
f86720256f
|
#1193 fully replace BookmarksDao with objectbox version
|
2019-06-07 16:11:31 +01:00 |
|
Sean Mac Gillicuddy
|
57149e8227
|
#1193 fully replace History database with objectbox version
|
2019-06-07 14:39:14 +01:00 |
|
Sean Mac Gillicuddy
|
9070e6a16b
|
#1193 fix or migrate unit tests
|
2019-06-07 11:00:45 +01:00 |
|
Sean Mac Gillicuddy
|
004c274c02
|
- unify datasource for main and on device tab - fix unit test erroring to std - undo default parameters on data classes,instead have top level test functions - purge powermock
|
2019-06-06 17:20:38 +01:00 |
|
Sean Mac Gillicuddy
|
019af7be33
|
#1175 add second dash to dump command
|
2019-06-05 15:15:33 +01:00 |
|
Sean Mac Gillicuddy
|
0671779d40
|
fix toolbar not rendering
|
2019-06-05 14:45:10 +01:00 |
|
Sean Mac Gillicuddy
|
bb00b063a3
|
-readd deleted activity -revert application supertype to MultiDexApplication -temp solution to stop crash in Repository - readd tables that will be replaced by objectbox - reimplement parcelable Language
|
2019-06-05 14:16:46 +01:00 |
|
Sean Mac Gillicuddy
|
22e5d3226e
|
re-enable multidex, add ktx libraries and fix some compile errors in Instrumentation tests
|
2019-06-05 12:37:39 +01:00 |
|
Sean Mac Gillicuddy
|
3cb357f9bd
|
Merge branch 'master' into macgills/2.5-mergeable-to-dev
# Conflicts:
# app/build.gradle
# app/src/androidTest/java/org/kiwix/kiwixmobile/database/KiwixDatabaseTest.java
# app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/DownloadTest.java
# app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/NetworkTest.java
# app/src/main/AndroidManifest.xml
# app/src/main/java/org/kiwix/kiwixmobile/KiwixApplication.java
# app/src/main/java/org/kiwix/kiwixmobile/base/BaseFragment.java
# app/src/main/java/org/kiwix/kiwixmobile/data/local/dao/BookDao.java
# app/src/main/java/org/kiwix/kiwixmobile/data/local/dao/NetworkLanguageDao.java
# app/src/main/java/org/kiwix/kiwixmobile/data/local/entity/BookDataSource.java
# app/src/main/java/org/kiwix/kiwixmobile/data/remote/KiwixService.java
# app/src/main/java/org/kiwix/kiwixmobile/database/KiwixDatabase.java
# app/src/main/java/org/kiwix/kiwixmobile/di/components/ApplicationComponent.java
# app/src/main/java/org/kiwix/kiwixmobile/di/modules/ApplicationModule.java
# app/src/main/java/org/kiwix/kiwixmobile/di/modules/NetworkModule.java
# app/src/main/java/org/kiwix/kiwixmobile/downloader/ChunkUtils.java
# app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadFragment.java
# app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadService.java
# app/src/main/java/org/kiwix/kiwixmobile/downloader/model/DownloadModel.kt
# app/src/main/java/org/kiwix/kiwixmobile/downloader/model/DownloadRequest.kt
# app/src/main/java/org/kiwix/kiwixmobile/error/ErrorActivity.java
# app/src/main/java/org/kiwix/kiwixmobile/library/LibraryAdapter.java
# app/src/main/java/org/kiwix/kiwixmobile/library/entity/LibraryNetworkEntity.java
# app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
# app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java
# app/src/main/java/org/kiwix/kiwixmobile/utils/DialogShower.kt
# app/src/main/java/org/kiwix/kiwixmobile/utils/LanguageUtils.java
# app/src/main/java/org/kiwix/kiwixmobile/utils/SharedPreferenceUtil.java
# app/src/main/java/org/kiwix/kiwixmobile/utils/files/FileSearch.java
# app/src/main/java/org/kiwix/kiwixmobile/zim_manager/SectionsPagerAdapter.java
# app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.java
# app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManagePresenter.java
# app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.java
# app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.java
# app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryPresenter.java
# app/src/main/res/layout/activity_library.xml
# app/src/main/res/layout/download_item.xml
# app/src/main/res/layout/download_management.xml
# app/src/main/res/layout/language_selection.xml
# app/src/main/res/layout/library_item.xml
# app/src/main/res/layout/zim_list.xml
# app/src/main/res/layout/zim_manager.xml
# app/src/main/res/values/dimens.xml
# app/src/main/res/values/strings.xml
# build.gradle
# gradle/wrapper/gradle-wrapper.properties
|
2019-06-05 11:45:16 +01:00 |
|