772 Commits

Author SHA1 Message Date
Mossroy
80522867bf Use version 47 of Firefox in nightwatch unit and UI tests.
To workaround some random timeouts in Travis on Firefox>=48
Fixes #251
2017-06-29 21:01:16 +02:00
Jaifroid
213b937d51 Implements #268 Update jQuery to 3.2.1
Implements #268
2017-06-29 08:48:43 +01:00
Jaifroid
f038c4945f Rebrand candidate files (#263)
* Rebrand candidate files

Implements #262

* Reverted some refs to kiwix-html5

* Revert email for FFOS

* Changed HTML5 in email header

* Rebrand candidate files

Implements #262
2017-06-24 13:09:07 +01:00
Mossroy
6f488717c4 Merge pull request #261 from kiwix/fix-setremote-archive-for-Sauce-UI-tests
Minor enhancements on the way to inject the ZIM file for UI tests
2017-06-21 16:21:04 +02:00
Mossroy
172c8a6785 Read the ZIM file from localhost for UI tests
Instead of reading it from github.io
2017-06-21 15:57:43 +02:00
Mossroy
0624b99cb7 Properly use onreadystatechange on XHR for reading ZIM for UI tests. 2017-06-21 15:57:28 +02:00
Mossroy
be383bc1fa Merge pull request #258 from kiwix/more-info-when-ZIM-file-not-found-in-unit-tests
Give more info when a ZIM file is not found in unit tests.
2017-06-21 11:03:22 +02:00
Mossroy
3a166b8ed4 Give more info when a ZIM file is not found in unit tests.
Now it gives an error in the console log.
Fixes #234
Also replace this.* by xhr.* to be consistent in the code style
2017-06-21 11:01:50 +02:00
Mossroy
165ae7a8bd Merge pull request #260 from kiwix/Test-TOTAL_MEMORY-values-xzdec.js
Fixes #253 (EMSCRIPTEN buffer overrun)
2017-06-21 10:47:01 +02:00
Jaifroid
33ffb25f77 Fixes #253 (EMSCRIPTEN buffer overrun)
Incorrectly entered HEX value for TOTAL_MEMORY in xzdec.js. See #253 for full discussion. NB this file is minified, so diffs will not look pretty.
2017-06-19 10:32:01 +01:00
Mossroy
bf0f5bd924 Merge pull request #256 from kiwix/Random-button-display-bug
Fixes #250 Random button display bug
2017-06-18 22:29:30 +02:00
Mossroy
0c7944cfdb Merge pull request #255 from kiwix/Add-zimb-extensions
Add .zimb-extensions: fixes #254
2017-06-18 22:18:04 +02:00
Jaifroid
499fac07eb Fixes #250 Random button display bug
"Random" button displays over Wiki page in Windows 10 Mobile portrait orientation.
2017-06-18 10:35:17 +01:00
Jaifroid
cce09409b5 Add .zimb-extensions: fixes #254
Add .zimb-series extensions to <input ...> tag in .html
2017-06-18 09:20:57 +01:00
Jaifroid
c7c16d6881 Ignore VS
Ignore Visual Studio configuration files
2017-06-18 08:55:36 +01:00
Mossroy
e2a3941ba6 Fix requirejs Netbeans mapping for jQuery library.
To fix code autocompletion on this library
2017-06-05 17:46:18 +02:00
Mossroy
e9e2593615 Switch to 2.2-WIP in source code, to prepare version 2.2 2017-06-05 17:43:55 +02:00
Mossroy
041137dace Fix in script to publish to gh-pages 2017-06-05 17:38:17 +02:00
Mossroy
7fb1dd2d29 Fix Chrome extension version number.
It was wrong because we did not use the modified files in tmp/
Also rename the unsigned Firefox extensions as .zip instead of .xpi
2.1.0 2.1.0rc3
2017-06-02 23:20:05 +02:00
Mossroy
5d019dc6d6 Use 2 deploy providers in .travis.yml to handle nightly and tags.
It does not seem to be possible to have only one script launched in
both cases.
Should really fix #245
2.1.0rc2
2017-06-02 22:45:47 +02:00
Mossroy
d37f97183c Merge pull request #246 from kiwix/fix-travis-nighlty-builds-and-tags
Fix .travis.yml to generate packages for both nightly and tags.
2.1.0rc1
2017-06-02 22:28:57 +02:00
Mossroy
5cfa7dc76d Fix .travis.yml to generate packages for both nightly and tags.
Fixes #245
2017-06-02 22:23:15 +02:00
Mossroy
e4355cd4be Merge pull request #244 from kiwix/enhance-scripts-for-release
Enhance packaging scripts to handle public releases on tags
2017-05-31 22:49:49 +02:00
Mossroy
1bf2b9fa52 Change version numbers to 2.1-WIP 2017-05-31 22:36:49 +02:00
Mossroy
8421edb898 Enhance packaging scripts to handle public releases on tags.
So that Travis automatically runs on tags, and generates the
necessary files to be uploaded to Mozilla and Google.

Fixes #243
2017-05-31 22:33:35 +02:00
Mossroy
a3d3c76659 Merge pull request #241 from kiwix/readme_on_old_features_and_rewording_of_title_vs_direntry
Readme on old features and rewording of title vs direntry
2017-05-28 23:03:21 +02:00
Mossroy
25cda11420 Reword titleName to title, and remove DirEntry.name() and .getReadableName().
To help understanding the code.
2017-05-28 16:27:19 +02:00
Mossroy
e521f9dac0 Remove the zimArchive._dirEntryToTitleObject function to simplify. 2017-05-28 12:20:11 +02:00
Mossroy
c091922246 Remove the concept of Title (remaining from Evopedia archive structure).
As suggested in #218
2017-05-28 11:39:51 +02:00
Mossroy
2b7ff70ff5 Minor update README to talk about old removed features.
As suggested in #218
2017-05-27 23:13:15 +02:00
Mossroy
bf007b449e Merge pull request #239 from sharun-s/fix177
Fixes #177 History Navigation
2017-05-26 23:17:28 +02:00
sharun-s
a50196b151 Fixes #177 History Navigation
"article URL" should have been used instead of "article Title" when saving browser history state. But when these terms are being read from the DirEntry "article Namespace" is being prepended to url and stored as url. The fix is to stop doing this prepending. That keeps it consistent to the reader when "DirEntry.url" is reqd and when "DirEntry.namespace + '/' + DirEntry.url" is required. Further details here

Changes:
www/js/zimDirEntry.js
url should not hold namespace + url

www/js/app.js
In gotoRandom, handleTitleClick, gotoMainArticle
now passes title.url instead of title.name() to pushBrowserHistoryState

www/js/app.js, tests/tests.js
Replaced occurances of title.url with title.namespace + title.url
2017-05-27 02:29:28 +05:30
Mossroy
3d40e68c02 Merge pull request #237 from kiwix/copy-firefox-extension-from-previous-nightly-if-already-signed
Copy signed Firefox extension from previous nightly if already signed.
2017-05-24 14:50:07 +02:00
Mossroy
713aa94f3a Copy signed Firefox extension from previous nightly if already signed.
Mozilla does not allow to sign a version that has already been signed.
This is an issue in nightly builds when nothing has been commited in the
last day.
The workaround commited here is to copy the signed extension of this
same version from other nightly folders
Fixes #217
2017-05-24 14:44:30 +02:00
Mossroy
5cd33d2d0b Merge pull request #236 from kiwix/fix-attempt-travis-nightwatch-sometimes-failing
add and adjust waitForElementVisible calls in nightwatch.
2017-05-22 21:18:59 +02:00
Mossroy
528e5e26ac add and adjust waitForElementVisible calls in nightwatch.
To try to solve Travis failures. See #228
2017-05-22 21:12:23 +02:00
sharun-s
228657a24e Fixes #131 Unit Testing on Chrome. (#233)
* Fixes #131 Unit Testing on Chrome.
Requires Chrome to be started with --allow-file-access-from-files when opening tests.html.
Chrome does not support xhr for the "file://"" protocol (which is used by the tests), unless the flag is set.

Easiest way (on windows) is to create a Chrome shortcut with the flag in local directory.

Tests also work on Firefox and Edge.

Changes:

zimFile.js:

fileArray.sort() in fn fromFileArray needs to be passed a comparision function to sort blob objects by "name".

Chrome was sorting blob objects differently than Firefox and Edge.

Reading the first 80 bytes of the fileArray[0] to retrieve zim header details then would fail causing tests to fail.

NOTE: If array size is 10 or less the blob sort order is the same across all 3 browsers.
So best to test with larger than 10 blobs.

tests/tests.js:

* Removed xhr.status==200 check in makeblobrequest.

	It fails in Chrome. Even though the blobs are read xhr.status is set to 0.
	Probably related to "file://" handling policy.

* toSource() in the load Image 'm/RayCharles_AManAndHisSoul.jpg' test is non-standard. Works only in FF. Changed to toString().

* Updated QUnit to 2.3.2 as QUnit.asyncTest is deprecated. Removed old files.

tests/tests.html:

* Updated to use QUnit 2.3.2 files.
2017-05-20 16:36:21 +02:00
Kelson
fc6b7ae5a4 Merge pull request #232 from kiwix/uppercase_wikipedia_wikimedia_words_in_UI_and_README
Change case of wikipedia and wikimedia words in UI and README.
2017-05-12 12:59:50 +02:00
Mossroy
7aee9a006f Change case of wikipedia and wikimedia words in UI and README.
There must be an uppercase as the first letter.
Fixes #225
2017-05-11 22:33:37 +02:00
Mossroy
9d07f50117 Merge pull request #231 from kiwix/waitForElementVisible_title_nightwatch
Add a waitForElementVisible for the expected article in UI tests
2017-05-11 22:32:54 +02:00
Mossroy
9c03d22c71 Add a waitForElementVisible for the expected article in UI tests
To try to solve Travis failures. See #228
2017-05-11 22:29:41 +02:00
Mossroy
47fe67daeb Merge pull request #227 from kiwix/readme_injection_modes
Add info in README about the injection modes.
2017-05-10 14:52:53 +02:00
Mossroy
b8043d9832 Add info in README about the injection modes.
A suggested in #218
2017-05-10 14:44:55 +02:00
Mossroy
c693362c8a Merge pull request #226 from kiwix/remove-legacy-unused-code
Remove legacy unused code for Evopedia and Cordova/Phonegap
2017-05-10 14:43:48 +02:00
Mossroy
3001087849 Remove Cordova/Phonegap code.
Fixes #223
And rename osabstraction.js to abstractFilesystemAccess.js, to make its purpose more clear
2017-05-07 23:00:30 +02:00
Mossroy
563090c615 Drop Evopedia archive compatibility.
And remove the corresponding legacy code.
And rename abstractBackend to zimArchiveLoader
Fixes #195
2017-05-07 22:59:01 +02:00
Mossroy
877f5ee6e9 Merge pull request #224 from kiwix/english_copy_editing
I've had a go at trying to improve the introductory guidance.
2017-05-06 22:00:49 +02:00
Julian Harty
9e0ee5be76 I've had a go at trying to improve the introductory guidance. It might
be worth rethinking the introduction and instructions as we use quite
technical terms and concepts.
2017-05-06 19:11:44 +01:00
Julian Harty
8e01b18b75 Merge pull request #222 from kiwix/more_info_incompatible_ZIMs
Add user info on which ZIM files are compatible.
2017-05-06 16:24:12 +01:00
Mossroy
bb83e83811 Add user info on which ZIM files are compatible.
To avoid users from being frustrated by incompatible ZIM files like in #220
Fixes #221
2017-05-06 13:45:52 +02:00