188 commits

Author	SHA1	Message	Date
Nikolay Pultsin	1ef5be140f	Merge branch 'labels' into 2.6	2015-08-18 13:09:24 +01:00
Nikolay Pultsin	4eb6c7fdaf	added labels uids	2015-08-17 18:12:16 +01:00
Nikolay Pultsin	e82543b81d	run library from widgets	2015-08-12 23:04:24 +02:00
Nikolay Pultsin	e8262f6450	Merge branch 'master' into ice-cream-sandwich	2015-08-05 15:12:49 +01:00
Nikolay Pultsin	cf13daad1c	SystemInfo in plugins	2015-08-05 14:48:04 +01:00
Nikolay Pultsin	99180d1e37	Merge branch 'master' into ice-cream-sandwich	2015-06-25 00:36:17 +01:00
Nikolay Pultsin	40d9f107b1	missing break in switch	2015-06-25 00:36:01 +01:00
Nikolay Pultsin	99fd9a3bbe	Merge branch 'master' into ice-cream-sandwich	2015-06-12 06:04:20 +01:00
Nikolay Pultsin	e509bf81a3	UIUtil splitted to UIUtil & UIMessageUtil	2015-06-12 06:02:44 +01:00
Nikolay Pultsin	6b1457cab3	Merge branch 'master' into ice-cream-sandwich	2015-05-23 17:39:21 +01:00
Nikolay Pultsin	9135ae7f8c	no ZLFile field in AbstractBook class	2015-05-23 17:39:02 +01:00
Nikolay Pultsin	0491695d7b	Merge branch 'master' into ice-cream-sandwich	2015-05-23 04:44:21 +01:00
Nikolay Pultsin	f27d4ab079	DbBook	2015-05-23 04:43:18 +01:00
Nikolay Pultsin	966967b529	Merge branch 'master' into ice-cream-sandwich	2015-05-23 03:35:39 +01:00
Nikolay Pultsin	9c15cdc78e	parametrized IBookCollection	2015-05-23 03:34:36 +01:00
Nikolay Pultsin	73dac24dbd	Merge branch 'master' into ice-cream-sandwich ... Conflicts: src/org/geometerplus/android/fbreader/library/LibraryActivity.java	2015-03-14 01:19:47 +00:00
Nikolay Pultsin	5b3aefbbe7	typo	2015-03-14 01:15:43 +00:00
Nikolay Pultsin	61eab08eb1	Merge branch 'master' into ice-cream-sandwich ... Conflicts: src/org/geometerplus/android/fbreader/DeviceUtil.java	2015-02-28 15:16:40 +01:00
Nikolay Pultsin	594a4bde49	copyright: Geometer Plus => FBReader.ORG Limited, 2014 => 2015	2015-02-28 15:14:56 +01:00
Nikolay Pultsin	899502454c	Merge branch 'master' into ice-cream-sandwich	2015-02-04 06:29:44 +00:00
Nikolay Pultsin	92ff1c7ec7	Bookshelf plugin reference in library view	2015-02-04 06:29:35 +00:00
Nikolay Pultsin	87ce04d49a	Merge branch 'master' into ice-cream-sandwich ... Conflicts: src/org/geometerplus/android/fbreader/library/LibraryActivity.java	2015-01-15 19:11:18 +00:00
Nikolay Pultsin	cac38867da	'Bookshelf View' item visible always	2015-01-15 19:10:15 +00:00
Nikolay Pultsin	8e84aa3d9b	Merge branch 'master' into ice-cream-sandwich	2015-01-15 15:41:30 +00:00
Nikolay Pultsin	e85bfcde29	IBookCollection.canRemoveBook() method	2015-01-15 15:41:15 +00:00
Nikolay Pultsin	efd3c8d807	Merge branch 'master' into ice-cream-sandwich ... Conflicts: src/org/geometerplus/android/fbreader/library/LibraryActivity.java	2015-01-15 12:50:33 +00:00
Nikolay Pultsin	d2628d11a7	'Material view' => 'Bookshelf view' ... Conflicts: src/org/geometerplus/android/fbreader/library/LibraryActivity.java	2015-01-15 12:49:37 +00:00
Nikolay Pultsin	f090d115a2	material view menu item	2015-01-13 16:48:22 +00:00
Nikolay Pultsin	8275c1e407	Merge branch 'master' into ice-cream-sandwich	2015-01-13 16:40:07 +00:00
Nikolay Pultsin	cb723b82cc	'Back to plugin' menu item in library	2015-01-13 16:39:49 +00:00
Nikolay Pultsin	7c80f3ed63	progress indicator on lollipop devices	2014-12-28 17:41:56 +00:00
Nikolay Pultsin	70f1ca33dc	Merge branch 'master' into ice-cream-sandwich ... Conflicts: src/org/geometerplus/android/fbreader/library/LibraryActivity.java	2014-08-11 15:55:06 +01:00
Nikolay Pultsin	c5e567e860	fixed crash on 2.* devices on menu items with no icons	2014-08-11 15:53:12 +01:00
Nikolay Pultsin	5dfdcccb0b	Merge branch 'master' into ice-cream-sandwich	2014-08-08 14:52:56 +01:00
Nikolay Pultsin	354df230cf	fixed possible NPE	2014-08-08 14:52:43 +01:00
Nikolay Pultsin	35e8210640	Merge branch 'master' into ice-cream-sandwich	2014-08-06 02:33:13 +01:00
Nikolay Pultsin	c4f4f6b05a	'Rescan' item only available in the root of local library	2014-08-06 02:32:48 +01:00
Nikolay Pultsin	9d84c569e0	Merge branch 'master' into ice-cream-sandwich	2014-07-28 16:10:33 +01:00
Nikolay Pultsin	f1f798b087	updated action names	2014-07-28 16:07:27 +01:00
Nikolay Pultsin	359dee5c4d	menu invalidation	2014-07-27 22:11:47 +01:00
Nikolay Pultsin	66a507659d	Merge branch 'master' into ice-cream-sandwich	2014-07-27 22:11:18 +01:00
Nikolay Pultsin	05fd7f181f	new synchronisation-related actions in library menus	2014-07-27 22:10:55 +01:00
Nikolay Pultsin	0a7aa5fc29	new book actions	2014-07-27 20:02:08 +01:00
Nikolay Pultsin	ab6756f930	Merge branch 'master' into ice-cream-sandwich	2014-07-27 19:42:51 +01:00
Nikolay Pultsin	3d4405417f	SyncOptions used in LibraryActivity	2014-07-27 19:42:47 +01:00
Nikolay Pultsin	7e5a701827	Merge branch 'master' into ice-cream-sandwich	2014-04-15 03:45:04 +01:00
Nikolay Pultsin	a7979eee46	fixed access rights	2014-04-15 03:44:22 +01:00
Nikolay Pultsin	87a8d99d0f	Merge branch 'master' into ice-cream-sandwich ... Conflicts: src/org/geometerplus/android/fbreader/MenuData.java	2014-03-24 14:20:47 +02:00
Nikolay Pultsin	1df7cee741	repackaging	2014-03-24 14:18:39 +02:00
Nikolay Pultsin	dd945ed6ae	Merge branch 'master' into ice-cream-sandwich ... Conflicts: src/org/geometerplus/android/fbreader/FBReader.java src/org/geometerplus/android/fbreader/library/BookInfoActivity.java	2014-03-23 00:20:20 +02:00