Alawn/shadowsocks-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
842 Commits 3 Branches 138 Tags
eed2f47c831237c878610802832daa03e5a9c816
Commit Graph
842 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mygod eed2f47c83 Trim styles 2015-11-18 20:43:19 +08:00
Mygod 946c876327 Merge branch 'master' of https://github.com/shadowsocks/shadowsocks-android into HEAD 2015-11-18 20:31:22 +08:00
Max Lv 5ac7f2b9fb add missing style file 2015-11-18 20:29:54 +08:00
Max Lv 811ad74acb fix #430 2015-11-18 20:29:19 +08:00
Mygod fa4b88dc95 Update dependencies 2015-11-18 20:22:42 +08:00
Max Lv 07b9cfa7f1 refine the traffic stat 2015-11-18 14:53:56 +08:00
Max Lv e667a77b71 Merge pull request #429 from shadowsocks/traffic-stat 
Add Traffic stat
 2015-11-18 14:03:27 +08:00
Max Lv f0abbb7304 add TrafficMonitor to the main activity 2015-11-18 14:02:29 +08:00
Max Lv 92e72830bb Merge branch 'master' into traffic-stat 2015-11-18 12:40:45 +08:00
Max Lv e50a26f341 fix #388 2015-11-15 18:48:22 +08:00
Max Lv 6fb8db771a fix typo 2015-11-12 13:03:04 +08:00
Max Lv 6749afd263 add TrafficMonitor 2015-11-12 12:10:38 +08:00
Max Lv 4e4e0514d8 update redsocks 2015-11-11 13:39:55 +08:00
Max Lv 37cdf8f9a6 Merge pull request #422 from Mygod/master 
Some fixes
 2015-11-11 10:47:39 +08:00
Max Lv 24b8a5ab15 refine the pref order 2015-11-11 10:36:38 +08:00
Mygod 6f6cb461ed Fix ParserActivity 2015-11-10 21:02:42 +08:00
Mygod 42c5a01d3e Fix default configuration 2015-11-10 20:25:10 +08:00
Mygod 8045c961ea Fix NAT default value 2015-11-10 19:50:29 +08:00
Max Lv 83a6d88659 Merge pull request #420 from Mygod/master 
Switch to another profile while connected
 2015-11-10 19:23:52 +08:00
Mygod 4059b785b0 Switch to another profile while connected 2015-11-10 18:57:29 +08:00
Mygod a14d3ea99c Fix crashing bug 2015-11-10 18:40:18 +08:00
Max Lv d96cb0ea9b Fix #419 2015-11-10 12:08:15 +08:00
Max Lv 52f56cdeef fix a typo 2015-11-10 11:57:17 +08:00
Max Lv 86e8c9d9fb update packages 2015-11-10 11:53:58 +08:00
Max Lv 6d0ade6dc0 add ia32-libs 2015-11-10 10:52:32 +08:00
Max Lv b249f05cbc add gcc-multilib 2015-11-10 10:34:57 +08:00
Max Lv 1ba9fac211 udpate build tools version 2015-11-10 10:24:20 +08:00
Max Lv 23d15122ab fix the syntax error 2015-11-10 10:01:52 +08:00
Max Lv b7f9ebba94 enable the output of setup.sh 2015-11-10 09:59:24 +08:00
Max Lv dc15ad226f use scala build system 2015-11-10 09:57:33 +08:00
Max Lv 1c7ca95b1a update setup scripts 2015-11-10 09:53:49 +08:00
Max Lv 99ff552a74 udpate travis-ci scripts 2015-11-10 09:51:53 +08:00
Max Lv 9c7c2d572b fix travis-ci 2015-11-10 09:40:35 +08:00
Max Lv 95b54f8374 add travis-ci scripts 2015-11-10 09:35:36 +08:00
Max Lv 7203c6d0b3 Merge pull request #418 from Mygod/master 
Reduce apk size
 2015-11-10 07:10:40 +08:00
Mygod 49bcfb279e Reduce apk size 2015-11-09 23:15:40 +08:00
Mygod 3efeed1b90 Fix preference enabled on activity recreation 2015-11-09 22:21:27 +08:00
Mygod 108b740c30 Remove delay when scanning QR code 2015-11-09 22:13:38 +08:00
Max Lv 257b44f363 Merge pull request #417 from Mygod/master 
Some final touches
 2015-11-09 21:15:09 +08:00
Mygod 63bc4a57f7 Refine layout for AppManager 2015-11-09 20:54:34 +08:00
Mygod b05adbdd43 Remove redundant Global Proxy 2015-11-09 20:32:22 +08:00
Mygod 58c16704a1 No more restarting AppManager after importing 2015-11-09 18:44:12 +08:00
Mygod bf9b3f4fde Hide root summary if rooted 2015-11-09 17:42:02 +08:00
Mygod 5f0b1a50b2 Add NumberPickerPreference 2015-11-09 17:29:10 +08:00
Mygod 8dd1093c6c Merge translation updates 2015-11-09 16:15:58 +08:00
Max Lv 7d581508b8 update strings 2015-11-09 14:05:01 +08:00
Mygod 7c61df584b Fix NatSwitchPreference 2015-11-09 13:54:42 +08:00
Mygod fb6d2df3ac Fix PROXY_PREFS 2015-11-09 13:47:23 +08:00
Mygod fe51b71c54 Update Chinese translations 2015-11-09 13:45:55 +08:00
Max Lv 468560a06d Merge pull request #415 from Mygod/master 
Adjust preference order
 2015-11-09 13:40:04 +08:00