kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-21 11:28:56 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,140 Commits 70 Branches 45 Tags
Commit Graph

3140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Biggs
69cb5c3408 #1429 remove copyright from settings.properties file 2019-09-25 18:08:24 -05:00
Justin Biggs
67b17f5529 #1429 updated scope to use nifty rule 2019-09-24 19:44:00 -05:00
Justin Biggs
cc7ad7de4f #1429 add copyright scope and remove copyright remnant from .properties file 2019-09-23 19:54:06 -05:00
Justin Biggs
5cd26c0dea #1429 commit .java and .kt files only 2019-09-22 07:56:45 -05:00
Justin Biggs
7545a87dbe Revert "#1429 standardise copyright across project" 
This reverts commit acbf02e49f50328a03476de77df0d8b875f5928c.
 2019-09-19 17:11:29 -05:00
Justin Biggs
2e104cf12c #1429 added copyright folder from .idea 2019-09-16 18:59:48 -05:00
Justin Biggs
acbf02e49f #1429 standardise copyright across project 2019-09-11 20:05:13 -05:00
Justin Biggs
2f633c04a6 #1429 standardise copyright across project 2019-09-11 19:50:26 -05:00
Kelson
49367ee469
Merge pull request #1460 from kiwix/feature/macgills/#1458-update-changelog 
#1458 Update changelog
 2019-09-11 11:06:21 +02:00
Seán Mac Gillicuddy
f0b5344e4d
Merge pull request #1430 from kiwix/feature/macgills/#1386-use-fetch-downloads 
Feature/macgills/#1386 use fetch downloads
 2019-09-11 09:57:17 +01:00
Sean Mac Gillicuddy
cb3fe1f400 #1458 Update changelog 2019-09-11 09:41:47 +01:00
Sean Mac Gillicuddy
571ad42d45 Merge branch 'develop' into feature/macgills/#1386-use-fetch-downloads 
# Conflicts:
#	app/src/main/java/org/kiwix/kiwixmobile/KiwixApplication.java
#	app/src/main/java/org/kiwix/kiwixmobile/di/components/ApplicationComponent.java
#	app/src/main/java/org/kiwix/kiwixmobile/di/modules/DatabaseModule.kt
 2019-09-11 09:07:34 +01:00
Seán Mac Gillicuddy
b6d404c3b3
Merge pull request #1459 from kiwix/move-to-kiwixlib-6.0.4 
Use Kiwix library 6.0.4
 2019-09-11 09:00:30 +01:00
Seán Mac Gillicuddy
6570b43b63
Merge pull request #1457 from kiwix/feature/macgills/#1449-database-migration 
Feature/macgills/#1449 database migration
 2019-09-11 08:57:32 +01:00
Kelson
6d386dc6f6 Use Kiwix library 6.0.4 2019-09-11 07:33:49 +02:00
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