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
4149 commits 42 branches 404 tags 122 MiB
Commit graph

4149 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nikolay Pultsin
764f2c5e79 renaming: SearchForCatalogsActivity -> ScanLocalNetworkActivity 2011-12-21 17:19:32 +00:00
Nikolay Pultsin
aed41cc760 Merge branch 'master' into digest 2011-12-20 22:23:05 +00:00
Nikolay Pultsin
1ebffbbe94 updated ChangeLog 2011-12-20 22:22:23 +00:00
Nikolay Pultsin
a984ec4a5b libs catalog is not ignored now 2011-12-20 22:19:47 +00:00
Nikolay Pultsin
d587c0c2ac bonjour (zeroconf) library has been added 2011-12-20 22:18:52 +00:00
dlmv
c33e9f0da1 little fix 2011-12-20 23:22:27 +04:00
dlmv
bd12bf2997 Merge branch 'digest' of git://github.com/geometer/FBReaderJ 2011-12-20 23:16:46 +04:00
dlmv
325c7d36d8 add jmdns.jar 2011-12-20 23:15:34 +04:00
dlmv
3056ebb6f9 bonjour service detection 2011-12-20 23:01:23 +04:00
Nikolay Pultsin
cd81e8c851 Merge branch 'master' into digest 2011-12-19 00:24:37 +00:00
Nikolay Pultsin
b371471fd9 typo 2011-12-19 00:23:52 +00:00
Nikolay Pultsin
e9c1b7e2e1 typo 2011-12-19 00:23:00 +00:00
Nikolay Pultsin
576c1f3923 Merge branch 'master' into digest 
Conflicts:
	src/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java
 2011-12-19 00:21:54 +00:00
Nikolay Pultsin
4724bccd5c quiet mode implementation 2011-12-19 00:19:51 +00:00
Nikolay Pultsin
b39116ad3b updated ChangeLog: 1.2.6 is ready to release 2011-12-19 00:09:05 +00:00
Nikolay Pultsin
10b27839e7 unused import 2011-12-18 23:01:30 +00:00
Nikolay Pultsin
81d1e1a34f fixed opensearch request 2011-12-18 22:49:08 +00:00
Nikolay Pultsin
2979409b7c synchronization with digest branch: quiet link update 2011-12-18 22:47:29 +00:00
Nikolay Pultsin
ba18533df1 cleanup 2011-12-18 22:39:20 +00:00
Nikolay Pultsin
175a0497f4 code simplification (no duplicate methods) 2011-12-18 22:36:44 +00:00
Nikolay Pultsin
6166a553e9 code simplification 2011-12-18 15:23:51 +00:00
Nikolay Pultsin
1ecabccc5b Merge branch 'master' into digest 
Conflicts:
	src/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java
 2011-12-18 15:08:06 +00:00
Nikolay Pultsin
592a37db4f code cleanup 2011-12-18 15:05:37 +00:00
Nikolay Pultsin
d05318fc59 quiet parameter in ZLNetworkRequest (quiet = true means user interaction is not possible during this request performing) 2011-12-18 14:48:36 +00:00
Nikolay Pultsin
ed27795a77 code cleanup 2011-12-18 14:47:19 +00:00
Nikolay Pultsin
c31586bd94 Merge branch 'master' into digest 2011-12-18 14:30:03 +00:00
Nikolay Pultsin
896bb59bce BookDownloader runs in networkLibrary process 2011-12-18 14:29:31 +00:00
Nikolay Pultsin
742316d9a3 Merge branch 'master' into digest 2011-12-18 14:28:08 +00:00
Nikolay Pultsin
3010b4d20a code simplification 2011-12-18 14:00:18 +00:00
dlmv
70387a995b code change 2011-12-18 00:55:42 +04:00
dlmv
e41787d660 remove debug 2011-12-17 21:41:48 +04:00
dlmv
2fdb4cfd0f save password + quiet reload 2011-12-17 20:57:44 +04:00
Nikolay Pultsin
40ff30b5f4 widget is not presented in master branch yet 2011-12-15 06:08:10 +00:00
Nikolay Pultsin
f2459b5b59 updated ChangeLog 2011-12-15 06:06:57 +00:00
Nikolay Pultsin
d363edc64c Merge branch 'https-opds' 
Conflicts:
	src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java
	src/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java
 2011-12-15 06:05:29 +00:00
Nikolay Pultsin
1b97558c55 updated credential creator logic 2011-12-15 06:02:35 +00:00
Nikolay Pultsin
10a3765835 SIGNIN_ACTION constant 2011-12-15 06:01:09 +00:00
Nikolay Pultsin
c8af8f2473 fixed native libraries check 2011-12-15 05:43:50 +00:00
Nikolay Pultsin
a6febdab1c credentials creator functionality has been moved to ZLNetworkManager 2011-12-15 03:48:53 +00:00
Nikolay Pultsin
319f138c77 credentials creator functionality has been moved to ZLNetworkManager 2011-12-15 03:47:51 +00:00
Nikolay Pultsin
77abbaa8bc formatting rollback 2011-12-15 03:47:37 +00:00
Nikolay Pultsin
ea425103c9 formatting rollback 2011-12-15 03:02:32 +00:00
Nikolay Pultsin
bee3d3afe1 Merge branch 'master' of git://github.com/dlmv/FBReaderJ into https-opds 2011-12-15 03:00:19 +00:00
Nikolay Pultsin
5b861aad89 updated ChangeLog 2011-12-14 18:45:16 +00:00
dlmv
3da08e4aa0 remove debug 2011-12-14 17:24:07 +04:00
dlmv
fba4df1d88 authorization while adding catalog fix 2011-12-14 17:22:32 +04:00
Nikolay Pultsin
ba7a46b665 updated ChangeLog 2011-12-14 00:46:14 +00:00
Nikolay Pultsin
d9437516fd NPE fixes 2011-12-14 00:42:59 +00:00
Nikolay Pultsin
281b4367e4 version number => 1.2.6 2011-12-09 17:47:56 +00:00
Nikolay Pultsin
efa0d70750 updated ChangeLog 2011-12-09 17:43:05 +00:00