chrox
92184f0199
fix #1985 by always return to the parent dir of current doc in the FileManager
2016-04-23 22:57:19 +08:00
Frans de Jonge
a42273e201
Merge pull request #1963 from koreader/osx_port
...
experimental port to Mac OSX
2016-04-23 16:20:37 +02:00
chrox
7071ae2b6e
fix unit test of occurrences search
2016-04-23 21:53:06 +08:00
chrox
25b70007d4
update to latest koreader base
2016-04-22 20:13:44 +08:00
chrox
df65d2972a
experimental port to Mac OSX
...
Currently it can open cre-based docs and Djvu docs
It still has some problems with PDF docs and the touch input.
2016-04-22 20:13:44 +08:00
Qingping Hou
3a94ea4809
Merge pull request #1984 from Hzj-jie/master
...
Won't track missing files in history, and always keep latest timestamp
2016-04-22 01:28:30 -04:00
Hzj_jie
51327911f2
Won't track missing files in history, and always keep latest timestamp
2016-04-21 20:37:16 -07:00
Frans de Jonge
ec1275ca5f
Merge pull request #1983 from koreader/houqp-master
...
fix end of book detection for crengine
2016-04-21 08:58:39 +02:00
Qingping Hou
31206cb80f
ci: fix coverage report
2016-04-20 23:56:38 -07:00
Qingping Hou
d7b1b403c1
progresswidget(fix): ignore nil self.last
2016-04-20 23:16:40 -07:00
Qingping Hou
984c994192
test(fix): add missing sample txt file
2016-04-20 23:12:07 -07:00
Qingping Hou
0226efc4cd
readerfooter(minor): just incase self.pages is nil
2016-04-20 23:12:07 -07:00
Qingping Hou
572412b1f6
readerrolling(fix): detect end of book properly
2016-04-20 23:12:07 -07:00
Qingping Hou
26ecc6035a
bookstatus: cache total pages
2016-04-20 23:12:07 -07:00
Qingping Hou
f0cc8749b6
Merge pull request #1977 from Hzj-jie/migrate-history
...
Migrate history folder into sdr - A new history.lua file and ReadHistory component
2016-04-21 02:11:10 -04:00
Zijie He
667e8834ad
Migrate history folder, FileManagerHistory uses own history.lua file and ReadHistory component
2016-04-20 22:44:44 -07:00
Frans de Jonge
a9bc9bae41
Merge pull request #1982 from Hzj-jie/disable-magnetic
...
Add an ignore_power_sleepcover setting to ignore Kobo power_sleepcover keycode
2016-04-20 19:47:35 +02:00
Zijie He
f33f78cf08
Add an ignore_power_sleepcover setting to ignore Kobo power_sleepcover keycode
2016-04-20 10:21:09 -07:00
Qingping Hou
667c5a86ec
Merge pull request #1980 from frankyifei/master
...
imagewidget fix
2016-04-19 13:03:36 -04:00
frankyifei
73f7d860cd
imagewidget fix
...
bring back the old behavior: when width and height are set and all the
zooming options are false, zoom the image to that size. The last commit
to Imagewidget.lua caused it ignores the set width and height and use
the image's original size instead when no zoom option is set. This
caused #1979 . Although #1979 can be fixed by setting autostretch=true,
but I think it's good to fix here.
2016-04-20 01:16:27 +09:30
Frans de Jonge
bb00055293
Merge pull request #1951 from koreader/houqp-master
...
fix tests & bug fix
2016-04-19 11:33:29 +02:00
Qingping Hou
bab7dda089
ci: no more crazy retry in travis
2016-04-19 01:00:31 -07:00
Qingping Hou
e9b9bbadcc
fix: luacheck
2016-04-19 00:59:02 -07:00
Qingping Hou
357477b2be
test: disable auto insulate
2016-04-19 00:01:35 -07:00
Qingping Hou
c22a3747d8
fix all the tests
2016-04-19 00:01:28 -07:00
Qingping Hou
a049eddcbc
bookmark(fix): bookmark comparison for crengine
2016-04-18 23:51:06 -07:00
Qingping Hou
4a66036eb0
test: update test to match the new crengine typesetting
2016-04-18 23:51:06 -07:00
Qingping Hou
cc98ba7604
kodev: spawn subshell in activate command
2016-04-18 23:51:06 -07:00
Qingping Hou
790472fb38
Merge pull request #1969 from Hzj-jie/screen-saver
...
Update ImageWidget to support more stretch settings, and enable screensaver on kobo
2016-04-18 21:56:07 -04:00
Hzj_jie
0fb5d5f6fc
Fix a naming, which breaks coding style
2016-04-17 22:32:51 -07:00
Hzj_jie
1be9264a0c
Resolve review comments
2016-04-17 22:30:46 -07:00
Qingping Hou
2dbfcdf207
Merge pull request #1973 from Frenzie/lang
...
Removed a bunch of "successfully" and replaced one ellipsis.
2016-04-16 16:36:39 -07:00
Frans de Jonge
5638819f25
Removed a bunch of "successfully", replaced an ellipsis, and some deviant spellings of KOReader.
2016-04-16 12:37:08 +02:00
Zijie He
c95a7305c2
Revert change to reader.lua
2016-04-15 13:29:35 -07:00
Zijie He
0b59d501a6
Merge remote-tracking branch 'upstream/master' into screen-saver
2016-04-15 13:21:55 -07:00
Zijie He
7d4bd076f7
Resolve review comments
2016-04-15 13:21:39 -07:00
Qingping Hou
6f02b2ca2a
Merge pull request #1964 from NiLuJe/master
...
Assorted FrontLight fixes ;)
2016-04-15 09:49:09 -07:00
NiLuJe
d4e5746eb3
Unbreak toggling the fL on Kindles
...
Fix #1960
2016-04-15 16:51:41 +02:00
NiLuJe
dfe321d87a
Fix a hasFrontLight call in reader.lua...
...
(it's a function, not a bool ;'( ).
Fix #1961
2016-04-15 16:50:51 +02:00
NiLuJe
273fbb2ec3
Bump base
2016-04-15 16:50:51 +02:00
Frans de Jonge
8af1d333ca
Merge pull request #1972 from comradekingu/master
...
Language fixes. Spelling of calibre and KOReader. Ellipsis instead of tripledot.
2016-04-15 15:33:02 +02:00
Allan Nordhøy
bc16ed5035
Spelling of calibre and KOReader. Ellipsis.
2016-04-15 15:04:41 +02:00
Qingping Hou
98d852801f
Merge pull request #1967 from Hzj-jie/count-sdr
...
*.sdr folders are not excluded in folder item count
2016-04-14 20:45:05 -07:00
Zijie He
865b2a8f90
Update ImageWidget to support more stretch settings, and enable screensaver on kobo
2016-04-14 17:42:54 -07:00
Zijie He
6eeac33ad1
*.sdr folders are not excluded in folder item count
...
Bug #1966
2016-04-14 14:13:53 -07:00
Frans de Jonge
ccd72a87f0
Merge pull request #1965 from Hzj-jie/sdr-first
...
Prefer sdr folder to history folder
2016-04-14 21:56:02 +02:00
Zijie He
ccd95b80fa
Prefer sdr folder to history folder
2016-04-14 12:50:02 -07:00
NiLuJe
8c4c274e7b
Merge pull request #1959 from Hzj-jie/master
...
Bump koreader-base to 8e39d61493257c05fe039f34fa1a6e3ae5f0eab6
2016-04-12 22:40:52 +02:00
Zijie He
903a9b904d
Bump koreader-base to 8e39d61493257c05fe039f34fa1a6e3ae5f0eab6
2016-04-12 13:23:52 -07:00
Qingping Hou
af820ab627
Merge pull request #1957 from NiLuJe/master
...
Some Kindle startup script fixes
2016-04-12 09:25:26 -07:00
