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

3641 commits

Author SHA1 Message Date
Nikolay Pultsin
aaf12c8f17 public => protected 2013-02-01 19:53:36 +00:00
Nikolay Pultsin
d01cd4841d synchronization with library-service branch 2013-02-01 19:47:55 +00:00
Nikolay Pultsin
27586cb76b Merge branch 'master' into library-service 2013-02-01 19:23:57 +00:00
Nikolay Pultsin
fd338adbd1 parametric base class in NetworkLibraryActivity 2013-02-01 19:23:29 +00:00
Nikolay Pultsin
b8624a35d0 merging 2013-02-01 19:18:25 +00:00
Nikolay Pultsin
cb58a2cd9b TreeActivity is now a parmatrized type 2013-02-01 19:17:05 +00:00
Nikolay Pultsin
dbd194f3e7 TreeActivity is now a parmatrized type 2013-02-01 19:13:44 +00:00
Nikolay Pultsin
dc364b6711 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
 2013-02-01 16:00:58 +00:00
Nikolay Pultsin
dc59bf47e4 formatting cleanup 2013-02-01 15:57:20 +00:00
Nikolay Pultsin
1c4a2f2c6b fixed book info editing 2013-02-01 10:39:45 +00:00
Nikolay Pultsin
78669b0694 updating book info 2013-02-01 09:42:00 +00:00
Nikolay Pultsin
7b498f8949 introduced RecentBooksTree (separate class for lazy initializable recent books list) 2013-01-31 14:35:49 +00:00
Nikolay Pultsin
8207b5db87 favorites code: simplified 2013-01-29 14:59:57 +00:00
Nikolay Pultsin
0b1f7c5ab0 updated BookCollection class from library-service branch 2013-01-26 10:17:01 +04:00
Nikolay Pultsin
cd2c45f685 static method 2013-01-26 10:08:48 +04:00
Nikolay Pultsin
9dc1bc52ca fixed BookCollection.getBookByFile() method for fb2.zip files 2013-01-25 20:21:38 +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
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
9f9632bad2 restored access rights 2013-01-20 08:44:18 +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
0dac30f56b BookCollection implementation 2013-01-20 08:09:58 +04:00
Nikolay Pultsin
5957e04d08 imports cleanup 2013-01-20 07:09:31 +04:00
Nikolay Pultsin
d34c823b5b encoding "detection" for xml files 2013-01-20 07:07:34 +04:00
Nikolay Pultsin
2872059088 synchronization with library-service branch 2013-01-20 07:02:02 +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
be507cfd9c synchronization with library-service branch 2013-01-20 05:53:35 +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
aaded888d4 synchronization 2013-01-20 05:02:34 +04:00
Nikolay Pultsin
b02b78d539 synchronization with library-service branch 2013-01-20 05:00:05 +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
e83068a630 cleanup 2013-01-20 03:16:35 +04:00
Nikolay Pultsin
3cb970e4cd myFBReaderApp field 2013-01-20 03:16:02 +04:00
Nikolay Pultsin
7bce953046 FBReader.ACTION_OPEN_BOOK 2013-01-20 03:05:16 +04:00
Nikolay Pultsin
53c146e532 fixed book opening 2013-01-20 02:39:31 +04:00
Nikolay Pultsin
f56ccb5307 Merge branch 'master' into library-service 2013-01-20 01:05:21 +04:00
Nikolay Pultsin
d2d268a046 ZLAndroidActivity has gone 2013-01-20 00:51:07 +04:00