Commit Graph

Select branches

Hide Pull Requests

beta

develop

master

#1002

#1003

#1004

#1011

#1012

#1015

#1027

#103

#1033

#1046

#1046

#1056

#1061

#1062

#1067

#1067

#1068

#1068

#1070

#1072

#1087

#1102

#1102

#1103

#1136

#1154

#1159

#1159

#1203

#1204

#1204

#1207

#1216

#1216

#1217

#1221

#1221

#1222

#1222

#1223

#1223

#1224

#1224

#1243

#1258

#1279

#1279

#1283

#1283

#1295

#1295

#1302

#1333

#134

#1341

#1341

#1364

#1412

#1426

#1426

#1440

#1444

#1445

#1445

#1446

#1455

#1455

#1466

#1471

#1478

#1491

#1508

#152

#1552

#1558

#1560

#1568

#1570

#1573

#1578

#1578

#1582

#1585

#1593

#1626

#1640

#1640

#1680

#1680

#1696

#1698

#1700

#1702

#1709

#1729

#1729

#1733

#1742

#1742

#1747

#1750

#1750

#1751

#1751

#1762

#1767

#1768

#1771

#1771

#1773

#1773

#1794

#1797

#1797

#1804

#1806

#1806

#2

#2

#22

#22

#234

#234

#241

#249

#251

#258

#284

#284

#287

#299

#299

#311

#311

#312

#330

#334

#346

#376

#379

#38

#38

#41

#41

#410

#410

#411

#412

#413

#414

#415

#417

#418

#420

#422

#429

#431

#431

#433

#436

#438

#439

#442

#443

#447

#449

#454

#455

#456

#457

#459

#461

#462

#467

#469

#472

#48

#481

#490

#491

#494

#497

#502

#503

#503

#535

#542

#542

#544

#544

#549

#549

#565

#568

#57

#570

#571

#572

#574

#583

#585

#594

#597

#598

#600

#602

#603

#609

#610

#611

#612

#614

#615

#617

#62

#62

#624

#628

#630

#631

#631

#632

#64

#644

#646

#663

#666

#67

#675

#676

#686

#69

#690

#692

#701

#712

#712

#717

#724

#725

#741

#742

#765

#765

#77

#787

#787

#788

#792

#793

#798

#799

#80

#809

#81

#810

#811

#823

#840

#866

#866

#87

#87

#920

#920

#922

#945

#945

#965

#965

#970

#970

#977

#977

#978

#981

#983

#986

#999

v2.10.1

v2.10.2

v2.10.3

v2.10.4

v2.10.5

v2.10.6

v2.10.7

v2.10.8

v2.2.0

v2.2.1

v2.2.2

v2.2.3

v2.2.4

v2.2.5

v2.2.6

v2.3.0

v2.3.1

v2.3.2

v2.3.3

v2.4.1

v2.4.2

v2.4.3

v2.4.4

v2.4.6

v2.5.0

v2.5.1

v2.5.2

v2.5.3

v2.5.4

v2.5.5

v2.5.6

v2.5.7

v2.6.0

v2.6.1

v2.6.2

v2.6.3

v2.6.4

v2.6.5

v2.6.6

v2.6.7

v2.6.8

v2.6.9

v2.7.0

v2.7.1

v2.7.2

v2.7.3

v2.7.4

v2.7.5

v2.7.6

v2.7.7

v2.8.0

v2.8.1

v2.8.2

v2.8.3

v2.9.0

v2.9.1

v2.9.10

v2.9.11

v2.9.2

v2.9.3

v2.9.4

v2.9.5

v2.9.6

v2.9.7

v2.9.8

v2.9.9

v3.0.0

v3.0.1

v3.0.2

v3.0.3

v3.0.4

v3.0.5

v3.0.6

v3.0.7

v3.0.8

v3.1.0

v3.1.1

v3.1.2

v3.1.3

v3.1.4

v3.1.5

v3.1.6

v3.1.7

v3.2.0

v3.2.1

v3.2.2

v3.2.3

v3.2.4

v3.2.5

v3.2.6

v3.2.7

v3.2.8

v3.2.9

v3.3.0

v3.3.1

v3.4.0

v3.4.1

v3.4.2

v4.0.0

v4.0.1

v4.0.2

v4.0.3

v4.0.4

v4.1.0

v4.1.1

v4.1.2

v4.1.3

v4.1.4

v4.1.5

v4.1.6

v4.1.7

v4.1.8

v4.2.0

v4.2.1

v4.2.2

v4.2.3

v4.2.4

v4.2.5

v4.3.0

v4.3.1

v4.3.2

v4.3.3

v4.4.0

v4.4.1

v4.4.2

v4.4.3

v4.4.4

v4.4.5

v4.4.6

v4.5.0

v4.5.1

v4.5.2

v4.5.3

v4.5.4

v4.5.5

v4.5.6

v4.5.7

v4.6.0

Mono Color

• e5ce8fd0a6 Refine Tasker features Mygod 2015-12-02 00:31:18 +08:00
• 56a065b182 Merge pull request #461 from Mygod/master Max Lv 2015-12-01 22:56:45 +08:00
• 41b7da4b63 Fix #460 Mygod 2015-12-01 22:41:51 +08:00
• b0180fb9a1 Fix notification not updated when service is started and the screen is off Mygod 2015-12-01 21:47:35 +08:00
• ecfbc3e1a7 Merge pull request #459 from CzBiX/tasker Max Lv 2015-12-01 18:17:24 +08:00
• 253cfec33d add switch profile for Tasker CzBiX 2015-12-01 17:32:49 +08:00
• a56fb2b522 Merge pull request #457 from Mygod/master Max Lv 2015-11-30 22:57:44 +08:00
• 52eb2607f9 Fix tasker warning Mygod 2015-11-30 21:10:12 +08:00
• 624ccba559 Refine padding Mygod 2015-11-30 21:08:17 +08:00
• 7e8a5ac9df Refine AndroidManifest Mygod 2015-11-30 21:01:53 +08:00
• e524ab8d2e Refine TaskerActivity title Mygod 2015-11-30 20:56:17 +08:00
• c969aed4da Refine layout Mygod 2015-11-30 20:50:32 +08:00
• f891bd1789 Merge pull request #456 from CzBiX/tasker Max Lv 2015-11-30 17:08:36 +08:00
• a6c12dfd5e Remove unused consts in Utils CzBiX 2015-11-30 16:31:07 +08:00
• 3d998a326c Automation app integration CzBiX 2015-11-30 16:23:25 +08:00
• 1de3a4497c Merge pull request #455 from Mygod/master Max Lv 2015-11-30 10:03:00 +08:00
• b11280479b Fix recycling in ProfileManagerActivity Mygod 2015-11-30 09:45:31 +08:00
• 2127e17cc7 Merge pull request #454 from Mygod/master Max Lv 2015-11-29 21:41:00 +08:00
• d9179fcc9a Fix ShadowsocksNotification Mygod 2015-11-29 18:34:43 +08:00
• b3d188fbae Update libsuperuser Mygod 2015-11-29 12:27:09 +08:00
• c6d2a44c15 Update README.md Max Lv 2015-11-26 12:02:42 +08:00
• 2151873264 Merge pull request #449 from Mygod/master Max Lv 2015-11-26 09:58:10 +08:00
• 9b2671d565 Refine traffic format Mygod 2015-11-26 09:54:02 +08:00
• f728a67691 Simplify SummaryPreference Mygod 2015-11-25 23:35:39 +08:00
• b269d9a649 Merge pull request #447 from Mygod/master Max Lv 2015-11-25 09:28:47 +08:00
• 1eda4c47a4 Removed the switch for now Mygod 2015-11-24 21:41:09 +08:00
• c1730e4fa6 Add a toggle for showing traffic in notification. TODO: Disabling it causes weird behavior. :-( Mygod 2015-11-24 21:16:08 +08:00
• 9fa57dfe4b Refine service_running string Mygod 2015-11-24 19:28:31 +08:00
• 5e0d52324b Add traffic to notification Mygod 2015-11-24 19:25:41 +08:00
• 118aa1271c Fix bypass not copied Mygod 2015-11-24 18:12:24 +08:00
• 99a6c4ff3e Extract notification logic Mygod 2015-11-24 18:09:27 +08:00
• 19c4910794 ignore all exceptions when upgrading the preference v2.9.1 Max Lv 2015-11-24 14:47:51 +08:00
• 8b0b39cba7 fix #444 Max Lv 2015-11-24 13:23:16 +08:00
• be8bc523ad bump version Max Lv 2015-11-24 10:43:27 +08:00
• 050007b49b fix an issue when upgrading database Max Lv 2015-11-24 10:42:57 +08:00
• be4ddc37db update chnroute v2.9.0 Max Lv 2015-11-24 09:19:33 +08:00
• 331434dc6b Merge pull request #443 from Mygod/master Max Lv 2015-11-23 22:01:17 +08:00
• da3690d18c Fix #441 Mygod 2015-11-23 21:21:47 +08:00
• ffdde981fb Fix realtime traffic in profile selector Mygod 2015-11-23 20:06:11 +08:00
• 4686c7ff86 bump version Max Lv 2015-11-23 12:33:12 +08:00
• 48e698cfec Merge pull request #442 from hghwng/master Max Lv 2015-11-22 22:41:51 +08:00
• 7d9ecffeb9 Remove unused {gfwroute, simpleroute}.xml Hugh Wang 2015-11-22 22:27:48 +08:00
• 4f92c36228 Fix a bug when reseting traffic Max Lv 2015-11-21 21:20:20 +08:00
• 4f5edc8b8b Use progressCircle to indicate the disable status of switch Max Lv 2015-11-21 18:56:46 +08:00
• 656bb28a11 Stop the timer when all callbacks removed Max Lv 2015-11-21 18:26:14 +08:00
• 6e974da8ca Merge pull request #439 from Mygod/master Max Lv 2015-11-21 16:11:25 +08:00
• 407ba8beaa Add realtime traffic in profiles selector Mygod 2015-11-21 16:04:55 +08:00
• c08296890a Refine traffic display Mygod 2015-11-21 15:11:48 +08:00
• c3638b96e8 refine strings Max Lv 2015-11-21 12:19:34 +08:00
• ff23bae671 fix #424 Max Lv 2015-11-21 11:59:05 +08:00
• e636b9f78e Disable log of pdnsd Max Lv 2015-11-21 10:15:11 +08:00
• f833808bbc fix an issue that redsocks is blocked by stdout Max Lv 2015-11-21 09:18:46 +08:00
• f2292fb86b use ProcessBuilder instead of fork/exec Max Lv 2015-11-20 13:00:59 +08:00
• fe81182d25 Merge pull request #438 from Mygod/master Max Lv 2015-11-20 11:00:30 +08:00
• 6766b8c3a3 Update dependency Mygod 2015-11-20 09:13:14 +08:00
• 946affb219 Fix #437 Mygod 2015-11-20 08:58:13 +08:00
• 408e74384e Debugging an HTC device Mygod 2015-11-20 00:39:47 +08:00
• 84da64fa21 Merge pull request #436 from Mygod/master Max Lv 2015-11-19 14:36:37 +08:00
• 52cd6d1576 Merge branch 'master' of https://github.com/shadowsocks/shadowsocks-android Mygod 2015-11-19 14:34:02 +08:00
• 81587b0551 Use AlertDialogs in support lib Mygod 2015-11-19 14:33:10 +08:00
• 24c1497a6d Fix flashing Mygod 2015-11-19 13:46:15 +08:00
• bcbd409cd7 fix a weird UI issue when hiding progress circle Max Lv 2015-11-19 13:13:05 +08:00
• 5e1f5cd4a0 Merge fix #434 Mygod 2015-11-19 12:57:30 +08:00
• 9921823869 Fix units Mygod 2015-11-19 12:55:23 +08:00
• 0d2663c942 Remove unnecessary resets Mygod 2015-11-19 12:46:45 +08:00
• c63d17350c fix #434 Max Lv 2015-11-19 12:34:24 +08:00
• f345c7d788 Merge pull request #433 from Mygod/master Max Lv 2015-11-19 07:16:54 +08:00
• 9adf11713f Hide stats for profiles that have no traffic Mygod 2015-11-18 23:15:56 +08:00
• c4c1682983 Fix flashing Mygod 2015-11-18 23:15:36 +08:00
• 79ade0ef7f Fix stat_summary Mygod 2015-11-18 23:06:52 +08:00
• 509a4e79fc Add network traffic display in profile selector Mygod 2015-11-18 23:06:25 +08:00
• f4401f8b93 Optimize DBHelper Mygod 2015-11-18 22:18:51 +08:00
• a57d631ef2 Add some spaces Mygod 2015-11-18 22:16:21 +08:00
• 3f8acd85ab Optimize timer code. Apparently onStop will be executed when the screen goes off. Mygod 2015-11-18 22:12:31 +08:00
• 14414c644d Copy feature settings from the current profile to the new profile. And fix #432. Mygod 2015-11-18 21:40:33 +08:00
• 95952f0fec Fix division by zero Mygod 2015-11-18 21:19:20 +08:00
• eed2f47c83 Trim styles Mygod 2015-11-18 20:43:19 +08:00
• 946c876327 Merge branch 'master' of https://github.com/shadowsocks/shadowsocks-android into HEAD Mygod 2015-11-18 20:31:22 +08:00
• 5ac7f2b9fb add missing style file Max Lv 2015-11-18 20:29:54 +08:00
• 811ad74acb fix #430 Max Lv 2015-11-18 20:29:19 +08:00
• fa4b88dc95 Update dependencies Mygod 2015-11-18 20:10:51 +08:00
• 07b9cfa7f1 refine the traffic stat Max Lv 2015-11-18 14:53:56 +08:00
• e667a77b71 Merge pull request #429 from shadowsocks/traffic-stat Max Lv 2015-11-18 14:03:27 +08:00
• f0abbb7304 add TrafficMonitor to the main activity Max Lv 2015-11-18 14:02:29 +08:00
• 92e72830bb Merge branch 'master' into traffic-stat Max Lv 2015-11-18 12:40:45 +08:00
• e50a26f341 fix #388 Max Lv 2015-11-15 18:48:22 +08:00
• 6fb8db771a fix typo Max Lv 2015-11-12 13:03:04 +08:00
• 6749afd263 add TrafficMonitor Max Lv 2015-11-12 12:10:38 +08:00
• 4e4e0514d8 update redsocks Max Lv 2015-11-11 13:39:55 +08:00
• 37cdf8f9a6 Merge pull request #422 from Mygod/master Max Lv 2015-11-11 10:47:39 +08:00
• 24b8a5ab15 refine the pref order Max Lv 2015-11-11 10:36:38 +08:00
• 6f6cb461ed Fix ParserActivity Mygod 2015-11-10 21:02:42 +08:00
• 42c5a01d3e Fix default configuration Mygod 2015-11-10 20:25:10 +08:00
• 8045c961ea Fix NAT default value Mygod 2015-11-10 19:50:29 +08:00
• 83a6d88659 Merge pull request #420 from Mygod/master Max Lv 2015-11-10 19:23:52 +08:00
• 4059b785b0 Switch to another profile while connected Mygod 2015-11-10 18:57:29 +08:00
• a14d3ea99c Fix crashing bug Mygod 2015-11-10 18:40:18 +08:00
• d96cb0ea9b Fix #419 Max Lv 2015-11-10 12:08:15 +08:00
• 52f56cdeef fix a typo Max Lv 2015-11-10 11:57:17 +08:00
• 86e8c9d9fb update packages Max Lv 2015-11-10 11:53:58 +08:00