Nikolay Pultsin
|
278551bf72
|
Merge branch 'master' into epub-native
|
2012-04-21 07:30:32 +01:00 |
|
Nikolay Pultsin
|
a44a7ed6b0
|
new resources for book info editing
|
2012-04-21 07:29:14 +01:00 |
|
Nikolay Pultsin
|
8457a9f699
|
obsolete resources
|
2012-04-21 07:15:19 +01:00 |
|
Nikolay Pultsin
|
19b0a44ca2
|
Merge branch 'master' into epub-native
|
2012-04-21 06:45:24 +01:00 |
|
Nikolay Pultsin
|
37ccbc2890
|
fixed a mistyping
|
2012-04-21 06:43:53 +01:00 |
|
Nikolay Pultsin
|
38f7d72944
|
Merge branch 'master' into epub-native
|
2012-04-18 04:14:53 +01:00 |
|
Nikolay Pultsin
|
79acada7ce
|
formatting cleanup
|
2012-04-18 04:14:21 +01:00 |
|
Nikolay Pultsin
|
bb43394473
|
Merge branch 'master' into epub-native
|
2012-04-18 04:09:13 +01:00 |
|
Nikolay Pultsin
|
d6349b8735
|
formatting cleanup
|
2012-04-18 04:08:40 +01:00 |
|
Nikolay Pultsin
|
9d33c3e457
|
formatting cleanup
|
2012-04-18 04:02:40 +01:00 |
|
Nikolay Pultsin
|
a709312218
|
formatting cleanup
|
2012-04-18 04:01:47 +01:00 |
|
Nikolay Pultsin
|
97b43b638a
|
Merge branch 'master' into epub-native
|
2012-04-18 04:00:30 +01:00 |
|
Nikolay Pultsin
|
3c29d063ec
|
formatting cleanup
|
2012-04-18 03:28:47 +01:00 |
|
Nikolay Pultsin
|
9db7ec0a18
|
formatting cleanup
|
2012-04-18 03:27:07 +01:00 |
|
Nikolay Pultsin
|
5a3f3a9836
|
Merge branch 'master' into epub-native
|
2012-04-16 23:25:52 +01:00 |
|
Nikolay Pultsin
|
6aa822b126
|
updated ChangeLog
|
2012-04-16 00:30:50 +01:00 |
|
Nikolay Pultsin
|
d9d8f9507d
|
Merge branch 'master' into epub-native
|
2012-04-15 22:36:30 +01:00 |
|
Nikolay Pultsin
|
13e589c6c0
|
fixed conditional resources conflict
|
2012-04-15 20:23:48 +01:00 |
|
Nikolay Pultsin
|
551f5fac58
|
Merge branch 'master' into epub-native
|
2012-04-15 20:03:22 +01:00 |
|
Nikolay Pultsin
|
8c00463ed5
|
formatting cleanup
|
2012-04-15 20:02:20 +01:00 |
|
Nikolay Pultsin
|
c3c8ae7709
|
Merge branch 'master' into epub-native
|
2012-04-15 19:43:22 +01:00 |
|
Nikolay Pultsin
|
1dbcecc5fe
|
added epub-native-ics branch
|
2012-04-15 19:43:04 +01:00 |
|
Nikolay Pultsin
|
e97e8bd663
|
ePub3 container.xml support in native code
|
2012-04-15 19:40:58 +01:00 |
|
Nikolay Pultsin
|
5bd6018136
|
Merge branch 'master' into epub-native
|
2012-04-15 19:09:25 +01:00 |
|
Nikolay Pultsin
|
9401051741
|
removed items
|
2012-04-15 19:09:02 +01:00 |
|
Nikolay Pultsin
|
ff76aa6e43
|
Merge branch 'master' into epub-native
|
2012-04-15 19:01:56 +01:00 |
|
Nikolay Pultsin
|
aa4791db4f
|
fixed library tree comparison
|
2012-04-15 18:59:59 +01:00 |
|
Nikolay Pultsin
|
9354d036ef
|
Merge branch 'master' into epub-native
|
2012-04-15 18:48:47 +01:00 |
|
Nikolay Pultsin
|
803126b649
|
fixed books-in-series-tree comparison
|
2012-04-15 18:48:08 +01:00 |
|
Nikolay Pultsin
|
58301e4772
|
Merge branch 'master' into epub-native
|
2012-04-15 18:16:10 +01:00 |
|
Nikolay Pultsin
|
cf1c0e35c1
|
updated stats script
|
2012-04-15 18:15:28 +01:00 |
|
Nikolay Pultsin
|
8da7121424
|
updated TODO
|
2012-04-15 17:27:31 +01:00 |
|
Nikolay Pultsin
|
04dd9f5c35
|
Merge branch 'master' into epub-native + compilation issues + cleanup
Conflicts:
jni/NativeFormats/zlibrary/core/src/constants/ZLXMLNamespace.cpp
jni/NativeFormats/zlibrary/core/src/constants/ZLXMLNamespace.h
|
2012-04-15 17:27:04 +01:00 |
|
Nikolay Pultsin
|
4dc710b249
|
cleanup
|
2012-04-15 17:08:26 +01:00 |
|
Nikolay Pultsin
|
a633669bbf
|
ePub series support in native code
|
2012-04-15 16:58:13 +01:00 |
|
Nikolay Pultsin
|
9fc5a44239
|
Merge branch 'master' into epub-native
|
2012-04-15 16:35:01 +01:00 |
|
Nikolay Pultsin
|
1b31f8f7e4
|
BigDecimal for series index
|
2012-04-15 16:34:24 +01:00 |
|
Nikolay Pultsin
|
7261bcb1e7
|
Merge branch 'master' into epub-native
|
2012-04-15 11:55:52 +01:00 |
|
Nikolay Pultsin
|
ad37400b9b
|
updated stats script + mistyping in de resources
|
2012-04-15 11:54:53 +01:00 |
|
Nikolay Pultsin
|
2869af652c
|
new items
|
2012-04-15 03:02:29 +01:00 |
|
Nikolay Pultsin
|
3e2be45f47
|
new TODO item
|
2012-04-15 02:59:45 +01:00 |
|
Nikolay Pultsin
|
7f72a53c48
|
Merge branch 'master' into epub-native
Conflicts:
TODO.1.4.6
|
2012-04-15 02:33:44 +01:00 |
|
Nikolay Pultsin
|
c87b6833af
|
new condition syntax (modrange), common resources for local and network book infos
|
2012-04-15 02:30:02 +01:00 |
|
Nikolay Pultsin
|
23c58bd3c6
|
conditional resources for authors/tags fields in book info dialogs
|
2012-04-15 02:03:03 +01:00 |
|
Nikolay Pultsin
|
6d69b20bbe
|
Merge branch 'master' into epub-native
|
2012-04-15 01:42:08 +01:00 |
|
Nikolay Pultsin
|
f3c97d2d03
|
updated TODO
|
2012-04-15 01:41:41 +01:00 |
|
Nikolay Pultsin
|
879db95133
|
standard namespace processing mechanism in ePub readers
|
2012-04-15 01:40:18 +01:00 |
|
Nikolay Pultsin
|
3fad725d16
|
ePub series info processing (in progress)
|
2012-04-15 01:24:24 +01:00 |
|
Nikolay Pultsin
|
5761e598b0
|
epub images from native code
|
2012-04-14 23:44:54 +01:00 |
|
Nikolay Pultsin
|
6d9bba8f4d
|
Merge branch 'master' into epub-native
|
2012-04-14 10:39:27 +02:00 |
|