yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 02:39:23 +02:00
Code Issues Releases Wiki Activity
5312 commits 42 branches 404 tags 122 MiB
Commit graph

5312 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nikolay Pultsin
cf6927246d deleted unused methods 2013-01-14 05:19:23 +04:00
Nikolay Pultsin
a49bcea5a1 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
	src/org/geometerplus/fbreader/library/Library.java
 2013-01-14 05:15:17 +04:00
Nikolay Pultsin
64911efecf AbstractLibrary has gone 2013-01-14 05:12:07 +04:00
Nikolay Pultsin
6bf29e3bd3 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
	src/org/geometerplus/fbreader/library/AbstractLibrary.java
	src/org/geometerplus/fbreader/library/Library.java
 2013-01-14 05:05:35 +04:00
Nikolay Pultsin
42b9345d5a synchronization with library-service branch 2013-01-14 05:03:16 +04:00
Nikolay Pultsin
30f9bb8a1f Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/book/BookUtil.java
	src/org/geometerplus/fbreader/library/Library.java
 2013-01-14 04:58:15 +04:00
Nikolay Pultsin
8b9530c36b synchronization with library-service branch 2013-01-14 04:49:48 +04:00
Nikolay Pultsin
b0edbfe740 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
	src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
	src/org/geometerplus/fbreader/book/Book.java
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
	src/org/geometerplus/fbreader/formats/fb2/FB2MetaInfoReader.java
	src/org/geometerplus/fbreader/library/AuthorTree.java
	src/org/geometerplus/fbreader/library/BookInSeriesTree.java
	src/org/geometerplus/fbreader/library/BookTree.java
	src/org/geometerplus/fbreader/library/Library.java
	src/org/geometerplus/fbreader/library/SeriesTree.java
	src/org/geometerplus/fbreader/library/TagTree.java
 2013-01-14 04:44:34 +04:00
Nikolay Pultsin
fbec1dc704 repackaging: some classes moved to book package (synchronization with library-service branch) 2013-01-14 04:34:16 +04:00
Nikolay Pultsin
3585edc371 Merge branch 'master' into library-service 2013-01-14 04:20:36 +04:00
Nikolay Pultsin
840b03f68e SeriesInfo.Name => Title 2013-01-14 04:20:11 +04:00
Nikolay Pultsin
80caeb0b77 Merge branch 'master' into library-service 2013-01-14 04:13:18 +04:00
Nikolay Pultsin
188f0b1c1b new methods in xml & filesystem; from library-service branch 2013-01-14 04:12:32 +04:00
Nikolay Pultsin
e16281c4b5 new item 2013-01-13 18:53:35 +04:00
Nikolay Pultsin
315b75e241 event processing in BookCollectionShadow 2013-01-13 18:53:04 +04:00
Nikolay Pultsin
d17f318110 missing file 2013-01-13 18:52:39 +04:00
Nikolay Pultsin
19e02c015b removed debug printing 2013-01-13 11:46:14 +04:00
Nikolay Pultsin
0ddf4550fd fixed NPE 2013-01-13 11:01:55 +04:00
Nikolay Pultsin
6f6fdf6b12 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/android/fbreader/BookmarksActivity.java
 2013-01-13 10:19:30 +04:00
Nikolay Pultsin
1b6341a0a4 synchronization with beta branch 2013-01-13 10:16:47 +04:00
Nikolay Pultsin
a0c79b9736 updated ChangeLog 2013-01-13 10:05:25 +04:00
Nikolay Pultsin
d2aac73200 VERSION => 1.7 2013-01-13 10:03:30 +04:00
Nikolay Pultsin
1c20393098 SQLiteBooksDatabase moved to libraryService package 2013-01-13 09:59:34 +04:00
Nikolay Pultsin
903ffec9d4 BooksDatabase.Instance() should be never used 2013-01-13 09:40:24 +04:00
Nikolay Pultsin
bb451e9467 Book.save() is not public now 2013-01-13 08:31:54 +04:00
Nikolay Pultsin
8a78a11bd8 removed unused methods 2013-01-13 07:59:39 +04:00
Nikolay Pultsin
b21459cdd0 jni/proguard changes for new package structure 2013-01-13 07:48:35 +04:00
Nikolay Pultsin
4b10755383 fbreader.library package splitted into fbreader.library & fbreader.book 2013-01-13 07:02:44 +04:00
Nikolay Pultsin
a787045fbf no myDatabase field in LibraryActivity 2013-01-13 06:16:29 +04:00
Nikolay Pultsin
38c4ad935d no Book.save() call in native code 2013-01-13 06:09:23 +04:00
Nikolay Pultsin
bc3976f5f6 Book.getByFile() => IBookCollection.getBookByFile() 2013-01-13 05:55:34 +04:00
Nikolay Pultsin
2ec3c907af no database instances in BookInfoActivity & EditBookInfoActivity 2013-01-13 04:02:51 +04:00
Nikolay Pultsin
85e58d9122 removed debug printings 2013-01-13 03:29:41 +04:00
Nikolay Pultsin
762d64102c Book.reloadInfoFromDatabase() method has gone 2013-01-13 03:28:54 +04:00
Nikolay Pultsin
101eed5ecc path serialization => book serialization (in progress) 2013-01-13 00:12:50 +04:00
Nikolay Pultsin
2bced4b331 Library stores IBookCollection reference, not BookCollection one 2013-01-12 22:40:28 +04:00
Nikolay Pultsin
e6f437e790 Bookmark class does not depend on BooksDatabase 2013-01-12 22:28:28 +04:00
Nikolay Pultsin
be6fea93ff static Library.Instance() has gone; updateApplication method 2013-01-12 22:15:06 +04:00
Nikolay Pultsin
6b9a45b820 FBReader uses BookCollectionShadow instead on BookCollection 2013-01-12 20:48:05 +04:00
Nikolay Pultsin
be4bf6c174 no Library.Instance() in FBReaderApp, IBookCollection is used instead 2013-01-12 20:30:41 +04:00
Nikolay Pultsin
522d32a585 more methods in IBookCollection 2013-01-12 20:03:01 +04:00
Nikolay Pultsin
50e5a7e299 file system watcher (prototype) 2013-01-12 18:12:32 +04:00
Nikolay Pultsin
9a4b6407e1 unused code + exctracted method bookDirectories 2013-01-12 00:39:39 +04:00
Nikolay Pultsin
22e90d3a2b typo 2013-01-12 00:34:54 +04:00
Nikolay Pultsin
554539940c fixed: recent and favorites lists in Library 2013-01-11 07:22:09 +04:00
Nikolay Pultsin
0db3957988 code obfuscation is enabled 2013-01-11 07:03:48 +04:00
Nikolay Pultsin
93506f231f Merge branch 'master' into library-service 2013-01-11 07:02:05 +04:00
Nikolay Pultsin
3b7592625f booksdb branches have gone 2013-01-11 07:01:20 +04:00
Nikolay Pultsin
40b4953f83 more methods in IBookCollection 2013-01-11 06:36:45 +04:00
Nikolay Pultsin
a72943e2dd RunActivityAction has gone 2013-01-11 06:23:42 +04:00