3358 Commits

Author SHA1 Message Date
Abdul Wadood
746d427af4 Remove hash from branch naming convention
As zsh shows 'zsh: no matches found:' when checking out a branch with a # in it
2019-10-26 21:23:39 +05:30
Sean Mac Gillicuddy
a5a4321842 #1563 Unable to download content, UNKNOWN_IO_ERROR - allow all http traffic 2019-10-25 16:17:31 +01:00
Seán Mac Gillicuddy
2a39953fdb
Merge pull request #1567 from kiwix/feature/macgills/#1566-meta-fileds-not-required
#1566 Meta4 files missing hash/pieces
2019-10-25 12:29:09 +01:00
Sean Mac Gillicuddy
3af9481f6b #1566 Meta4 files missing hash/pieces 2019-10-25 11:48:03 +01:00
Seán Mac Gillicuddy
335e99e140
Merge pull request #1561 from kiwix/feature/macgills/#1560-crash-opening-files
#1560 Opening a zim file results in a crash
2019-10-21 13:33:24 +01:00
Sean Mac Gillicuddy
9840e2b7af #1560 Opening a zim file results in a crash 2019-10-21 12:42:04 +01:00
Kelson
bc076f015c
Merge pull request #1559 from kiwix/abdul/fix_readme
Remove duplicate badge from README.md
2019-10-21 09:23:55 +01:00
Abdul Wadood
a2752f0fe4 Remove duplicate badge from README.md 2019-10-21 12:55:03 +05:30
Seán Mac Gillicuddy
a6618e773c
Merge pull request #1541 from kiwix/feature/macgills/modularisation
Feature/macgills/modularisation
2019-10-18 15:10:03 +01:00
Sean Mac Gillicuddy
b1e07aa2a7 update readme/contributing 2019-10-18 14:31:16 +01:00
Sean Mac Gillicuddy
b132d1c615 correct injection and mockk usage 2019-10-18 14:17:02 +01:00
Sean Mac Gillicuddy
1262bcee48 move localFileTransfer layout files to app 2019-10-18 13:31:29 +01:00
Sean Mac Gillicuddy
1033a9a45f Create coverage report for instrumented tests where the source lives in other modules 2019-10-18 11:54:31 +01:00
Sean Mac Gillicuddy
af3ef4cf63 Revert "move SplashActivity & FileUtils Instrumentation test to core"
This reverts commit 8a36470d332d5356250e633e02e7af64b4345f1f.
2019-10-18 11:22:52 +01:00
Sean Mac Gillicuddy
8a36470d33 move SplashActivity & FileUtils Instrumentation test to core 2019-10-17 15:18:32 +01:00
Sean Mac Gillicuddy
f7c581c8b4 remove old copyrights 2019-10-17 10:57:16 +01:00
Sean Mac Gillicuddy
a0b24b6c3b add test resources for app module 2019-10-16 16:33:26 +01:00
Sean Mac Gillicuddy
15b3b4ad41 tidy up plugin configurers and reuse ActivtyComponent in fragments 2019-10-16 16:19:15 +01:00
Sean Mac Gillicuddy
381e2bd9d8 Fix ktlint error around sourceset shared across modules 2019-10-16 14:27:37 +01:00
Sean Mac Gillicuddy
8d8e5250fd stop ktlint stripping used imports 2019-10-16 11:39:24 +01:00
Sean Mac Gillicuddy
5b484f5f19 Merge remote-tracking branch 'origin/develop' into feature/macgills/modularisation 2019-10-16 10:51:01 +01:00
Sean Mac Gillicuddy
74c4aff983 -Augment dependencies so there is no AndroidTest sourceset for core - fix unit tests 2019-10-16 10:42:37 +01:00
Seán Mac Gillicuddy
1f6d70fc62
Merge pull request #1547 from kiwix/#1526-keep-soft-input-on-search
#1526 keep soft input on search
2019-10-16 09:27:29 +01:00
Sean Mac Gillicuddy
bfd43334a7 correct packaging 2019-10-15 17:01:21 +01:00
Justin Biggs
edf367cfc0 #1526 commit MainActivity.java with refactored variable name 2019-10-15 09:57:05 -05:00
Justin Biggs
0f05ba72df Merge branch 'develop' into #1526-keep-soft-input-on-search
Merge any new changes from the develop branch to head off conflicts.
2019-10-15 09:55:42 -05:00
Sean Mac Gillicuddy
bcabfb69fc move ZimManage package to App 2019-10-15 15:49:04 +01:00
Seán Mac Gillicuddy
ea98621fee
Merge pull request #1548 from kiwix/no-email
Remove email addresses from the Credits
2019-10-15 10:04:37 +01:00
Justin Biggs
a04f190710 #1526 reset to private a couple of variables and use updated variable nomenclature 2019-10-14 17:53:47 -05:00
Emmanuel Engelhart
faa56b8706 Remove email addresses from the Credits 2019-10-14 18:49:50 +01:00
Sean Mac Gillicuddy
b23dcab0ec Revert copying reports between directories, move additional default configuration 2019-10-08 14:52:47 +01:00
Sean Mac Gillicuddy
328f5626b7 Move multidex enabling to all projects 2019-10-08 14:21:32 +01:00
Sean Mac Gillicuddy
ff9c3e1852 configure coverage enabled for all debug build types 2019-10-08 13:47:49 +01:00
Sean Mac Gillicuddy
4adfa6b978 -Add example of extracting differing functionality. - Further separate content into respective modules - break plugin config into respective objects 2019-10-08 12:42:55 +01:00
Kelson
0718e2e346
Merge pull request #1545 from kiwix/feature/nitish/readme-grammar
Feature/nitish/readme grammar
2019-10-08 10:19:45 +01:00
Seán Mac Gillicuddy
ee303131d7
Merge pull request #1543 from NitishGadangi/patch-1
Fixed minor grammatical errors
2019-10-08 09:10:05 +01:00
Nitish Gadangi
2417123a13
Fixed minor grammatical errors 2019-10-06 23:03:36 +05:30
Justin Biggs
47bf1b5def Merge branch 'develop' into #1526-keep-soft-input-on-search
Resolve any conflicts before creating a pull request.
2019-10-06 07:49:23 -05:00
Justin Biggs
450066de6e #1526 show soft input on find-in-page clicked remove colloquial comment language 2019-10-05 09:51:31 -05:00
Justin Biggs
7866748099 #1526 show soft input on find-in-page clicked 2019-10-05 09:46:35 -05:00
Sean Mac Gillicuddy
2de9fb562e recursively create directories 2019-10-04 09:09:11 +01:00
Sean Mac Gillicuddy
e20d69bbba update path variable 2019-10-04 08:16:13 +01:00
Sean Mac Gillicuddy
09c3c38d0e Use HOME variable to specify full path 2019-10-03 15:48:53 +01:00
Sean Mac Gillicuddy
967c1b090f correct path for copying coverage reports 2019-10-03 14:43:59 +01:00
Sean Mac Gillicuddy
0da6bccec8 copy coverage report to pertinent directory 2019-10-03 14:09:25 +01:00
Sean Mac Gillicuddy
6bec72fbb8 assemble only app release 2019-10-03 12:39:35 +01:00
Sean Mac Gillicuddy
b464e3ef53 Fix failing test 2019-10-03 10:15:03 +01:00
Sean Mac Gillicuddy
e2b1b5b51e install junit dependencies for all configurations 2019-10-03 09:20:12 +01:00
Sean Mac Gillicuddy
55a0baa2a4 Don't include android resources for unit tests, requires minSDK 19 2019-10-02 15:07:35 +01:00
Sean Mac Gillicuddy
c32aed4e46 Move common configuration of all modules into buildSrc 2019-10-02 14:20:54 +01:00