6478 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nikolay Pultsin	06e11a1e90	Merge branch 'master' into video	2014-03-14 11:50:57 +02:00
Nikolay Pultsin	8922aa1aaf	formatting	2014-03-14 11:50:29 +02:00
Nikolay Pultsin	c53088b48e	Merge branch 'master' into video	2014-03-13 23:46:27 +00:00
Nikolay Pultsin	213414a52b	fbreader.ru => ru.fbreader.org	2014-03-13 23:12:19 +00:00
Nikolay Pultsin	f7527af713	Merge branch 'master' into video	2014-03-12 11:36:07 +00:00
Nikolay Pultsin	920e2a1c73	new branches	2014-03-12 11:35:59 +00:00
Nikolay Pultsin	411eb105f0	range bytes	2014-03-12 11:29:11 +00:00
Nikolay Pultsin	3dfd13972c	cleanup	2014-03-11 10:09:21 +00:00
Nikolay Pultsin	0108cf4a90	better video placeholder look	2014-03-11 10:02:28 +00:00
Nikolay Pultsin	e50ca32e11	working video code	2014-03-11 07:22:39 +00:00
Nikolay Pultsin	776ae124ca	start video player	2014-03-11 04:59:08 +00:00
Nikolay Pultsin	e4decfea08	renaming: video server => data server	2014-03-10 12:45:47 +00:00
Nikolay Pultsin	b3e27a4f9d	test httpd start	2014-03-10 11:50:53 +00:00
Nikolay Pultsin	e80f601317	added nanohttpd server	2014-03-09 13:01:46 +00:00
Nikolay Pultsin	e14011b7bb	<video> ePub3 support (in progress)	2014-03-08 17:50:20 +00:00
Nikolay Pultsin	cf2683079d	synchronization with ics branch	2014-03-08 17:48:32 +00:00
Nikolay Pultsin	87a7839ba4	added betayota branch to the auto-merge list	2014-03-06 15:09:13 +00:00
Nikolay Pultsin	5068a7a2b3	1.6.1	2014-02-24 22:05:24 +00:00
Nikolay Pultsin	138fb0e7fc	fixed Config behaviour for saved empty strings	2014-02-24 22:02:46 +00:00
Nikolay Pultsin	99fd2d3cc8	Merge pull request #186 from Trottel/patch-10 ... Update cs.xml	2014-02-24 14:56:14 +00:00
Trottel	f21b8fe13e	Update cs.xml	2014-02-24 12:13:46 +01:00
Nikolay Pultsin	3849860f70	cleanup	2014-02-24 01:00:41 +00:00
Nikolay Pultsin	41d9dfffee	fixed JavaInputStream::seek	2014-02-24 00:59:45 +00:00
Nikolay Pultsin	b5ca143a94	zip optimization	2014-02-24 00:59:06 +00:00
Nikolay Pultsin	16c90c6108	extra check	2014-02-24 00:58:32 +00:00
Nikolay Pultsin	3faffde970	more namespaces	2014-02-24 00:57:48 +00:00
Nikolay Pultsin	7d8456ac33	release date	2014-02-23 21:21:03 +00:00
Nikolay Pultsin	fc67a3b0f5	ACTION_OPEN_PLUGIN ... Conflicts: src/org/geometerplus/android/fbreader/RunPluginAction.java	2014-02-23 21:19:30 +00:00
Nikolay Pultsin	9d8ef7b04f	updated ChangeLog	2014-02-23 19:48:40 +00:00
Nikolay Pultsin	c84adc32d6	better network search logic	2014-02-23 19:48:20 +00:00
Nikolay Pultsin	d4654461d7	do not search on qumran sites with cyrillic patterns	2014-02-23 18:00:18 +00:00
Nikolay Pultsin	69e8803a80	fixed URL resolving	2014-02-23 15:45:38 +00:00
Nikolay Pultsin	96ee3e4042	updated ChangeLog	2014-02-22 10:14:44 +00:00
Nikolay Pultsin	24d3813d5b	EncryptionMethod class moved to zlibrary	2014-02-16 16:34:37 +00:00
Nikolay Pultsin	bf559f0e4f	formatting	2014-02-16 14:59:31 +00:00
Nikolay Pultsin	34ac528222	EncryptionInfo moved to ZLFile level	2014-02-16 13:50:43 +00:00
Nikolay Pultsin	7fc0963b65	unused include	2014-02-16 01:13:17 +00:00
Nikolay Pultsin	746f19b874	Encryption info usage (in progress)	2014-02-16 01:07:05 +00:00
Nikolay Pultsin	6902f72b31	EncryptionInfo moved to a separate file	2014-02-16 01:05:33 +00:00
Nikolay Pultsin	bab7f61ece	fixed getContainerArchive() implementation	2014-02-16 01:03:36 +00:00
Nikolay Pultsin	848b955b6b	encryption.xml support	2014-02-15 19:03:43 +00:00
Nikolay Pultsin	0ed21e3026	resource name	2014-02-13 20:07:56 +00:00
Nikolay Pultsin	b52849025a	"encryption type" => "encryption method"	2014-02-13 20:03:03 +00:00
Nikolay Pultsin	2f75bb15d6	encryption type is visible from java code	2014-02-13 19:20:15 +00:00
Nikolay Pultsin	480d3d1398	implemented OEBEncryptionReader; fixed container.xml search	2014-02-13 19:20:06 +00:00
Nikolay Pultsin	60032f42ef	always call book collection actions after canfig initialization	2014-02-13 16:24:03 +04:00
Nikolay Pultsin	149bb759fc	yotabeta branch in standard list	2014-02-09 02:20:23 +04:00
Nikolay Pultsin	696801dc47	alphabetical order in imports	2014-02-09 02:18:35 +04:00
Nikolay Pultsin	45c0bab4e4	re-ordering	2014-02-08 23:25:08 +04:00
Nikolay Pultsin	57be868eba	better processing for file errors	2014-02-08 20:10:34 +01:00