1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-06 03:50:19 +02:00
Commit graph

159 commits

Author SHA1 Message Date
Nikolay Pultsin
e4decfea08 renaming: video server => data server 2014-03-10 12:45:47 +00:00
Nikolay Pultsin
e80f601317 added nanohttpd server 2014-03-09 13:01:46 +00:00
Nikolay Pultsin
06e92e4e3c 1.9.5.4 2014-02-03 12:44:57 +00:00
Nikolay Pultsin
5b70b66c67 separate process for preferences activity 2014-02-01 21:33:26 +00:00
Nikolay Pultsin
ead9890b3f plugin actions
Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
2014-01-31 01:50:26 +00:00
Nikolay Pultsin
781758f08d formatting 2014-01-04 22:03:02 +00:00
Nikolay Pultsin
ee286f3c08 synchronization with fblibrary branch 2014-01-04 22:00:25 +00:00
Nikolay Pultsin
9ee9c67180 config & downloader services are not exportable 2014-01-01 21:10:53 +00:00
Nikolay Pultsin
6e9f813429 ConfigService declared in the manifest 2013-12-31 15:49:21 +00:00
Nikolay Pultsin
c9f5fc63b4 synchronization with plugins branch 2013-11-10 22:47:28 +00:00
Nikolay Pultsin
6610c0cd43 UnsatisfiedLinkError exception processing 2013-10-19 02:33:50 +01:00
Nikolay Pultsin
76937adb55 Merge branch 'master' into dict_api 2013-09-21 18:05:50 +01:00
Nikolay Pultsin
3ecfdf28c5 CatalogMananagerActivity declaration 2013-09-21 20:18:21 +04:00
Nikolay Pultsin
397fa4e3cb AndroidManifest synchronization + formatting 2013-09-14 02:41:57 +01:00
Nikolay Pultsin
c57eeca23f AmbilWarna library + new color picker + style editing
Conflicts:
	AndroidManifest.xml
2013-06-11 03:23:28 +04:00
Nikolay Pultsin
b31099ca47 file action is back 2013-05-22 01:29:22 +01:00
Nikolay Pultsin
b0e91e82b7 highlighting color selection ui (in progress) 2013-05-05 23:51:19 +04:00
Nikolay Pultsin
f8597708fe AndroidManifest pattern changed to be synchronous with AndroidManifest.xml 2013-04-26 20:39:28 +02:00
Nikolay Pultsin
934bf7f53b VERSION => 1.7.4 2013-03-05 01:57:34 +04:00
Nikolay Pultsin
af0b24c1ca no android:changes attributes for hidden activities 2013-02-21 05:26:54 +04:00
Nikolay Pultsin
7825802c92 fixed AndroidManifest.xml: android:changes attribute
Conflicts:

	AndroidManifest.xml
	AndroidManifest.xml.pattern
2013-02-21 05:17:11 +04:00
Nikolay Pultsin
31f4c630f2 separate icon fo 'downloading' status 2013-02-18 00:44:34 +04:00
Nikolay Pultsin
85e61098f9 Library service intent action declaration 2013-02-07 14:31:32 +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
2bccadc11b common styles for master & ics builds 2013-02-01 11:12:38 +00:00
Nikolay Pultsin
b17bc8e6d5 BookmarksActivity is moved to a separate process 2013-01-20 10:42:53 +04:00
Nikolay Pultsin
08c3e6d5c6 xlarge screens support declaration 2012-12-18 17:02:10 +04:00
Nikolay Pultsin
4ac4f35b31 text/plain in mimetypes list 2012-06-03 02:33:38 +01:00
Nikolay Pultsin
49a558fae7 well-formatted manifest file 2012-04-21 08:49:35 +01:00
Nikolay Pultsin
0d6a2e4f6a + txt, rtf files support 2012-04-01 22:04:57 +01:00
Nikolay Pultsin
60defe9d2c issue report sending 2012-03-06 18:33:16 +00:00
Nikolay Pultsin
f669d92262 book reading error: send report dialog (in progress) 2012-03-06 03:13:16 +00:00
Nikolay Pultsin
6afe6257fc AddCustomCatalog external call 2012-02-22 04:01:47 +00:00
Nikolay Pultsin
bd032e8523 network scanner has been moved to a separate plugin
Conflicts:

	AndroidManifest.xml
	AndroidManifest.xml.pattern
	src/org/geometerplus/android/fbreader/network/ScanLocalNetworkActivity.java
2012-02-22 04:01:15 +00:00
Nikolay Pultsin
c1328bb216 Merge branch 'master' into library-service 2012-01-25 17:13:56 +00:00
Nikolay Pultsin
b42c6d2b1c CHANGE_WIFI_STATE permission 2012-01-18 22:37:51 +00:00
Nikolay Pultsin
d91e6f42e2 Merge branch 'master' into library-service 2012-01-18 19:54:09 +00:00
Nikolay Pultsin
a7c0a6b6ef fixed ExceptionInInitializerError processing 2012-01-09 07:52:19 +00:00
Nikolay Pultsin
9f284637dd single instance for LibraryService 2011-12-28 06:16:44 +00:00
Nikolay Pultsin
ac40fa1e59 LibraryService starting 2011-12-28 05:08:06 +00:00
Nikolay Pultsin
c2d7822a7c Merge branch 'master' into library-service 2011-12-28 02:35:16 +00:00
Nikolay Pultsin
3a92ee7562 pinch zoom in image view 2011-12-27 05:40:33 +00:00
Nikolay Pultsin
1ccee45d11 initial version 2011-12-24 23:05:01 +00:00
Nikolay Pultsin
c5433212fb permissions for changing WiFi state 2011-12-24 20:24:45 +00:00
Nikolay Pultsin
ac89fa959c typo 2011-12-22 21:39:27 +00:00
Nikolay Pultsin
40d06fc80c network library activity is splitted to primary and secondary; primary is marked as single-task 2011-12-22 21:35:54 +00:00
Nikolay Pultsin
2627a76356 new reghts required 2011-12-22 03:00:46 +00:00
Nikolay Pultsin
f930fe0cd8 new activities announcements (for bonjour support) 2011-12-21 23:39:34 +00:00