yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 18:29: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
e6598e2da7 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
 2013-02-09 15:45:02 +04:00
Nikolay Pultsin
454bd46593 series trees on-the-fly 2013-02-09 15:42:15 +04:00
Nikolay Pultsin
c65110b143 Merge branch 'master' into library-service 2013-02-09 15:03:23 +04:00
Nikolay Pultsin
04f64f3d81 tag tree: fixes 2013-02-09 14:51:09 +04:00
Nikolay Pultsin
83e5045a09 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
 2013-02-09 14:28:32 +04:00
Nikolay Pultsin
147236cce3 TagTree on-the-fly 2013-02-09 14:24:17 +04:00
Nikolay Pultsin
f577769335 Merge branch 'master' into library-service 2013-02-09 08:31:40 +00:00
Nikolay Pultsin
4e95e802a2 missing import 2013-02-09 08:30:20 +00:00
Nikolay Pultsin
db5e757fb6 Merge branch 'master' into library-service 2013-02-08 22:48:54 +00:00
Nikolay Pultsin
1ce5132ab7 fixed NPE in findViewById 
Conflicts:

	src/org/geometerplus/android/fbreader/FBReader.java
 2013-02-08 22:28:53 +00:00
Nikolay Pultsin
9f763ed078 Merge branch 'master' into library-service 2013-02-08 20:07:04 +00:00
Nikolay Pultsin
601926f09c synchronization with library-service branch 2013-02-08 20:06:43 +00:00
Nikolay Pultsin
fa4e440b72 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
 2013-02-08 19:54:03 +00:00
Nikolay Pultsin
a7967d88ba synchronization with library-service branch 2013-02-08 19:53:08 +00:00
Nikolay Pultsin
c42d06e69a Merge branch 'master' into library-service 2013-02-08 19:40:53 +00:00
Nikolay Pultsin
673cc6ccef synchronization with library-service branch 2013-02-08 19:38:55 +00:00
Nikolay Pultsin
a437b0621b Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/library/LibraryTree.java
 2013-02-08 19:37:55 +00:00
Nikolay Pultsin
e8422eeed0 synchronization with library-service branch 2013-02-08 19:36:52 +00:00
Nikolay Pultsin
762077399a Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
 2013-02-08 19:18:59 +00:00
Nikolay Pultsin
f121805be9 synchronization with library-service branch 2013-02-08 19:17:41 +00:00
Nikolay Pultsin
78eb419aae Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
 2013-02-08 19:11:53 +00:00
Nikolay Pultsin
48f628f3ee synchronization with library-service branch 2013-02-08 19:09:47 +00:00
Nikolay Pultsin
faaced2f89 Merge branch 'master' into library-service 2013-02-08 18:59:05 +00:00
Nikolay Pultsin
ab04896ce7 FavoritesTree synchronized with library-service branch 2013-02-08 18:58:22 +00:00
Nikolay Pultsin
b0d9ee2010 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
 2013-02-08 11:19:48 +00:00
Nikolay Pultsin
dcf45e3f9b synchronization with library-service branch 2013-02-08 11:17:51 +00:00
Nikolay Pultsin
06fa6d9f76 unnecessary cast 2013-02-08 10:29:47 +00:00
Nikolay Pultsin
be93250e6d Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/book/BookCollection.java
 2013-02-08 10:27:43 +00:00
Nikolay Pultsin
d08131d68b synchronization with library-service branch 2013-02-08 10:25:48 +00:00
Nikolay Pultsin
fdda069f0f Merge branch 'master' into library-service 2013-02-08 09:06:58 +00:00
Nikolay Pultsin
e4912a2beb AuthorListTree 2013-02-08 09:04:41 +00:00
Nikolay Pultsin
5184bbeb26 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
 2013-02-08 08:56:16 +00:00
Nikolay Pultsin
5f9822ba5f synchronization with library-service branch 2013-02-08 08:55:11 +00:00
Nikolay Pultsin
fc5c0709cc Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
	src/org/geometerplus/fbreader/library/LibraryTree.java
 2013-02-08 08:29:54 +00:00
Nikolay Pultsin
dfd771c346 introduced BookWithAuthorsTree class 2013-02-08 08:27:46 +00:00
Nikolay Pultsin
141d45bae8 imports cleanup 2013-02-08 08:15:23 +00:00
Nikolay Pultsin
1ae2d0951b Merge branch 'master' into library-service 
Conflicts:
	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/FavoritesTree.java
	src/org/geometerplus/fbreader/library/FileFirstLevelTree.java
	src/org/geometerplus/fbreader/library/Library.java
	src/org/geometerplus/fbreader/library/LibraryTree.java
	src/org/geometerplus/fbreader/library/RecentBooksTree.java
	src/org/geometerplus/fbreader/library/SeriesTree.java
 2013-02-07 15:20:03 +00:00
Nikolay Pultsin
a46e23e78e synchronization with library-service branch + constants are moved from Library to LibraryTree 2013-02-07 15:01:46 +00:00
Nikolay Pultsin
14848058d3 do not add a book with id = -1 to BookCollection 2013-02-07 14:31:47 +00:00
Nikolay Pultsin
a037ecbd40 new TODO item 2013-02-07 14:31:39 +00:00
Nikolay Pultsin
85e61098f9 Library service intent action declaration 2013-02-07 14:31:32 +00:00
Nikolay Pultsin
a92a21a2aa book adding processing 2013-02-06 01:50:07 +00:00
Nikolay Pultsin
924ca36258 BookTree is splitted into BookTree & BookWithAuthorsTree 2013-02-06 01:26:11 +00:00
Nikolay Pultsin
d6a2a3d9c2 Each LibraryTree instance contains an IBookCollection link 2013-02-06 01:25:15 +00:00
Nikolay Pultsin
6c3b9028a1 library -> by authors tree new implementation (events are not fully supported yet) 2013-02-06 00:29:03 +00:00
Nikolay Pultsin
c4308ade41 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
 2013-02-05 09:15:01 +00:00
Nikolay Pultsin
5f6a41fb3a compilation issues 2013-02-05 09:13:21 +00:00
Nikolay Pultsin
ff076f631f BookCollectionShadow.authors() implementation 2013-02-05 09:07:35 +00:00
Nikolay Pultsin
0db613ca84 missing file 2013-02-05 09:07:30 +00:00
Nikolay Pultsin
14dea78c4e BookCollectionShadow.authors() implementation 2013-02-05 09:05:33 +00:00