11 Commits

Author SHA1 Message Date
Sean Mac Gillicuddy
dbf19bed22 Update-index chmod=+x 2019-08-27 12:30:15 +01:00
Aditya-Sood
bdf979d973 Fix gitignore issue
Wasn't ignoring some .idea files
2019-08-13 20:46:34 +05:30
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
Isaac Hutt
cf49a69f73
Remove testdroid references to BITBAR_API_KEY 2019-02-22 13:11:27 +00:00
mhutti1
7fa5a8696a Check test results from gateway server 2019-02-22 12:51:02 +00:00
mhutti1
a948f765f3 Wait for testdroid tests on forks 2019-02-22 12:51:02 +00:00
Isaac Hutt
c6dfed6a3e Increase testdroid timeout limit 2018-08-19 22:01:24 +01:00
mhutti1
63dda78e61 Flush prints to stop travis timeout 2017-07-03 21:55:21 +01:00
mhutti1
e254817f08 Added running test message 2017-06-30 12:40:48 +02:00
mhutti1
418d636734 Tests don't run on insecure build 2017-06-30 12:40:48 +02:00
mhutti1
93415ca918 Attempt at travis pinging testdroid 2017-04-25 17:47:04 +02:00