Commit Graph

1643 Commits

Author SHA1 Message Date
Emmanuel Engelhart dc60455cd3 in copyFile() try to make a link if possible, copy the content otherwise 2015-02-21 16:56:38 +01:00
Emmanuel Engelhart b2c38ebfc2 update 2015-02-19 16:43:02 +01:00
renaud gaudin 280aa5f77f Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2015-02-19 15:41:23 +00:00
renaud gaudin af1ee3c317 Fixed incorect behavior of buttons in taskbar 2015-02-19 15:31:16 +00:00
Emmanuel Engelhart 999a5b07ae New version 2015-02-19 16:20:49 +01:00
renaud gaudin 118feb75dc Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2015-02-19 14:58:26 +00:00
renaud gaudin 950637abef 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
jleow00 64361126d7 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 78db06e127 Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
Conflicts:
	CHANGELOG
2015-01-08 12:55:53 +01:00
Kelson42 8287a64172 FIXED: kiwix-serve XSS attack vulnerability (#763) 2015-01-08 12:51:42 +01:00
Kelson42 191d37a105 Merge branch 'master' of /home/kelson/ios 2015-01-05 10:46:17 +01:00
Kelson42 45ad751d89 New function getMimeTypeByUrl() 2014-12-08 01:37:06 +01:00
Kelson42 d7fd4064ab FIXED: Buggy pagination in fulltext result page 2014-11-24 20:52:46 +01:00
Kelson42 864922ab86 Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2014-10-20 15:39:08 +02:00
Kelson42 4290eaf751 + Avoid to load the welcome page by loading random ones 2014-10-18 18:14:46 +02:00
Julian Harty 378c66e16c Revert "Re move ANDROID pragma. This is not useful anymore (libicu) is now included"
This reverts commit 8a458417aa612409b8da9a44b9015786c2063244.
2014-10-08 10:44:55 +01:00
Julian Harty 05dc41157c Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2014-10-06 16:21:55 +01:00
kelson42 f6f49a63ce Re move ANDROID pragma. This is not useful anymore (libicu) is now included 2014-10-01 20:26:43 +02:00
Kelson42 49d13f09f1 + search filter addtionaly on language ISO code 2014-09-23 13:20:46 +02:00
Kelson42 bc161034c1 + Fix unstable fulltext library search 2014-09-20 16:05:19 +02:00
Kelson42 517a02b814 + fix taskbar CSS 2014-09-18 14:54:49 +02:00
Kelson42 4beccfbc0b + improve taskbar CSS 2014-09-18 14:50:11 +02:00
Kelson42 ec6c0b2ea3 + fix kiwix-serve taskbar css 2014-09-18 14:22:47 +02:00
Kelson42 f6dedb11b9 + fix tasbar css 2014-09-18 14:17:56 +02:00
Kelson42 436d57976e + improve kiwix-serve taskbar css 2014-09-18 14:08:36 +02:00
Kelson42 d8a924121b + more robus mimetype retrieving 2014-09-14 18:40:39 +02:00
Julian Harty 55927937dd Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2014-09-11 16:05:27 +01:00
kelson42 bc2bca017b Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix into HEAD 2014-09-05 11:19:13 -07:00
renaud gaudin 58c5ffbca5 Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2014-09-04 09:47:36 +00:00
kelson42 c1a8b4a206 + small optim 2014-08-31 19:27:23 -06:00
kelson42 45fccb2e38 + bool Manager::setBookIndex(const string id, const string path) 2014-08-30 10:37:52 -06:00
kelson42 baf8e37b4f Speedup mimetype detection in kiwix-serve 2014-08-29 19:10:01 -06:00
kelson42 f585bed1cb FIXED: kiwix-serve crash if unattended search "start" & "end" values 2014-08-28 13:36:58 -06:00
kelson42 518ce6635d + fix a few problem with the autocompletebox on kiwix-serve 2014-08-27 21:08:14 -06:00
kelson42 1cc94e1b95 + simplifaction of the code = cleaning 2014-08-27 17:13:29 -06:00
kelson42 a353513c9c NEW: Improve file size display in kiwix-serve 2014-08-27 13:22:34 -06:00
kelson42 9b2e914dac Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2014-08-08 19:56:36 +02:00
automactic eba61bb84a Initial Commit 2014-08-01 05:09:34 +08:00
Kelson42 86ef9800cc + new smaller version 2014-07-28 13:38:54 +02:00
Kelson42 1c3eaaf42a remove useless code 2014-07-28 13:36:10 +02:00
kelson42 beae77db89 Avoid kiwix-serve taskbar jquery dependencies to conflict with potential other version (in the ZIM file) 2014-07-20 22:06:52 +02:00
kelson42 d6d7274b0f + Fix code in ZIM reader class breaking DOM integrity 2014-07-19 19:29:51 +02:00
kelson42 17724fe70b + fix Doctype HTML line (was breaking Opera output) 2014-07-09 21:11:34 +02:00
kelson42 c8c53f68c5 Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2014-07-09 00:02:50 +02:00
Cristian Patrasciuc 5a695963d5 Port networkTools.cpp to Mac OS X.
On Mac OS X the ioctl(SIOCGIFCONF) call will return all IPv4, IPv6
and MAC addresses, so we have to filter only the ones that have
sa_family equal to AF_INET.

I also added the common interface names for Mac OS X (en0 and en1),
to the getBestPublicIp() function. I refactored a bit the code so
that addition and reordering are easier.

Bugs: https://sourceforge.net/p/kiwix/bugs/658/
2014-06-17 17:46:54 +02:00
kelson42 0bedd7ebc9 Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2014-06-13 14:32:57 +02:00
renaud gaudin 1b192c2557 Added 10.0.0.0 private network scheme 2014-05-31 13:53:46 +00:00
Shivam a37fd98585 Updated resourceTools.h to reflect moved toolbar css file (not sure if necessary) 2014-05-25 18:10:44 -04:00
kelson42 cef7967bcb Merge commit '2e9e80f4b73af420e342ae35bff6f95af4d4b9d0' 2014-05-25 20:27:46 +02:00
kelson42 5b3f0909d7 Merge commit '5f7349493e679c4c7c9f79642b4357def660f4a9' 2014-05-25 20:16:08 +02:00