Commit graph

3990 commits

Author SHA1 Message Date
Xiao YiFang 66e5deaf62 Merge branch 'feature/concurrent-index-7-29' into staged 2022-07-30 11:56:51 +08:00
Xiao YiFang 6caf4fa58c feat: fulltext qtconcurrent worker return directly when canceled
concurrent index with segmentation lock
2022-07-30 11:53:07 +08:00
xiaoyifang f8b3c9a6eb
Merge branch 'goldendict:master' into staged 2022-07-30 07:35:30 +08:00
Abs62 1064880450 Fix favorities indication when new tabs open in background 2022-07-29 18:48:04 +03:00
Xiao YiFang 89a8ad38f4 Merge branch 'staged' into dev 2022-07-28 21:34:49 +08:00
Xiao YiFang c8486424f6 update ay WI language 2022-07-28 21:34:35 +08:00
Xiao YiFang 6e47c9900e Merge branch 'staged' into dev 2022-07-28 21:24:18 +08:00
Xiao YiFang 086850467a opt: return directly when load about:blank or load unsuccessful 2022-07-28 21:23:52 +08:00
Xiao YiFang 331cb296e0 bump release version to 22.7.3 2022-07-23 12:11:02 +08:00
Xiao YiFang a35c9a05aa fix merge conflict 2022-07-23 12:08:34 +08:00
xiaoyifang dfbac9eefb
Merge pull request #122 from xiaoyifang/staged
merge stage to dev
2022-07-23 09:36:45 +08:00
Xiao YiFang 66b10495dd fix merge conflict 2022-07-17 18:45:05 +08:00
Xiao YiFang a978569db9 Merge branch 'staged' into dev 2022-07-17 18:24:44 +08:00
Xiao YiFang 2298fa2a3d opt:website tag regex expression refine 2022-07-17 18:23:21 +08:00
Xiao YiFang dd244e0336 opt: update dictionaries when disable certain dictionary 2022-07-17 18:23:21 +08:00
xiaoyifang 8a979aeb86
Update README.md 2022-07-16 16:10:48 +08:00
Xiao YiFang 444a8d67a7 Merge branch 'staged' into dev 2022-07-16 09:14:56 +08:00
Xiao YiFang 6ed7fda315 opt: website dictionary ,add whitelist of host url. 2022-07-16 09:13:33 +08:00
Xiao YiFang a8b57564d8 Merge branch 'staged' into dev 2022-07-15 19:51:23 +08:00
Xiao YiFang 34796ce8ed opt: extension check ignore case 2022-07-15 19:51:12 +08:00
Abs62 aa02fdcc25 A little more Ctrl+Tab/Ctrl+Shift+Tab handling 2022-07-14 18:14:28 +03:00
Abs62 5c3b3b8718 Update Aymara translation (by Amos Batto) 2022-07-13 21:51:31 +03:00
Abs62 f640643672 Disable focus acquiring by tabs menu button 2022-07-13 17:32:41 +03:00
Abs62 896bd350be Handle Ctrl+Tab/Ctrl+Shift+Tab in translate line as tabs switch 2022-07-13 17:31:57 +03:00
cha147 21c94bb7dd fix typo in readme 2022-07-12 18:14:32 +03:00
xiaoyifang 01948b5aab
Merge pull request #118 from xiaoyifang/fix/website-optimize
opt:website loading optimization
2022-07-12 09:38:37 +08:00
Xiao YiFang 6057035f2b opt:website loading optimization 2022-07-11 22:46:18 +08:00
Xiao YiFang 3c0d694c43 opt:whitelist add .gif resource 2022-07-11 21:18:58 +08:00
Xiao YiFang ceb4a00d2e opt:add wikipedia url to whitelist. 2022-07-11 21:01:49 +08:00
xiaoyifang e54b6e58d8
Merge pull request #119 from xiaoyifang/fix/remove-dictmap
opt:remove dictMap parameter
2022-07-10 17:17:08 +08:00
Xiao YiFang 5322a6bc56 opt:remove dictMap parameter 2022-07-10 17:11:13 +08:00
Xiao YiFang 19ee6bbeb2 Merge branch 'staged' into dev 2022-07-10 14:28:47 +08:00
Xiao YiFang 6b15f5d466 opt: handle the url click before the page finished loaded 2022-07-10 14:27:50 +08:00
Xiao YiFang 20e3dc78a3 Merge branch 'staged' into dev 2022-07-10 12:55:40 +08:00
Xiao YiFang bbf562911a opt: click audio link before the page has been loaded completely. 2022-07-10 12:55:27 +08:00
Xiao YiFang 30f3b64deb Merge branch 'goldendict-master' into staged 2022-07-10 12:40:20 +08:00
Xiao YiFang 5b4f112110 Merge branch 'master' of https://github.com/goldendict/goldendict into goldendict-master
# Conflicts:
#	.travis.yml
#	articleview.cc
#	locale/ar_SA.ts
#	locale/ay_WI.ts
#	locale/be_BY.ts
#	locale/be_BY@latin.ts
#	locale/bg_BG.ts
#	locale/cs_CZ.ts
#	locale/de_DE.ts
#	locale/el_GR.ts
#	locale/eo_EO.ts
#	locale/es_AR.ts
#	locale/es_BO.ts
#	locale/es_ES.ts
#	locale/fa_IR.ts
#	locale/fi_FI.ts
#	locale/fr_FR.ts
#	locale/hi_IN.ts
#	locale/ie_001.ts
#	locale/it_IT.ts
#	locale/ja_JP.ts
#	locale/jb_JB.ts
#	locale/ko_KR.ts
#	locale/lt_LT.ts
#	locale/mk_MK.ts
#	locale/nl_NL.ts
#	locale/pl_PL.ts
#	locale/pt_BR.ts
#	locale/qu_WI.ts
#	locale/ru_RU.ts
#	locale/sk_SK.ts
#	locale/sq_AL.ts
#	locale/sr_SR.ts
#	locale/sv_SE.ts
#	locale/tg_TJ.ts
#	locale/tk_TM.ts
#	locale/tr_TR.ts
#	locale/uk_UA.ts
#	locale/vi_VN.ts
#	locale/zh_CN.ts
#	locale/zh_TW.ts
2022-07-10 12:39:12 +08:00
Xiao YiFang a503fd776b Merge branch 'staged' into dev 2022-07-10 12:20:23 +08:00
Xiao YiFang ce35085f25 opt: forbid the page to redirect to audio link url. 2022-07-10 12:19:09 +08:00
Xiao YiFang 786fafded2 Merge branch 'staged' into dev 2022-07-10 10:18:24 +08:00
Xiao YiFang 45c2bf38bd opt: do not allow open audio link in new tab 2022-07-10 10:18:02 +08:00
Xiao YiFang e32062cf82 opt:format gd-custom file 2022-07-09 12:52:33 +08:00
Xiao YiFang 505dd9efc8 clean:minor change to the goldendict.pro file 2022-07-09 11:20:15 +08:00
Xiao YiFang 5105f12516 opt: refract the code to monitor iframe height 2022-07-09 11:17:58 +08:00
Xiao YiFang ec0fd2ab74 Merge branch 'staged' into dev 2022-07-09 11:05:13 +08:00
Xiao YiFang 3ef3535213 opt: disable websecurity to enable cross domain access
without this , javascript can not access certain website dictionary (using iframe )
add --disable-web-security to qapplication argv
2022-07-09 11:04:39 +08:00
Xiao YiFang 7cac8c79b8 opt:deal with empty reply. 2022-07-09 10:37:40 +08:00
Xiao YiFang 055abee7f4 Merge branch 'staged' into dev 2022-07-08 22:17:49 +08:00
Xiao YiFang 79cec220de github:remove qt6.2.4 build 2022-07-08 22:17:37 +08:00
Xiao YiFang a3df30abbd Merge branch 'staged' into dev 2022-07-08 22:16:14 +08:00