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
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
Kelson42
9c21741a60
Merge branch 'master' of /home/kelson/ios
2015-01-05 10:46:17 +01:00
Kelson42
374b4235e6
+ add indexPath
2014-10-31 17:56:00 +01:00
Kelson42
44d9b2f70c
+ Allow cross-domain requests
2014-10-16 23:30:20 +02:00
Julian Harty
592631297a
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2014-10-06 16:21:55 +01:00
Kelson42
6934dab86e
+ fix taskbar CSS
2014-09-18 14:54:49 +02:00
Kelson42
9f4f5091a5
+ improve taskbar CSS
2014-09-18 14:50:11 +02:00
Kelson42
fd9a39ec3d
+ fix kiwix-serve taskbar css
2014-09-18 14:22:47 +02:00
Kelson42
588a67668b
+ fix tasbar css
2014-09-18 14:17:56 +02:00
Kelson42
511f023d94
+ improve kiwix-serve taskbar css
2014-09-18 14:08:36 +02:00
Kelson42
c3d9b5666e
+ more robus mimetype retrieving
2014-09-14 18:40:39 +02:00
Julian Harty
5a22c0e9eb
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2014-09-11 16:05:27 +01:00
kelson42
277e9cfa86
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix into HEAD
2014-09-05 11:19:13 -07:00
renaud gaudin
cab4680e0c
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
2014-09-04 09:47:36 +00:00
kelson42
51ae9ed8bf
+ Fix "load" button width in kiwix-serve library page
2014-08-31 14:14:26 -06:00
kelson42
7329997959
Don't append "containing ..." to the suggestions if no search index available
2014-08-31 13:55:44 -06:00
kelson42
b38c4306d1
Don't propose a fulltext search if no fulltext index available
2014-08-31 12:27:00 -06:00
kelson42
e629f59f6e
Small beautifications of the code
2014-08-30 10:55:43 -06:00
kelson42
63ec186e37
Few simplification/beautification of the code
2014-08-30 10:37:17 -06:00
kelson42
11a5594816
+ mimetype detection fix
2014-08-29 19:43:20 -06:00
kelson42
12a29cb343
Small fix in mimetype detection
2014-08-29 19:25:27 -06:00
kelson42
3c8a8211be
Speedup mimetype detection in kiwix-serve
2014-08-29 19:10:01 -06:00
kelson42
69cde1cdee
Small simplification of the code
2014-08-29 02:51:20 -06:00
kelson42
965968e38f
+ small simplification of the code
2014-08-29 02:46:25 -06:00
kelson42
ce0fe47daf
+ small beautifications
2014-08-28 14:59:03 -06:00
kelson42
b2d7316f8b
Small beautifications
2014-08-28 14:55:11 -06:00
