mhutti1
1a5f21f1b6
Merge branch 'master' of https://github.com/kiwix/kiwix
9 years ago
Kelson
8a08fb147e
Merge pull request #339 from kiwix/handle_zim_without_index
...
Handle zim without index
9 years ago
Kelson
defa768b25
Merge pull request #338 from kiwix/kiwix_server_no_arg
...
Do not loop infinitely if there is no argument passed to kiwix-serve.
9 years ago
Matthieu Gautier
8a9673191e
Do not loop infinitely if there is no argument passed to kiwix-serve.
...
If there is no argument, optind==argc==1. We must not try to look into argv[1]
but we need to break the loop anyway.
9 years ago
kelson42
cd623ce358
Fix crash with ZIM files without FT indexes
9 years ago
kelson42
2458c22e09
Fix kiwix-mange problem with relative paths
9 years ago
Kelson
96f0fff54d
Implement ZIM reader getTags() and getName()
9 years ago
Kelson
4b6ad3508a
Merge pull request #275 from kiwix/several_zim_argument
...
Be able to run kiwix-serve with several zim as arguments.
9 years ago
Matthieu Gautier
44255453db
Be able to run kiwix-serve with several zim as arguments.
9 years ago
Kelson
493c8cb95e
Merge pull request #274 from kiwix/embedded_zim_support
...
Add support of embedded ft-index in zim for kiwix-serve and kiwix-search.
9 years ago
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.
9 years ago
Elad Keyshawn
d8acb2328c
Merge-Conflict resolved
10 years ago
Elad Keyshawn
b4d5571375
Merge pull request #30 from EladKeyshawn/master
...
New hint dialog of right contents drawer - on first launch
10 years ago
Elad Keyshawn
5f9cd39ccc
Merge pull request #28 from EladKeyshawn/master
...
Now only one - Clear History option which clears recent searches and all open tabs. ;)
10 years ago
Elad Keyshawn
464106ad28
Merge remote-tracking branch 'remotes/upstream/master'
...
# Conflicts:
# android/res/values/strings.xml
10 years ago
Isaac
489aadf271
Merge pull request #25 from EladKeyshawn/master
...
Added "Clear History" in settings - clears history
10 years ago
Elad Keyshawn
a7c51d676a
Resolve merge conflict
10 years ago
Elad Keyshawn
575b36ee1f
Merge remote-tracking branch 'remotes/upstream/master'
10 years ago
Elad Keyshawn
4d51e6f460
Merge remote-tracking branch 'remotes/upstream/master'
10 years ago
Elad Keyshawn
52a60e8857
Merge remote-tracking branch 'remotes/upstream/master'
10 years ago
Isaac
e892e32e45
Merge pull request #18 from EladKeyshawn/master
...
- Implemented improved bookmarks - Fixed undo when only one tab exists
10 years ago
Elad Keyshawn
cbd94bbc03
Merge remote-tracking branch 'remotes/upstream/master'
...
# Conflicts resolved:
# android/res/values/strings.xml
# android/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
10 years ago
Isaac
16bb669711
Merge branch 'wmhack'
10 years ago
Rashiq Ahmad
25093ec6a0
Merge pull request #14 from EladKeyshawn/master
...
implemented snackbar - UNDO on closing tab
10 years ago
Elad Keyshawn
5e496b9b40
implemented snackbar - UNDO on closing tab
...
https://sourceforge.net/p/kiwix/feature-requests/232/
10 years ago
kelson42
b7133c5304
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
10 years ago
Emmanuel Engelhart
cb9074d528
Merge commit 'f596570027141d30117c086d3833d426fb4d2b25'
10 years ago
kelson42
ecdad092a2
Merge commit 'f596570027141d30117c086d3833d426fb4d2b25'
10 years ago
kelson42
7c249c65c2
Merge commit 'd15d05d386ebff533017a83241971d352797a00e'
10 years ago
kelson42
1562e78390
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
10 years ago
Emmanuel Engelhart
cf01999bf7
Merge commit '6e58ab4ffc29ac9d2aa4805b46796692caddfea1'
10 years ago
Emmanuel Engelhart
a1c7b7ebee
Merge branch 'master' of git://git.code.sf.net/p/kiwix/kiwix
10 years ago
Kelson
97e2c777d2
Merge commit '8be5d3badf99d4707afbddddf58a87eb54aa68c1'
...
Conflicts:
android/src/org/kiwix/kiwixmobile/SearchActivity.java
10 years ago
Kelson
da8c49621a
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
10 years ago
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
10 years ago
kelson42
b7f6ddd3f5
Add a few comments
10 years ago
Florian Schüller
912fb35fae
Linux implementation to select interface to bind to
10 years ago
Emmanuel Engelhart
022b8b3445
Fix typo in HTTP 404 error message
10 years ago
Emmanuel Engelhart
09cd024199
Add VAR HTTP-HEADER if necessary
10 years ago
Emmanuel Engelhart
cdb53beb3b
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
...
Conflicts:
android/AndroidManifest.xml
10 years ago
Emmanuel Engelhart
e6e500007c
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
10 years ago
Wilfredo Rodriguez
2490f3c916
small fix redundant
10 years ago
Kelson42
ecb821a834
More aggresive caching
11 years ago
kelson42
5983eea473
Merge branch 'master' of git://git.code.sf.net/p/kiwix/kiwix
11 years ago
kelson42
0bbe48d13a
URLEncode random urls
11 years ago
Emmanuel Engelhart
f95994898b
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
11 years ago
renaud gaudin
3c4457a7e1
give some margin (ahah) for the margin to be eaten up
11 years ago
renaud gaudin
fea4cf15a3
transparency kiwix-serve
11 years ago
renaud gaudin
225d76a6d6
[kiwix-serve] Fixed taskbar margin from content if content has no margin
11 years ago
renaud gaudin
b9a9e32d20
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
11 years ago