Matthieu Gautier
2fc94514f8
Add support of embedded ft-index in zim for kiwix-serve and kiwix-search.
...
- kiwix-search will try the embedded ft-index if no indexPath is specified
in the library.xml or command argument.
- kiwix-search also uses xapianSearcher and xapianSearcher needs zimlib,
so add zimlib in compilation flag for searcher.
- kiwix-serve already depends on zimlib.
2016-08-11 17:50:25 +02:00
Elad Keyshawn
d8acb2328c
Merge-Conflict resolved
2016-05-05 16:52:39 +03:00
Elad Keyshawn
b4d5571375
Merge pull request #30 from EladKeyshawn/master
...
New hint dialog of right contents drawer - on first launch
2016-05-02 17:47:36 +03:00
Elad Keyshawn
5f9cd39ccc
Merge pull request #28 from EladKeyshawn/master
...
Now only one - Clear History option which clears recent searches and all open tabs. ;)
2016-04-30 22:41:09 +03:00
Elad Keyshawn
464106ad28
Merge remote-tracking branch 'remotes/upstream/master'
...
# Conflicts:
# android/res/values/strings.xml
2016-04-30 22:26:47 +03:00
Isaac
489aadf271
Merge pull request #25 from EladKeyshawn/master
...
Added "Clear History" in settings - clears history
2016-04-19 19:02:45 +01:00
Elad Keyshawn
a7c51d676a
Resolve merge conflict
2016-04-17 20:27:39 +03:00
Elad Keyshawn
575b36ee1f
Merge remote-tracking branch 'remotes/upstream/master'
2016-04-14 23:38:20 +03:00
Elad Keyshawn
4d51e6f460
Merge remote-tracking branch 'remotes/upstream/master'
2016-04-10 09:38:39 +03:00
Elad Keyshawn
52a60e8857
Merge remote-tracking branch 'remotes/upstream/master'
2016-04-09 23:02:51 +03:00
Isaac
e892e32e45
Merge pull request #18 from EladKeyshawn/master
...
- Implemented improved bookmarks - Fixed undo when only one tab exists
2016-04-06 12:11:39 +01:00
Elad Keyshawn
cbd94bbc03
Merge remote-tracking branch 'remotes/upstream/master'
...
# Conflicts resolved:
# android/res/values/strings.xml
# android/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
2016-04-05 10:16:54 +03:00
Isaac
16bb669711
Merge branch 'wmhack'
2016-04-03 13:30:57 +03:00
Rashiq Ahmad
25093ec6a0
Merge pull request #14 from EladKeyshawn/master
...
implemented snackbar - UNDO on closing tab
2016-04-02 15:15:05 +03:00
Elad Keyshawn
5e496b9b40
implemented snackbar - UNDO on closing tab
...
https://sourceforge.net/p/kiwix/feature-requests/232/
2016-04-02 15:08:59 +03:00
kelson42
b7133c5304
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2016-01-28 08:26:09 +01:00
Emmanuel Engelhart
cb9074d528
Merge commit 'f596570027141d30117c086d3833d426fb4d2b25'
2016-01-17 17:18:11 +01:00
kelson42
ecdad092a2
Merge commit 'f596570027141d30117c086d3833d426fb4d2b25'
2016-01-13 11:47:25 +01:00
kelson42
7c249c65c2
Merge commit 'd15d05d386ebff533017a83241971d352797a00e'
2016-01-13 10:44:09 +01:00
kelson42
1562e78390
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2016-01-13 10:43:51 +01:00
Emmanuel Engelhart
cf01999bf7
Merge commit '6e58ab4ffc29ac9d2aa4805b46796692caddfea1'
2016-01-11 21:36:31 +01:00
Emmanuel Engelhart
a1c7b7ebee
Merge branch 'master' of git://git.code.sf.net/p/kiwix/kiwix
2016-01-11 21:15:51 +01:00
Kelson
97e2c777d2
Merge commit '8be5d3badf99d4707afbddddf58a87eb54aa68c1'
...
Conflicts:
android/src/org/kiwix/kiwixmobile/SearchActivity.java
2016-01-07 10:56:26 +01:00
Kelson
da8c49621a
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2016-01-07 10:42:36 +01:00
Rashiq
72eeb245fa
Merge remote-tracking branch 'origin/master'
...
* origin/master:
Reformat project
Remove html-inverting js
Organize files in packages
The actionbar title is now clickable
Added persistent fullscreen
Added persistent fullscreen
Add 'sc' and 'lki' UI languages
Update of the UI translations
Update meta data of custom Android apps
Add VAR HTTP-HEADER if necessary
Make the app movable to the sd card
Update UI translations
Windows FSJ-Lite ZIM file splitter is not available anymore, replace it in the help with 'JS-SplitD'
Beautify bookmark XML file
Fix selection color problem with library buttons
Revised the instructions for OS X
Bump up Android version
2016-01-06 15:42:42 +01:00
kelson42
b7f6ddd3f5
Add a few comments
2016-01-03 14:00:53 +01:00
Florian Schüller
912fb35fae
Linux implementation to select interface to bind to
2015-12-12 00:23:10 +01:00
Emmanuel Engelhart
022b8b3445
Fix typo in HTTP 404 error message
2015-12-07 19:12:13 +01:00
Emmanuel Engelhart
09cd024199
Add VAR HTTP-HEADER if necessary
2015-11-10 22:24:56 +01:00
Emmanuel Engelhart
cdb53beb3b
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
...
Conflicts:
android/AndroidManifest.xml
2015-08-01 20:55:40 +02:00
Emmanuel Engelhart
e6e500007c
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2015-07-23 17:46:19 +02:00
Wilfredo Rodriguez
2490f3c916
small fix redundant
2015-07-03 10:10:14 -03:00
Kelson42
ecb821a834
More aggresive caching
2015-04-19 13:01:40 +02:00
kelson42
5983eea473
Merge branch 'master' of git://git.code.sf.net/p/kiwix/kiwix
2015-04-03 19:37:24 +02:00
kelson42
0bbe48d13a
URLEncode random urls
2015-04-03 19:36:48 +02:00
Emmanuel Engelhart
f95994898b
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2015-03-02 18:45:06 +01:00
renaud gaudin
3c4457a7e1
give some margin (ahah) for the margin to be eaten up
2015-03-02 15:03:30 +00:00
renaud gaudin
fea4cf15a3
transparency kiwix-serve
2015-03-02 15:00:13 +00:00
renaud gaudin
225d76a6d6
[kiwix-serve] Fixed taskbar margin from content if content has no margin
2015-03-02 14:54:29 +00:00
renaud gaudin
b9a9e32d20
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2015-03-02 14:23:38 +00:00
renaud gaudin
b4da0c26d7
[kiwix-serve] Fixed taskbar height (2 lines) on Cybook and transparency of autocomplete search result
2015-03-02 14:23:26 +00:00
renaud gaudin
d3aabe626b
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2015-02-19 15:41:23 +00:00
renaud gaudin
436425bd1c
Fixed incorect behavior of buttons in taskbar
2015-02-19 15:31:16 +00:00
renaud gaudin
5dddd4d98c
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2015-02-19 14:58:26 +00:00
renaud gaudin
45b34ebba7
Added Bookeen/Cybook CSS/JS hack for taskbar on ereader and increased taskbar size on hdpi screens
2015-02-19 14:57:50 +00:00
Emmanuel Engelhart
08b6bc02ae
Repush icons (they were destroyed by last commit)
2015-02-11 17:41:51 +01:00
wilfredor
7a0a70c7f6
Adding more ISO languages and fixing identation
2015-02-11 14:35:57 -02:00
jleow00
4f6945e757
Merge branch 'master' of ssh://git.code.sf.net/u/jleow00/kiwix
...
merge fork with updated upstream
2015-01-09 19:41:55 +08:00
Kelson42
58dc863e38
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
...
Conflicts:
CHANGELOG
2015-01-08 12:55:53 +01:00
Kelson42
7d30941068
FIXED: kiwix-serve XSS attack vulnerability ( #763 )
2015-01-08 12:51:42 +01:00
