github
/
Xray-core
mirror of https://github.com/XTLS/Xray-core
1
0
Fork 0
Code Issues Releases Wiki Activity
1,119 Commits
22 Branches
76 Tags
14 MiB
Commit Graph

15 Commits (9f8bb476339240bba0d0e4c13b0b5e6a492fb37b)

Author SHA1 Message Date
HunterQ 1562e1ffb9
Config: Combine filename and format into a new struct (#3687) 2024-08-16 05:32:05 +00:00
MHSanaei 16de0937a8
Fix typos (#3527) 2024-07-12 00:20:06 +02:00
yuhan6665 079d0bd8a9
Refactor log (#3446) 
* Refactor log

* Add new log methods

* Fix logger test

* Change all logging code

* Clean up pathObj

* Rebase to latest main

* Remove invoking method name after the dot
 2024-06-29 14:32:57 -04:00
coderwander 0c61752829 chore: fix struct name 
Signed-off-by: coderwander <770732124@qq.com>
 2024-04-16 10:42:19 -04:00
nobody 961cf9d3b1
Remove slices dependency. (#2930) 
* Remove slices dependency.

* Fix nil pointer dereference bug.

---------

Co-authored-by: nobody <nobody@nowhere.mars>
 2024-01-11 10:34:26 -05:00
nobody 44bb83033f
Add sub-command "-dump" to "run". (#2854) 
* Add MarshalToJson().

* Add cmd arg -dump for printing out merged multiple json configs.

---------

Co-authored-by: nobody <nobody@nowhere.mars>
 2023-12-29 11:16:48 -05:00
hax0r31337 f67167bb3b refactor(deps): replace github.com/golang/protobuf with google.golang.org/protobuf 2023-08-10 10:43:27 -04:00
冬花ice 017b56adf5
Recognize .jsonc files automatically (#2398) 
Closes https://github.com/XTLS/Xray-core/issues/2399
 2023-08-06 06:47:31 +00:00
世界 f046feb9ca
Reformat code 2022-05-18 15:29:01 +08:00
秋のかえで 6c936e2fd3
fix: set json to default format to stdin (#446) 2021-03-28 23:45:13 +08:00
秋のかえで b0e7ad9663
Fix: format flag not working (#410) 2021-03-21 09:13:51 +00:00
Monsoon 1b87264c53
Support loading config from different formats (#228) 2021-02-12 14:12:58 +00:00
RPRX f8faf3c8b8 Removal: confonly 2020-12-11 13:05:29 +08:00
RPRX 16544c18ab v1.1.0 2020-12-04 09:36:16 +08:00
RPRX c7f7c08ead v1.0.0 2020-11-25 19:01:53 +08:00