Nikolay Pultsin
|
9dc1bc52ca
|
fixed BookCollection.getBookByFile() method for fb2.zip files
|
2013-01-25 20:21:38 +04:00 |
|
Nikolay Pultsin
|
8fb04e6404
|
Merge branch 'master' into library-service
|
2013-01-24 22:25:45 +04:00 |
|
Nikolay Pultsin
|
973c443ba1
|
sync with ics branch
|
2013-01-24 22:24:27 +04:00 |
|
Nikolay Pultsin
|
3cd64cdf2f
|
new TODO item
|
2013-01-21 09:04:24 +04:00 |
|
Nikolay Pultsin
|
75943b17bb
|
file observer (in progress, works with file adding)
|
2013-01-21 09:00:08 +04:00 |
|
Nikolay Pultsin
|
1e2f1642ae
|
add books to library if library is created earlier than collection build will be completed
|
2013-01-21 07:30:06 +04:00 |
|
Nikolay Pultsin
|
a2dd5885e6
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/ShowLibraryAction.java
src/org/geometerplus/android/fbreader/library/LibraryActivity.java
|
2013-01-20 13:26:40 +04:00 |
|
Nikolay Pultsin
|
d4d37f45c9
|
use standard book key for selected book in library
|
2013-01-20 13:23:40 +04:00 |
|
Nikolay Pultsin
|
9e7ff53ae0
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/BookmarksActivity.java
src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
|
2013-01-20 12:57:32 +04:00 |
|
Nikolay Pultsin
|
a9d948322c
|
open book from bookmarks view
|
2013-01-20 12:43:50 +04:00 |
|
Nikolay Pultsin
|
e9e27af87c
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
src/org/geometerplus/android/fbreader/library/LibraryActivity.java
src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
|
2013-01-20 12:31:32 +04:00 |
|
Nikolay Pultsin
|
f17d1f127f
|
send serialized books instead of book path
|
2013-01-20 12:11:24 +04:00 |
|
Nikolay Pultsin
|
5768595ac4
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/BookmarksActivity.java
src/org/geometerplus/android/fbreader/FBReader.java
|
2013-01-20 11:20:18 +04:00 |
|
Nikolay Pultsin
|
ddfc7407fa
|
send book & bookmark to BookmarksActivity
|
2013-01-20 11:08:52 +04:00 |
|
Nikolay Pultsin
|
b17bc8e6d5
|
BookmarksActivity is moved to a separate process
|
2013-01-20 10:42:53 +04:00 |
|
Nikolay Pultsin
|
f1a976d642
|
open book from BookmarksActivity using intent
Conflicts:
src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
|
2013-01-20 10:15:44 +04:00 |
|
Nikolay Pultsin
|
e698083039
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/fbreader/book/BooksDatabase.java
|
2013-01-20 08:45:22 +04:00 |
|
Nikolay Pultsin
|
9f9632bad2
|
restored access rights
|
2013-01-20 08:44:18 +04:00 |
|
Nikolay Pultsin
|
b41c540575
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/fbreader/book/BooksDatabase.java
src/org/geometerplus/fbreader/library/Library.java
|
2013-01-20 08:40:41 +04:00 |
|
Nikolay Pultsin
|
7f6442827e
|
Library uses BookCollection for some operations
|
2013-01-20 08:33:46 +04:00 |
|
Nikolay Pultsin
|
bf4bbb2eac
|
restored access rights
|
2013-01-20 08:18:14 +04:00 |
|
Nikolay Pultsin
|
bbf4082aca
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/fbreader/book/Book.java
src/org/geometerplus/fbreader/book/Bookmark.java
|
2013-01-20 08:11:55 +04:00 |
|
Nikolay Pultsin
|
0dac30f56b
|
BookCollection implementation
|
2013-01-20 08:09:58 +04:00 |
|
Nikolay Pultsin
|
9028a9e12d
|
Merge branch 'master' into library-service
|
2013-01-20 07:09:43 +04:00 |
|
Nikolay Pultsin
|
5957e04d08
|
imports cleanup
|
2013-01-20 07:09:31 +04:00 |
|
Nikolay Pultsin
|
ef606a3f9d
|
Merge branch 'master' into library-service
|
2013-01-20 07:08:04 +04:00 |
|
Nikolay Pultsin
|
d34c823b5b
|
encoding "detection" for xml files
|
2013-01-20 07:07:34 +04:00 |
|
Nikolay Pultsin
|
19f78e751e
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java
src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
|
2013-01-20 07:03:50 +04:00 |
|
Nikolay Pultsin
|
2872059088
|
synchronization with library-service branch
|
2013-01-20 07:02:02 +04:00 |
|
Nikolay Pultsin
|
f0ffaf73e3
|
Merge branch 'master' into library-service
|
2013-01-20 06:50:36 +04:00 |
|
Nikolay Pultsin
|
ff38a7b0cb
|
updated package name
|
2013-01-20 06:50:17 +04:00 |
|
Nikolay Pultsin
|
7b13ae9ab7
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/BookmarksActivity.java
src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java
src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
src/org/geometerplus/fbreader/book/AbstractBookCollection.java
src/org/geometerplus/fbreader/book/BooksDatabase.java
src/org/geometerplus/fbreader/bookmodel/JavaBookModel.java
|
2013-01-20 06:46:33 +04:00 |
|
Nikolay Pultsin
|
b0033a8ccc
|
synchronization with library-service branch
|
2013-01-20 06:27:02 +04:00 |
|
Nikolay Pultsin
|
21cf4acef3
|
imports order
|
2013-01-20 06:10:09 +04:00 |
|
Nikolay Pultsin
|
2d4a866175
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/fbreader/book/Book.java
src/org/geometerplus/fbreader/book/Bookmark.java
src/org/geometerplus/fbreader/book/SerializerUtil.java
src/org/geometerplus/fbreader/book/XMLSerializer.java
|
2013-01-20 05:58:14 +04:00 |
|
Nikolay Pultsin
|
be507cfd9c
|
synchronization with library-service branch
|
2013-01-20 05:53:35 +04:00 |
|
Nikolay Pultsin
|
1859c9f993
|
Merge branch 'master' into library-service
|
2013-01-20 05:16:29 +04:00 |
|
Nikolay Pultsin
|
c207b09df5
|
merge order
|
2013-01-20 05:16:16 +04:00 |
|
Nikolay Pultsin
|
9127de1409
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/fbreader/formats/NativeFormatPlugin.java
|
2013-01-20 05:15:36 +04:00 |
|
Nikolay Pultsin
|
5c01bea10a
|
no Book.save() call in native code
|
2013-01-20 05:14:20 +04:00 |
|
Nikolay Pultsin
|
602d699fb1
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/fbreader/book/BookCollection.java
|
2013-01-20 05:03:18 +04:00 |
|
Nikolay Pultsin
|
aaded888d4
|
synchronization
|
2013-01-20 05:02:34 +04:00 |
|
Nikolay Pultsin
|
b2f888f97b
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/fbreader/book/BookCollection.java
|
2013-01-20 05:01:25 +04:00 |
|
Nikolay Pultsin
|
b02b78d539
|
synchronization with library-service branch
|
2013-01-20 05:00:05 +04:00 |
|
Nikolay Pultsin
|
72a7df1379
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/fbreader/library/Library.java
|
2013-01-20 04:57:38 +04:00 |
|
Nikolay Pultsin
|
a11a63b3ea
|
synchronization with library-service branch
|
2013-01-20 04:54:06 +04:00 |
|
Nikolay Pultsin
|
54e7408d6a
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/FBReader.java
|
2013-01-20 04:36:00 +04:00 |
|
Nikolay Pultsin
|
d0e1411ce5
|
synchronization with library-service branch
|
2013-01-20 04:12:40 +04:00 |
|
Nikolay Pultsin
|
a86f753321
|
Merge branch 'master' into library-service
Conflicts:
src/org/geometerplus/android/fbreader/FBReader.java
src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
src/org/geometerplus/android/fbreader/library/LibraryActivity.java
|
2013-01-20 03:19:10 +04:00 |
|
Nikolay Pultsin
|
e83068a630
|
cleanup
|
2013-01-20 03:16:35 +04:00 |
|