1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 01:39:18 +02:00
Commit graph

6134 commits

Author SHA1 Message Date
Nikolay Pultsin
af678db02c main fbreader icon in svg format 2013-10-24 04:18:06 +01:00
Nikolay Pultsin
7818d7315a misc fbreader related icons 2013-10-24 04:16:34 +01:00
Nikolay Pultsin
5d6f3422fc beta version => 2.0 beta 11 2013-10-24 02:34:24 +01:00
Nikolay Pultsin
ef90f7a11d synchronization with beta branch 2013-10-24 01:32:13 +01:00
Nikolay Pultsin
f5e353c29e a rollback: existing method is good enough 2013-10-24 00:48:06 +01:00
Nikolay Pultsin
4a1cdf2b68 new method will be used in PDF plugin 2013-10-24 00:44:01 +01:00
Nikolay Pultsin
0952691117 formatting + imports cleanup 2013-10-21 04:49:51 +01:00
Nikolay Pultsin
59728f282d imports order
Conflicts:

	src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
2013-10-21 01:15:30 +01:00
Nikolay Pultsin
30f1d65b89 formatting
Conflicts:

	src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java
2013-10-21 00:46:12 +01:00
Nikolay Pultsin
cf76b17a70 formatting + @Override annotations 2013-10-20 22:05:29 +01:00
Nikolay Pultsin
0f5fd75544 formatting 2013-10-20 19:21:01 +01:00
Nikolay Pultsin
22eb6128fd formatting
Conflicts:

	src/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarHeader.java
2013-10-20 18:52:43 +01:00
Nikolay Pultsin
e261693567 formatting 2013-10-20 18:40:11 +01:00
Nikolay Pultsin
b2a22832d9 formatting
Conflicts:

	src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
2013-10-20 18:22:06 +01:00
Nikolay Pultsin
cb0d1d8fe8 formatting
Conflicts:

	src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
	src/org/geometerplus/android/fbreader/preferences/ZLColorPreference.java
	src/org/geometerplus/fbreader/library/Library.java
	src/org/geometerplus/zlibrary/core/html/ZLHtmlParser.java
	src/org/geometerplus/zlibrary/core/xml/ZLXMLReaderAdapter.java
	src/org/geometerplus/zlibrary/text/view/ZLTextWordCursor.java
	src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java
2013-10-20 17:57:46 +01:00
Nikolay Pultsin
dd05da8efc formatting
Conflicts:

	src/org/geometerplus/zlibrary/core/util/ZLColor.java
2013-10-20 17:16:34 +01:00
Nikolay Pultsin
ad24a996ae formatting 2013-10-20 17:05:31 +01:00
Nikolay Pultsin
dd3d4668de formatting
Conflicts:

	src/org/geometerplus/zlibrary/text/view/ZLTextView.java
2013-10-20 16:51:13 +01:00
Nikolay Pultsin
dcad855ac9 formatting 2013-10-20 16:36:28 +01:00
Nikolay Pultsin
e3a22d3a77 formatting
Conflicts:

	src/org/geometerplus/zlibrary/core/image/ZLFileImage.java
2013-10-20 16:23:39 +01:00
Nikolay Pultsin
b6ec66cf86 formatting
Conflicts:

	src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
2013-10-20 16:17:07 +01:00
Nikolay Pultsin
5e9a5a9faf formatting
Conflicts:

	src/org/geometerplus/android/fbreader/FBReader.java
2013-10-20 15:54:41 +01:00
Nikolay Pultsin
3f1cdb69a9 formatting 2013-10-19 16:04:13 +01:00
Nikolay Pultsin
ea5927d054 formatting 2013-10-19 15:50:27 +01:00
Nikolay Pultsin
096a60c602 ApiObject.Float type 2013-10-19 15:49:36 +01:00
Nikolay Pultsin
f59530d2e7 unused import 2013-10-19 14:46:28 +01:00
Nikolay Pultsin
183335f62d fixed behaviour 2013-10-19 14:27:39 +01:00
Nikolay Pultsin
f41e1a286d formatting
Conflicts:

	src/org/geometerplus/android/fbreader/DictionaryUtil.java
2013-10-19 14:01:15 +01:00
Nikolay Pultsin
a6e74cf59d formatting
Conflicts:

	src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java
2013-10-19 13:48:02 +01:00
Nikolay Pultsin
2db5b168d1 formatting
Conflicts:

	src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
2013-10-19 13:38:12 +01:00
Nikolay Pultsin
a42feda147 formatting 2013-10-19 13:37:13 +01:00
Nikolay Pultsin
93a23c7226 formatting
Conflicts:

	src/org/geometerplus/fbreader/formats/html/HtmlReader.java
2013-10-19 13:26:04 +01:00
Nikolay Pultsin
6610c0cd43 UnsatisfiedLinkError exception processing 2013-10-19 02:33:50 +01:00
Nikolay Pultsin
16d4a9f7df mobi: blockquote tag support 2013-10-18 17:24:48 +01:00
Nikolay Pultsin
6ad355fac1 formatting
Conflicts:

	src/org/amse/ys/zip/NoCompressionDecompressor.java
	src/org/amse/ys/zip/ZipInputStream.java
2013-10-18 05:19:17 +01:00
Nikolay Pultsin
96159688ee unix style line ends 2013-10-18 05:12:55 +01:00
Nikolay Pultsin
47406fd400 pseudofix for NPE in page info building 2013-10-17 01:08:22 +01:00
Nikolay Pultsin
619bd45b97 VERSION => 1.9.1 2013-10-15 14:29:10 +01:00
Nikolay Pultsin
36758ebad5 updated ChangeLog 2013-10-15 14:28:42 +01:00
Nikolay Pultsin
70be40218a Merge pull request #159 from Trottel/patch-6
Update cs.xml
2013-10-15 05:24:39 -07:00
Nikolay Pultsin
2ac5f1d61e Merge pull request #158 from Trottel/patch-5
Update cs.xml
2013-10-15 05:23:31 -07:00
Trottel
2f09022925 Update cs.xml
Updated Czech file.
2013-10-15 12:21:18 +02:00
Trottel
d263a8a717 Update cs.xml
Updated Czech language file.
2013-10-15 12:14:57 +02:00
Nikolay Pultsin
19875b594d release date 2013-10-13 21:45:27 +01:00
Nikolay Pultsin
eb5e39ba9a cleanup 2013-10-12 20:43:46 +01:00
Nikolay Pultsin
36b6955fb6 Merge branch 'recent-catalogs' 2013-10-12 19:41:03 +01:00
Nikolay Pultsin
2ac7dc91c5 comment 2013-10-12 19:40:43 +01:00
Nikolay Pultsin
9ad6208382 recent catalogs list item is disabled 2013-10-12 19:39:51 +01:00
Nikolay Pultsin
fde320470e recent catalogs item (in progress) 2013-10-12 19:33:39 +01:00
Nikolay Pultsin
d539bbab92 list options for fon & wallpaper dirs 2013-10-12 13:12:24 +01:00