3109 Commits

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
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
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
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
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
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
Seán Mac Gillicuddy
e830c2b25b
Merge pull request #1421 from rajput2122/develop
Kiwix banner is now under scrollable region and All
2019-09-03 16:12:04 +01:00
Seán Mac Gillicuddy
df86d35a18
Merge pull request #1425 from kiwix/hotfix/macgills/unused-strings
Resolve lint errors and reduce inspection severity to info
2019-09-03 16:07:49 +01:00
Sean Mac Gillicuddy
a8ed18c5ad Ignore all of KiwixSettingsActivityTest 2019-09-03 15:26:20 +01:00
Sean Mac Gillicuddy
63e6786315 Ignore other dialog tests 2019-09-03 14:42:49 +01:00
Sean Mac Gillicuddy
d4d2c31ca8 Ignore hanging test 2019-09-03 14:17:11 +01:00
Sean Mac Gillicuddy
c6d2244ad8 Try with later emulator 2019-09-03 13:43:22 +01:00
Sean Mac Gillicuddy
b08b36a757 Resolve lint errors and reduce inspection severity to info 2019-09-03 12:13:30 +01:00
rajput2122
413e3fd414 Kiwix banner is now under scrollable region and All 2019-09-03 00:34:57 +05:30
Kelson
e7c3d5dcdf
Merge pull request #1327 from kiwix/iadeelzafar/wifi-hotspot
Wifi Hotspot Feature
2019-08-31 19:43:49 +02:00
Adeel
011bb57018 Revert remove \n from getIpAddress() 2019-08-31 16:06:51 +05:00
Adeel
5f3570fce5 Remove unused strings in strings.xml 2019-08-31 15:52:02 +05:00
Adeel
7efd39e3ee Add field isServerStarted in WebServerHelper 2019-08-30 20:09:06 +05:00
Adeel
e30aa7b78c Remove \n from getIpAddress() 2019-08-30 19:17:42 +05:00
Adeel
433ff07751 Remove broadcast receiver 2019-08-30 17:19:36 +05:00