3244 Commits

Author SHA1 Message Date
Seán Mac Gillicuddy
6d7368b752
Merge pull request #1536 from kiwix/release/3.0.4
Release/3.0.4 to Develop
2019-09-30 11:59:03 +01:00
Kelson
a10a587f8e
Merge pull request #1472 from kiwix/#1429-update-copyright-and-standardise
#1429 update copyright and standardise
2019-09-30 13:09:50 +03:00
Sean Mac Gillicuddy
66cbafda42 Merge branch 'master' into release/3.0.4 2019-09-30 11:02:37 +01:00
Sean Mac Gillicuddy
d7d46ec163 Merge remote-tracking branch 'origin/develop' into release/3.0.4 2019-09-30 10:58:56 +01:00
Seán Mac Gillicuddy
2b41745c7d
Merge pull request #1534 from kiwix/feature/macgills/#1533-npe-delete-cache-dir
#1533 allow nullable return
2019-09-30 10:58:22 +01:00
Seán Mac Gillicuddy
ee4c707942
Merge pull request #1521 from kiwix/feature/macgills/#1519-exception-opening-zim-file
#1519 JniKiwixException opening Zim file
2019-09-30 10:50:30 +01:00
Sean Mac Gillicuddy
03524b77a6 update changelog and bump version 2019-09-30 10:37:00 +01:00
Seán Mac Gillicuddy
3a189a8976
Merge pull request #1529 from kiwix/feature/macgills/#1527-security-exception
#1527 SecurityException FIleUtils
2019-09-30 10:22:58 +01:00
Sean Mac Gillicuddy
f834dfd516 #1533 allow nullable return 2019-09-30 10:15:11 +01:00
Justin Biggs
a08cee1eb9 #1429 resolved merge conflicts by removing deleted files 2019-09-28 09:52:47 -05:00
Seán Mac Gillicuddy
14d7fdf111
Merge pull request #1522 from kiwix/feature/macgills/#1520-illegal-argument-content-query
#1520 Catch IllegalArgumentException
2019-09-27 15:30:05 +01:00
Seán Mac Gillicuddy
f58e1891bc
Merge pull request #1530 from kiwix/feature/macgills/#1528-npe-main-activity
#1528 Null check view
2019-09-27 13:11:01 +01:00
Sean Mac Gillicuddy
7a98c76b44 #1528 Null check view 2019-09-27 09:57:35 +01:00
Sean Mac Gillicuddy
e22854f6f2 #1527 SecurityException FIleUtils 2019-09-27 09:44:51 +01:00
Seán Mac Gillicuddy
894949486d
Merge pull request #1525 from kiwix/kelson42-patch-1
Bump-up libkiwix to 8.1.0
2019-09-27 09:25:17 +01:00
Sean Mac Gillicuddy
9b4ca6cfaf #1520 review fixes 2019-09-27 09:15:14 +01:00
Sean Mac Gillicuddy
85b93e34bf #1519 review fixes 2019-09-27 09:08:17 +01:00
Kelson
29eea07669
Bump-up libkiwix to 8.1.0 2019-09-26 19:36:19 +02:00
Seán Mac Gillicuddy
420ecb6920
Merge pull request #1524 from kiwix/feature/macgills/#1523-local-file-list-rendering
#1523 Wrap content appropriately
2019-09-26 13:23:54 +01:00
Seán Mac Gillicuddy
1a1aa12959
Merge pull request #1518 from kiwix/feature/macgills/#1517-unsatisfied-jni-kiwix-searcher
#1517 Make JniSearcher Nullable
2019-09-26 11:56:32 +01:00
Seán Mac Gillicuddy
feca871c97
Merge pull request #1516 from kiwix/feature/macgills/#1514-missing-resource-exception
#1514 Catch MissingResourceException
2019-09-26 11:56:07 +01:00
Sean Mac Gillicuddy
2934c16d37 #1523 Wrap content appropriately 2019-09-26 11:47:18 +01:00
Sean Mac Gillicuddy
7fbbf842fd #1520 Catch IllegalArgumentException 2019-09-26 11:30:20 +01:00
Sean Mac Gillicuddy
9548333ea8 #1519 JniKiwixException opening Zim file 2019-09-26 11:17:37 +01:00
Sean Mac Gillicuddy
6735fbe987 #1517 Make JniSearcher Nullable 2019-09-26 11:00:43 +01:00
Sean Mac Gillicuddy
d26e82f90f #1514 Catch MissingResourceException 2019-09-26 10:37:35 +01:00
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
Seán Mac Gillicuddy
cca60df69f
Merge pull request #1508 from kiwix/release/3.0
Release/3.0 to develop
2019-09-23 16:25:14 +01:00
Seán Mac Gillicuddy
e0d5bd70ad
Merge pull request #1507 from kiwix/release/3.0
Release/3.0
3.0.3
2019-09-23 15:38:04 +01:00
Seán Mac Gillicuddy
f9e722f72f
Merge pull request #1506 from kiwix/iadeelzafar/manual-hotspot
Iadeelzafar/manual hotspot
2019-09-23 15:33:22 +01:00
Sean Mac Gillicuddy
32b349e5de Listen to hotspot state changes 2019-09-23 14:30:18 +01:00
Seán Mac Gillicuddy
04d6bb7a0d
Merge pull request #1505 from kiwix/feature/macgills/#1489-anr-select-storage
#1499 detect storage on IO thread
2019-09-23 13:30:06 +01:00
Sean Mac Gillicuddy
db7ce3b7ee Merge branch 'release/3.0' into iadeelzafar/manual-hotspot
# Conflicts:
#	app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostModule.java
#	app/src/main/java/org/kiwix/kiwixmobile/wifi_hotspot/HotspotService.java
2019-09-23 13:01:52 +01:00
Sean Mac Gillicuddy
ffad830d91 Up versionCode to 3.0.3 2019-09-23 12:29:50 +01:00
Seán Mac Gillicuddy
f9e79762d1
Merge pull request #1504 from kiwix/feature/macgills/#1502-navigate-to-local-library
#1502 Navigate to correct tab and fix double insertions
2019-09-23 12:25:26 +01:00
Sean Mac Gillicuddy
cdf09d2c11 fix crash report 2019-09-23 12:16:10 +01:00
Sean Mac Gillicuddy
85b8fea789 #1499 detect storage on IO thread 2019-09-23 12:01:48 +01:00
Sean Mac Gillicuddy
35e2da81e4 #1502 Navigate to correct tab and fix double insertions 2019-09-23 11:47:18 +01:00
Seán Mac Gillicuddy
be0f8a8930
Merge pull request #1503 from kiwix/feature/macgills/#911-stretch-landscape-image
#911 use 9patch images for banner
2019-09-23 11:17:29 +01:00
Sean Mac Gillicuddy
bf044e9ddb Merge branch 'develop' into release/3.0 2019-09-23 10:51:09 +01:00
Seán Mac Gillicuddy
d7502d0a8a
Merge pull request #1492 from kiwix/feature/macgills/#1487-recover-after-force-close
#1487 separate zim file reading from ZimContentProvider and stop usin…
2019-09-23 10:44:45 +01:00
Sean Mac Gillicuddy
823421b5a3 #911 use 9patch images for banner 2019-09-23 10:38:59 +01:00
Sean Mac Gillicuddy
2ee8a90417 Merge remote-tracking branch 'origin/release/3.0' into feature/macgills/#1487-recover-after-force-close
# Conflicts:
#	app/src/main/java/org/kiwix/kiwixmobile/data/ZimContentProvider.java
#	app/src/main/java/org/kiwix/kiwixmobile/main/KiwixWebView.java
#	app/src/main/java/org/kiwix/kiwixmobile/main/KiwixWebViewClient.java
2019-09-23 10:01:31 +01:00
Seán Mac Gillicuddy
b2cd3f61ad
Merge pull request #1486 from kiwix/feature/macgills/#121-epub-opener
#121 Open epub/pdf files
2019-09-23 09:43:46 +01:00
Seán Mac Gillicuddy
286700f80e
Merge pull request #1499 from kiwix/feature/macgills/#1497-zimhost-crash
#1497 Move state restoration after objects instantiated
2019-09-23 09:39:56 +01:00
Seán Mac Gillicuddy
52805818dd
Merge pull request #1498 from kiwix/feature/macgills/#1496-storage-calc-crash
Feature/macgills/#1496 storage calc crash
2019-09-23 09:38:02 +01:00
Seán Mac Gillicuddy
281eb9766c
Merge pull request #1495 from kiwix/feature/macgills/#44-fullscreen-video
Feature/macgills/#44 fullscreen video
2019-09-23 09:29:39 +01:00
Adeel
a786e5ec28 Remove hotspot code for >= Oreo 2019-09-23 01:50:34 +05:00