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
294d9865a0 missing file 2013-02-05 09:05:18 +00:00
Nikolay Pultsin
e54edec9ec more items 2013-02-04 07:43:28 +00:00
Nikolay Pultsin
1db2c49927 Merge branch 'master' into library-service 
Conflicts:
	ChangeLog
 2013-02-04 05:24:46 +00:00
Nikolay Pultsin
030aa3d2c1 updated ChangeLog 2013-02-04 05:22:31 +00:00
Nikolay Pultsin
ec632854fa fixed navigation popup text 2013-02-04 05:21:39 +00:00
Nikolay Pultsin
9bfa091a58 library refactoring (in progress) 2013-02-04 04:55:32 +00:00
Nikolay Pultsin
711a98c8df fixed book opening 2013-02-03 13:28:45 +00:00
Nikolay Pultsin
94f6887476 Merge branch 'master' into library-service 2013-02-02 10:02:29 +00:00
Nikolay Pultsin
7f0adbdb43 authors/tags/series methods in BookCollection (with dummy implementation on shadow side) 2013-02-02 10:01:33 +00:00
Nikolay Pultsin
e81b8f6ea4 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/book/BooksDatabase.java
 2013-02-02 09:41:02 +00:00
Nikolay Pultsin
8677a4a97d extra empty line 2013-02-02 09:40:16 +00:00
Nikolay Pultsin
a5b9c2ab39 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/book/Book.java
	src/org/geometerplus/fbreader/book/BooksDatabase.java
 2013-02-02 09:39:38 +00:00
Nikolay Pultsin
6939ffc373 listAuthors() method (with no parameters) 2013-02-02 09:27:02 +00:00
Nikolay Pultsin
0ee49e45b1 BooksDatabase.listAuthor() method (with no parameters) 2013-02-02 09:22:56 +00:00
Nikolay Pultsin
e7d9b6f59e Merge branch 'master' into library-service 2013-02-01 21:44:44 +00:00
Nikolay Pultsin
60985acfce plugin does not save book encoding 2013-02-01 21:44:02 +00:00
Nikolay Pultsin
02c6901487 Merge branch 'master' into library-service 2013-02-01 21:43:09 +00:00
Nikolay Pultsin
c6913232cc imports order 2013-02-01 21:42:50 +00:00
Nikolay Pultsin
352076ed19 Merge branch 'master' into library-service 2013-02-01 21:41:50 +00:00
Nikolay Pultsin
d672ea6a8a version number => 1.7 2013-02-01 21:40:36 +00:00
Nikolay Pultsin
9300f21717 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
 2013-02-01 20:07:33 +00:00
Nikolay Pultsin
a235ea9a9b synchronization with library-service branch 2013-02-01 20:05:58 +00:00
Nikolay Pultsin
1761ef83a8 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/book/BooksDatabase.java
 2013-02-01 19:56:09 +00:00
Nikolay Pultsin
aaf12c8f17 public => protected 2013-02-01 19:53:36 +00:00
Nikolay Pultsin
d8b7b87b56 Merge branch 'master' into library-service 2013-02-01 19:49:53 +00:00
Nikolay Pultsin
91a3c2720b merge order 2013-02-01 19:49:44 +00:00
Nikolay Pultsin
072e50953c Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
 2013-02-01 19:49:16 +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
d105efa8ee Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
 2013-02-01 19:19:05 +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
d8d7196047 Merge branch 'master' into library-service 2013-02-01 15:38:51 +00:00
Nikolay Pultsin
fcafd8120a native code cleanup: synchronization with ics branch 2013-02-01 15:38:23 +00:00
Nikolay Pultsin
a4a9ebecde Merge branch 'master' into library-service 
Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
 2013-02-01 14:47:46 +00:00
Nikolay Pultsin
4bbf4ba990 separate files for activity/dialog styles 2013-02-01 14:31:49 +00:00
Nikolay Pultsin
f6414205d8 Merge branch 'master' into library-service 2013-02-01 11:24:56 +00:00
Nikolay Pultsin
7c9f96a9d1 merge order 2013-02-01 11:18:12 +00:00
Nikolay Pultsin
2bccadc11b common styles for master & ics builds 2013-02-01 11:12:38 +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
82cc9fd8d2 Merge branch 'master' into library-service 
Conflicts:
	src/org/geometerplus/fbreader/book/Book.java
 2013-01-26 10:19:18 +04: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