kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-20 10:23:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,225 Commits 70 Branches 45 Tags
Commit Graph

3225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kelson
e09d90ebd6
Merge pull request #1452 from kiwix/feature/macgills/#1396-random-redirects 
#1396 Random button will use redirect urls
 2019-09-11 07:27:03 +02:00
Kelson
dd5d3c721d
Merge pull request #1450 from kiwix/feature/macgills/#1383-cleanup-menu 
#1383 remove rendundant menu items + reorganise items/constants + cle…
 2019-09-11 07:25:12 +02:00
Kelson
5e7d0127de
Merge pull request #1454 from kiwix/feature/macgills/#152-mathjax-rendering 
#152 Mathjax rendering - strip arguments from urls
 2019-09-11 07:20:38 +02:00
Kelson
13c86ec0d1
Merge pull request #1451 from kiwix/feature/macgills/#1031-clear-webview-history 
#1031 Delete webview history when user clears History in HistoryActivity
 2019-09-11 07:18:53 +02:00
Sean Mac Gillicuddy
4fd58b5aeb #1031 Delete webview history when user clears Histry in HistoryActivity 2019-09-11 07:18:30 +02:00
Sean Mac Gillicuddy
a629fd8a47 #1449 hack for ZimManageActivity test to present 2 separate application components creating boxStores 2019-09-10 16:08:05 +01:00
Sean Mac Gillicuddy
aa61a937bf #1449 fix test and mark deprecated 2019-09-10 15:34:49 +01:00
Sean Mac Gillicuddy
941f02eefd #1449 migrate from original Bookmark to BookmarkEntity 2019-09-10 15:01:10 +01:00
Sean Mac Gillicuddy
84bdbec722 #1449 Correct used versions of database 2019-09-10 12:41:42 +01:00
Sean Mac Gillicuddy
085bd8820b #1449 migrate from 2.5.3 -> 3.0 2019-09-10 12:36:14 +01:00
Sean Mac Gillicuddy
9a3bffb1c2 Merge remote-tracking branch 'origin/develop' into feature/macgills/#1386-use-fetch-downloads 
# Conflicts:
#	app/src/androidTest/java/org/kiwix/kiwixmobile/main/MainActivityTest.java
#	app/src/androidTest/java/org/kiwix/kiwixmobile/splash/SplashActivityTest.java
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadService.java
#	app/src/main/java/org/kiwix/kiwixmobile/utils/SharedPreferenceUtil.java
#	app/src/main/res/layout/download_item.xml
 2019-09-10 11:35:15 +01:00
Sean Mac Gillicuddy
49e2135692 Merge remote-tracking branch 'origin/develop' into feature/macgills/#1383-cleanup-menu 
# Conflicts:
#	app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
#	app/src/main/java/org/kiwix/kiwixmobile/utils/Constants.java
#	app/src/main/res/drawable/ic_baseline_delete_sweep_24px.xml
#	app/src/main/res/menu/menu_main.xml
#	app/src/main/res/xml/preferences.xml
 2019-09-10 11:28:32 +01:00
Sean Mac Gillicuddy
e376ec7668 Merge remote-tracking branch 'origin/develop' into feature/macgills/#1396-random-redirects 
# Conflicts:
#	app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
 2019-09-10 11:17:42 +01:00
Sean Mac Gillicuddy
e6ef433f5d Merge remote-tracking branch 'origin/develop' into feature/macgills/#152-mathjax-rendering 
# Conflicts:
#	app/src/main/java/org/kiwix/kiwixmobile/data/ZimContentProvider.java
 2019-09-10 11:12:24 +01:00
Seán Mac Gillicuddy
3a449b149f
Merge pull request #1455 from kiwix/hotfix/macgills/reformat-project 
Reformat all files according to project style
 2019-09-10 11:10:37 +01:00
Sean Mac Gillicuddy
abed43be0c Reformat all files according to project style 2019-09-10 10:34:30 +01:00
Sean Mac Gillicuddy
bdde024c1e #152 Mathjax rendering - strip arguments from urls 2019-09-10 10:11:50 +01:00
Sean Mac Gillicuddy
dea0cc5823 #1396 parse uris correctly 2019-09-09 16:15:39 +01:00
Sean Mac Gillicuddy
9987081dfc #1396 Random button will use redirect urls 2019-09-09 15:51:28 +01:00
Sean Mac Gillicuddy
78eb41a960 #1383 fix test compilation 2019-09-09 14:24:34 +01:00
Sean Mac Gillicuddy
5ff8d8d590 #1383 move prefsFragment to own class 2019-09-09 12:52:08 +01:00
Sean Mac Gillicuddy
ba7275b775 #1383 remove rendundant menu items + reorganise items/constants + clear notes in KiwixSettingsActivity 2019-09-09 12:41:22 +01:00
Seán Mac Gillicuddy
c2b8e60e1e
Merge pull request #1405 from kiwix/hotfix/macgills/disable-density-splits 
Disable density splits
 2019-09-09 10:48:14 +01:00
Sean Mac Gillicuddy
7457c0f3e9 Merge remote-tracking branch 'origin/develop' into feature/macgills/#1386-use-fetch-downloads 
# Conflicts:
#	app/src/main/java/eu/mhutti1/utils/storage/StorageDevice.kt
#	app/src/main/java/eu/mhutti1/utils/storage/StorageSelectDialog.kt
#	app/src/main/java/org/kiwix/kiwixmobile/di/components/ApplicationComponent.java
 2019-09-09 10:30:18 +01:00
Seán Mac Gillicuddy
bdd4c9dd2d
Merge pull request #1439 from kiwix/feature/macgills/#1399-language-utils-crash 
Feature/macgills/#1399 language utils crash
 2019-09-09 09:55:24 +01:00
Kelson
715ecdb53e
Merge pull request #1446 from kiwix/feature/macgills/#1445-crash-opening-file 
#1445 stop crash on null return
 2019-09-09 03:54:49 +02:00
Kelson
5758b250ad
Merge pull request #1444 from kiwix/feature/macgills/#1205-storage-size-detection 
#1205 2.5 not recognizing space on external drive? - standardise file…
 2019-09-09 03:51:37 +02:00
Sean Mac Gillicuddy
8be18b8e3a #1445 stop crash on null return 2019-09-06 15:06:43 +01:00
Sean Mac Gillicuddy
1273a081b3 #1205 2.5 not recognizing space on external drive? - standardise file size checking 2019-09-06 13:48:09 +01:00
Seán Mac Gillicuddy
724e03399d
Merge pull request #1442 from kiwix/feature/macgills/#430-dialog-fix 
#430 Inappropriate dialog box in downloading fragment - use androidX
 2019-09-06 13:44:05 +01:00
Sean Mac Gillicuddy
075baccc9c #430 Inappropriate dialog box in downloading fragment - use androidX 2019-09-06 10:40:01 +01:00
Sean Mac Gillicuddy
cb27a117a0 #1399 rename hungarian notation field 2019-09-06 09:12:06 +01:00
Sean Mac Gillicuddy
53a2b66ff3 #1399 fix test compilation 2019-09-05 16:18:43 +01:00
Kelson
f4ae5984a2
Merge pull request #1438 from kiwix/hotfix/macgills/upgrade-kiwix-lib 
Upgrade library
 2019-09-05 16:02:35 +02:00
Sean Mac Gillicuddy
0f360abc4c #1399 rewrite to kotlin 2019-09-05 14:57:43 +01:00
Sean Mac Gillicuddy
d572ef995d Upgrade library 2019-09-05 13:57:36 +01:00
Sean Mac Gillicuddy
3acdf2bd59 #1399 kotlin conversion 2019-09-05 13:36:32 +01:00
Sean Mac Gillicuddy
341b20dd00 #1399 rename extension to kotlin 2019-09-05 13:04:00 +01:00
Sean Mac Gillicuddy
0d0c642bcd Merge branch 'develop' into feature/macgills/#1386-use-fetch-downloads 
# Conflicts:
#	app/src/main/res/layout/download_item.xml
 2019-09-05 12:38:52 +01:00
Seán Mac Gillicuddy
e4612980e3
Merge pull request #1427 from kiwix/feature/rajputt2122/#1355-#1150-banner-scroll-vector-images 
Feature/rajputt2122/#1355 #1150 banner scroll vector images
 2019-09-05 12:04:13 +01:00
Sean Mac Gillicuddy
70a5527e40 #1386 ignore test that navigates to KiwixSettingsActivity 2019-09-05 11:55:04 +01:00
Sean Mac Gillicuddy
f8a69d92ee #1386 remove redundant test 2019-09-05 09:05:30 +01:00
Seán Mac Gillicuddy
f5406bb9c3
Merge pull request #1437 from kiwix/#563-move-play-store-constants 
#563 moved play store variables to isolate them
 2019-09-05 09:02:23 +01:00
Justin Biggs
fc9f150987 #563 moved play store variables to isolate them within 
their only used class.
 2019-09-04 20:07:15 -05:00
Sean Mac Gillicuddy
60fa251943 #1386 fix automated tests and double injection 2019-09-04 16:17:44 +01:00
Sean Mac Gillicuddy
0323af70ad #1386 remove lint inspection profile, update dependencies, minor fixes 2019-09-04 13:58:47 +01:00
Sean Mac Gillicuddy
c2244476fb Merge remote-tracking branch 'origin/develop' into feature/macgills/#1386-use-fetch-downloads 
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt
 2019-09-04 13:19:08 +01:00
Sean Mac Gillicuddy
5b716b39b2 #1386 stop notifications vibrating/making sounds 2019-09-04 12:00:14 +01:00
Seán Mac Gillicuddy
20d97131ee
Merge pull request #1416 from kiwix/update-readme-for-develop 
Update README.md
 2019-09-04 09:24:33 +01:00
Abdul Wadood
27f853d1e4 Update README.md 2019-09-04 12:36:50 +05:30