Kelson42
dd76912d72
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
...
Conflicts:
kiwix/chrome/content/main/js/tools.js
2014-05-08 22:42:43 +02:00
rgaudin
249fdcf832
Merge branch 'master' into osxff29
2014-05-08 16:52:07 +00:00
kelson42
587b76bf6d
+ Fix deal with relative urls
2014-05-07 17:33:38 +02:00
kelson42
005b75f7ab
+ Introduction of base url in kiwix-serve (to handle relative urls in ZIM files)
2014-05-07 16:08:43 +02:00
rgaudin
7c3b2ca8da
Merge branch 'master' into osxff29
2014-05-06 08:44:47 +00:00
rgaudin
8c574270cf
merged with master on zimAccessor/VMStringLoader/configure.ac
2014-05-06 08:40:19 +00:00
rgaudin
f1dc03d5aa
removed duplicate type declaration on OSX (needed by c++11)
2014-05-06 08:09:25 +00:00
kelson42
4e05d0dea6
Change CTPP2 #include paths (add 'ctpp2/')
2014-05-05 14:14:11 +02:00
rgaudin
26b2e504f3
fixed includes for CTPP2
2014-05-04 20:11:48 +00:00
rgaudin
53b16f6b89
Merge branch 'master' into osxff29
2014-05-04 18:41:02 +00:00
Kelson42
8573f9eda0
make kiwix::urlDecode() available for Android
2014-05-04 14:41:48 +02:00
kelson42
9a5e6d70d6
+ Change license header
2014-05-03 18:00:54 +02:00
kelson42
1c2a03e287
+ getContentByEncodedUrl() and getContentByDecodedUrl()
2014-04-29 17:42:46 +02:00
kelson42
8397c81e6f
* merge unescapeurl() with the kiwix:urlDecode()
...
* create getContentByDecodedUrl() and getContentByEncodedUrl()
2014-04-29 17:41:52 +02:00
kelson42
5e974f67c6
+ merge Reader::unescapeUrl() and Kiwix::urlDecode()
2014-04-29 17:40:12 +02:00
kelson42
9bc88497df
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2014-04-04 18:43:14 +02:00
kelson42
3265de1579
+ Use now kiwix::sleep(0
2014-04-02 17:04:19 +02:00
kelson42
69684009e3
+ Add necessary header includes
2014-04-02 17:03:53 +02:00
kelson42
aeaede3834
+ add kiwix::sleep() method
2014-04-02 16:55:35 +02:00
kelson42
ae390de24b
+ Stub class to store custom generic varia functions
2014-04-02 16:43:56 +02:00
kelson42
71082cf581
+ Add indexer destructor (to avoid compilation warning with "non-virtual destructor")
2014-04-02 16:38:15 +02:00
renaud gaudin
552d123b64
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2014-01-09 11:51:39 +00:00
kelson42
84b8a86c3e
Try to fix some problem with unicode path loading on windows
2014-01-06 03:27:03 +01:00
Rashiq Ahmad
31b651dc85
Merge remote-tracking branch 'origin/master'
2013-12-16 16:09:13 +01:00
kelson42
fc6254090a
+ remove clucene source files
2013-12-16 15:22:21 +01:00
kelson42
840442fccd
+ remove debug messages
2013-12-16 13:33:29 +01:00
kelson42
51fb9e1417
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2013-12-16 03:34:21 +01:00
Rashiq Ahmad
7d0c715e76
Merge remote-tracking branch 'origin/master'
2013-12-16 03:01:25 +01:00
renaud gaudin
27eababf7c
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2013-12-13 09:14:40 +00:00
Rashiq Ahmad
8e08340efd
Merge remote-tracking branch 'origin/master'
2013-12-12 21:26:35 +01:00
renaud gaudin
6d22810d2d
Merge branch 'master' into winbuild
2013-12-11 19:17:33 +00:00
renaud gaudin
6ed0acfde4
Merge branch 'master' into extern_zimlib
2013-12-09 12:07:38 +00:00
renaud gaudin
fd9c9ac17e
catching up with master
2013-12-09 12:02:58 +00:00
rgaudin
fcf84811c6
Fixed extern compile (static) on linux and removed Clucene dependency
2013-12-09 10:51:06 +00:00
Kelson42
060b6c03f1
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2013-11-24 13:22:48 +01:00
Kelson42
bf4381d4f4
Remove usage of UnicodeString.tempSubString() which is only available in recent versions of ICU
2013-11-24 13:22:05 +01:00
renaud gaudin
8bb7c040b1
Fixed CTPP2 loader to use resource instead of file
2013-11-14 18:50:26 +00:00
renaud gaudin
2bbe2cb9ad
Added compiled template to static
2013-11-13 20:02:20 +00:00
renaud gaudin
2a8d7fde56
Fixed CTPP2 not working
...
* Fixed templates
* Changed behavior of getHtml() to use higher level VM API
2013-11-13 19:58:56 +00:00
kelson42
ad20fde08f
+ android integrates now libicu
2013-11-12 02:03:34 +01:00
kelson42
39fa510af5
+ improve suggestions search, search also entitled words
2013-11-10 17:54:11 +01:00
kelson42
987d6f672f
+ take care the nore than maxsuggestions is delivered
2013-11-10 17:42:52 +01:00
kelson42
2ad238f095
+ fix kiwix:ucFirst and kiwix:lcFirst
2013-11-05 12:08:43 +01:00
kelson42
835388daf9
cleaner unescapeUrl()
2013-10-07 13:10:37 +02:00
kelson42
48fa26028f
+ fix small regression in the unescape_url() code
2013-10-06 20:58:20 +02:00
kelson42
696cfc90c3
+ small beautifying of the code
2013-09-22 16:56:16 +02:00
kelson42
0bab890203
+ fix small regression
2013-09-22 13:17:11 +02:00
kelson42
c9d1f562ff
+ fix a few typo/style stuff
2013-09-22 13:11:19 +02:00
Kiran Mathew Koshy
1299c4c264
wix::Manager::getBooksIDs() now returns diff files too.
2013-09-22 15:09:23 +05:30
Kiran Mathew Koshy
14a4394f6d
Permanant fix for bug651.
...
Kiwix manager class is back to original state, additional function for obtaining origID has been added to Kiwix::Reader class.
Kiwix-manage and Kiwix-serve back to normal.
2013-09-20 18:35:20 +05:30