Commit Graph

715 Commits

Author SHA1 Message Date
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
Shivam b341b9654d Added a random article button for server mode 2014-05-25 12:25:13 -04:00
Shivam faf1f3e01d Removed blank space above taskbar 2014-05-24 16:04:02 -04:00
kelson42 0411b0988c + update license header 2014-05-22 19:08:10 +02:00
kelson42 e885cc342a + Avoid buffer overflow on linux 2014-05-22 19:05:42 +02:00
Kelson42 f69edcf9c0 + fix fileExists() for Windows 2014-05-19 23:55:56 +02:00
Kelson42 c894e50344 Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2014-05-16 15:35:05 +02:00
Kelson42 b3c352f71a + use _strdup on Windows 2014-05-16 15:06:06 +02:00
Kelson42 1faca99274 Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2014-05-16 14:40:36 +02:00
Kelson42 2c530906c5 + XR29 port for Windows 2014-05-16 14:39:50 +02:00
rgaudin 7d3d54d01e Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2014-05-16 02:09:03 +00:00
rgaudin 4a22e8caed Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2014-05-16 01:20:10 +00:00
rgaudin 38108f064e moved loadICUExternalTables code to stringTools so it can be used by kiwix-serve 2014-05-16 01:19:27 +00:00
rgaudin c99cd00be4 merged with master 2014-05-15 17:09:19 +00:00
Kelson42 c3ae9d06b1 + Windows fix 2014-05-14 18:43:49 +02:00
Kelson42 1209e27e8c + Fix path computation functions for Windows 2014-05-14 18:33:11 +02:00
Kelson42 457406b743 Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2014-05-13 16:19:28 +02:00
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 b3264223ac Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2014-05-08 20:22:45 +00:00
rgaudin 9b32647fa4 Added ICU external dat table support for components (req. check for binaries) 2014-05-08 20:22:23 +00: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