Commit Graph

258 Commits

Author SHA1 Message Date
Leroy.H.Y
f45eac982b
Merge branch 'dev' into dev-multi-outbound 2019-09-14 15:51:21 +08:00
Leroy.H.Y
0752209ce0
Merge branch 'dev-subscriptions' into dev 2019-09-14 14:59:07 +08:00
Leroy.H.Y
b2143abfeb
[subscriptions] Added some minor helper functions 2019-09-14 14:58:54 +08:00
Leroy.H.Y
56cdec999f
Merge branch 'master' into dev 2019-09-14 14:54:29 +08:00
Leroy.H.Y
003b9856cb
Merge branch 'version-v1' 2019-09-13 22:53:02 +08:00
Leroy.H.Y
6db033eb0e
[change] Changed AppImage desktop. 2019-09-13 21:08:12 +08:00
Leroy.H.Y
a7adee9c4e
Changed .gitignore 2019-09-13 18:35:22 +08:00
Leroy.H.Y
40c91c951f
Update w_MainWindow.cpp 2019-09-13 10:28:32 +08:00
Leroy.H.Y
60aa937923
Merge pull request #40 from lhy0403/version-v1
Merge version-v1 branch into master
2019-09-13 10:22:53 +08:00
Leroy.H.Y
146d723414
[fix] fixed a build QIcon error 2019-09-13 10:13:12 +08:00
Leroy.H.Y
00cc503d77 [docs] Removed a blank line 2019-09-12 22:21:01 +08:00
Leroy.H.Y
a7855750a2 [docs] Updated docs 2019-09-12 22:19:11 +08:00
Leroy.H.Y
3b0641f73e [version] Bumped version to v1.3.5.3 2019-09-12 05:24:01 -07:00
Leroy.H.Y
188d7abb18
[fix] fixed a openssl detection issue 2019-09-12 20:13:22 +08:00
Leroy.H.Y
171fb9d2b0
Added a better config upgrade algo,
changed translations,
changed ConnectionEdit Window functions,
changed a config key

Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>
2019-09-11 14:40:51 +08:00
Leroy.H.Y
aac36f2f9e
Merge branch 'dev' into dev-multi-outbound 2019-09-11 12:50:02 +08:00
Leroy.H.Y
f1e8aa084c
[lang] Changed translation file name. 2019-09-09 12:50:37 +08:00
Leroy.H.Y
9082ba1004 Update Crowdin configuration file 2019-09-09 12:45:17 +08:00
Leroy.H.Y
04f7f58c39
Merge branch 'dev' of github.com:lhy0403/Qv2ray into dev 2019-09-06 15:58:55 +08:00
Leroy.H.Y
22cd14a838
[ui] Make English as default language 1 2019-09-06 15:55:54 +08:00
Leroy.H.Y
4492e5e896 Update Crowdin configuration file 2019-09-06 14:01:22 +08:00
Leroy.H.Y
40e426dca6
Update README.md 2019-09-06 09:08:52 +08:00
Leroy.H.Y
d823cc66fe
Update README.md 2019-09-06 08:58:17 +08:00
Leroy.H.Y
b756397287
[dev] Merging fix 2019-09-05 16:24:30 +08:00
Leroy.H.Y
6c68025a67
Merge branch 'dev' into dev-multi-outbound 2019-09-05 16:18:21 +08:00
Leroy.H.Y
f12593109e
[dev] Merged dev branch which fixed: #34 2019-09-05 15:57:13 +08:00
Leroy.H.Y
af20994365
[bug] Temporary fix of Issue: #34 2019-09-04 20:54:03 +08:00
Leroy.H.Y
3a06284dfd
Update ReleaseNote-v1.3.5.2.md 2019-09-04 15:28:24 +08:00
Leroy.H.Y
e32b220ec9
Merge branch 'dev'
Fixed bug mentioned in #35 #36 v1.3.5
2019-09-04 15:22:15 +08:00
Leroy.H.Y
c8f9b26a91
[docs] Updated docs 2019-09-04 15:21:34 +08:00
Leroy.H.Y
c2a8c01150
Update README.md 2019-09-04 09:18:17 +08:00
Leroy.H.Y
5d40c43fbe
[FIXED] Fixed a file permission error. 2019-09-04 08:06:50 +08:00
Leroy.H.Y
9dc329506e
[FIX] This commit fixed #35 2019-09-03 21:34:12 +08:00
Leroy.H.Y
9087860f36
Update ReleaseNote-v1.3.5.md 2019-09-03 18:48:38 +08:00
Leroy.H.Y
87b299fab9 [docs] Added more docs 2019-09-03 16:01:02 +08:00
Leroy.H.Y
d4f54a70ec
Bumped to version 1.3.5 2019-09-03 13:22:39 +08:00
Leroy.H.Y
cf21ba0a2b
Merge branch 'dev'
Merged dev version
2019-09-03 11:24:58 +08:00
Leroy.H.Y
1cc2193ce0
Update FUNDING.yml 2019-09-03 10:23:19 +08:00
Leroy.H.Y
02650ab99f
Update FUNDING.yml 2019-09-03 10:20:35 +08:00
Leroy.H.Y
d6dbdbd408
Create FUNDING.yml 2019-09-03 10:16:34 +08:00
Leroy.H.Y
93ab2b633a Merge branch 'dev' into dev-multi-outbound 2019-08-29 11:28:14 +08:00
Leroy.H.Y
968e42f200 Merge branch 'dev' into dev-subscriptions 2019-08-29 11:27:45 +08:00
Leroy.H.Y
50500f9813 Merge branch 'master' into dev 2019-08-29 11:26:33 +08:00
Hork
be122031fc jenkins (#29) Merged documents.
* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md
2019-08-29 11:21:11 +08:00
Leroy.H.Y
f453eb04f5
Merge branch 'version-v1'
Merged v1 branch
2019-08-29 07:59:41 +08:00
Hork
b79ef2b5ba
Update Qv2ray.desktop 2019-08-28 20:43:43 +08:00
Hork
e60a1af970
Add Qv2ray 2019-08-28 20:42:14 +08:00
Hork
f28cd4dd95 Subscription(partially done) 2019-08-28 08:27:24 +08:00
Leroy.H.Y
f88d5986cf
[Subscription] Added vmess convertion option for Subscriptions 2019-08-27 14:26:54 +08:00
Leroy.H.Y
695e8a5c55
[pre2.0] Bumped version to pre2.0, Added more UI functions. #19
Signed-off-by: Leroy.H.Y <lhy20010403@hotmail.com>
2019-08-26 19:57:20 +08:00