6072 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nikolay Pultsin	4941a0dc13	Merge branch 'master' into master-catalogs	2013-09-21 18:28:17 +01:00
Nikolay Pultsin	7849590d19	Merge branch 'master' into dict_api	2013-09-21 18:27:51 +01:00
Nikolay Pultsin	6db8041676	version number => 1.9	2013-09-21 18:26:40 +01:00
Nikolay Pultsin	9c6834e64b	simplified building procedure: icon files are in res/drawable, not in icons catalog	2013-09-21 18:18:35 +01:00
Nikolay Pultsin	231b5dea7d	'ant clean' does not remove obj directory ('ant distclean' does)	2013-09-21 18:14:41 +01:00
Nikolay Pultsin	76937adb55	Merge branch 'master' into dict_api	2013-09-21 18:05:50 +01:00
Nikolay Pultsin	d97181f28a	layouts for layout manager	2013-09-21 18:05:02 +01:00
Nikolay Pultsin	2d0ec0e1fc	layout items renaming (clear specific names)	2013-09-21 18:03:40 +01:00
Nikolay Pultsin	3ecfdf28c5	CatalogMananagerActivity declaration	2013-09-21 20:18:21 +04:00
Nikolay Pultsin	ee221e19ef	Merge branch 'master' into master-catalogs ... Conflicts: assets/resources/application/ru.xml src/org/geometerplus/android/fbreader/network/action/ActionCode.java	2013-09-21 18:28:52 +04:00
Nikolay Pultsin	06b0ed939c	synchronization with new catalogs code (resources + constant)	2013-09-21 18:27:03 +04:00
Nikolay Pultsin	96e2fd98b1	rollback for accidental commit	2013-09-21 18:11:54 +04:00
Nikolay Pultsin	877f34c40b	"all catalogs" => "manage catalogs"	2013-09-21 17:49:31 +04:00
Nikolay Pultsin	5c4d9586f8	Merge branch 'master' into master-catalogs	2013-09-19 20:30:09 +04:00
Dmitry Yuranov	5429088bc2	Fix result setting	2013-09-19 20:11:09 +04:00
Dmitry Yuranov	2659608943	"Catalogs manager" tree item	2013-09-19 19:46:14 +04:00
Dmitry Yuranov	16f880233a	All Catalogs on result + fix	2013-09-19 19:09:36 +04:00
Dmitry Yuranov	7209535a14	Merge branch 'master-catalogs' of github.com:geometer/FBReaderJ into master-catalogs ... Conflicts: src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java	2013-09-19 17:49:06 +04:00
Dmitry Yuranov	5b15ffad97	All Catalogs on result	2013-09-19 15:01:25 +04:00
Nikolay Pultsin	2da67af9e2	formatting	2013-09-19 11:25:53 +04:00
Nikolay Pultsin	979fbcc3ec	code simplification	2013-09-19 11:18:06 +04:00
Nikolay Pultsin	714e0cd0f7	formatting	2013-09-19 10:56:56 +04:00
Nikolay Pultsin	094ccd6a2a	Merge branch 'master' into dict_api	2013-09-19 10:27:43 +04:00
Nikolay Pultsin	15f18f86e3	formatting	2013-09-19 10:23:02 +04:00
Nikolay Pultsin	27138b3a61	formatting	2013-09-19 10:22:17 +04:00
Nikolay Pultsin	c060927c0a	Merge branch 'dict_api' into bigfishcat-master ... Conflicts: src/org/geometerplus/android/fbreader/DictionaryUtil.java	2013-09-19 10:21:35 +04:00
Nikolay Pultsin	3072922012	Merge branch 'master' of github.com:bigfishcat/FBReaderJ into bigfishcat-master ... Conflicts: src/org/geometerplus/android/fbreader/DictionaryUtil.java	2013-09-19 09:59:50 +04:00
Nikolay Pultsin	e6274d206a	formatting	2013-09-19 09:53:12 +04:00
dlmv	48a2c392fb	code choice preference	2013-09-17 19:15:11 +04:00
dlmv	e584efe464	code choice preference	2013-09-17 17:52:12 +04:00
dlmv	677dbde466	fix	2013-09-17 17:23:45 +04:00
Nikolay Pultsin	1ef5e02d45	more issues	2013-09-17 15:31:28 +04:00
Nikolay Pultsin	fcde2855cf	Merge branch 'master' into master-catalogs	2013-09-17 15:24:12 +04:00
Nikolay Pultsin	b5007edc82	formatting	2013-09-17 08:00:22 +04:00
Nikolay Pultsin	f2577669df	Merge branch 'master' into dict_api ... Conflicts: src/org/geometerplus/android/fbreader/DictionaryUtil.java	2013-09-17 07:41:05 +04:00
Nikolay Pultsin	5d76fdf969	refactoring	2013-09-17 07:37:09 +04:00
Nikolay Pultsin	4bf82830fc	Merge branch 'master' into dict_api ... Conflicts: src/org/geometerplus/android/fbreader/DictionaryUtil.java src/org/geometerplus/android/fbreader/preferences/DictionaryPreference.java	2013-09-17 07:07:23 +04:00
Nikolay Pultsin	70cfb8e13d	PackageInfo moved inside DictionaryUtil	2013-09-17 07:03:45 +04:00
Nikolay Pultsin	7390a1ac55	cleanup	2013-09-17 06:57:12 +04:00
Nikolay Pultsin	d03fb75a0a	code cleanup	2013-09-17 06:24:33 +04:00
Nikolay Pultsin	9d5851c2d7	code simplification	2013-09-17 05:34:37 +04:00
Nikolay Pultsin	8849de46a8	code & dicitonary titles cleanup	2013-09-17 05:15:30 +04:00
Nikolay Pultsin	9eaf25b1b3	code cleanup	2013-09-17 04:36:42 +04:00
Nikolay Pultsin	1d49bf306f	theme_transparent for all resolutions	2013-09-17 03:24:06 +04:00
Nikolay Pultsin	2525802237	formatting	2013-09-17 03:11:58 +04:00
Nikolay Pultsin	72c41e2ef7	dictionary => opendictionary	2013-09-17 03:09:35 +04:00
Nikolay Pultsin	90d7318c1d	formatting	2013-09-17 03:07:55 +04:00
Nikolay Pultsin	528ef3371d	dictionaryNotTranslator => dictionary with role="dictionary"	2013-09-17 03:05:55 +04:00
dlmv	942691dd1a	Merge branch 'dict_api' of github.com:geometer/FBReaderJ into dict_api	2013-09-16 15:20:41 +04:00
dlmv	ad1f8166d1	lang code select	2013-09-16 15:20:03 +04:00