Skip to content

Commit 84a646a

Browse files
committed
Sync with gitlab.
1 parent ddaf923 commit 84a646a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+449
-201
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/nbproject/private/
22
/build/
3-
/dist/
3+
/dist/
4+
nbproject/*

appengine/jstock-android-static/war/news_information/index.html

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,20 @@
44
<body>
55
<!--fe78440e-e0fe-4efb-881d-264a01be483c-->
66

7-
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.17 had been released.</p>
7+
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.18 had been released.</p>
88

99
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
1010

1111
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
12-
Feature: Better way to switch between different auto brokerage fee calculation.
13-
</p>
12+
Feature: JStock is partnering with DriveWealth, to provide U.S. stock trading service. You can own a fraction of share, with total cost as low as $1.99!
13+
</p>
1414
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
15-
Feature: Support large font.
16-
</p>
17-
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
18-
Feature: Added GA.
19-
</p>
20-
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
21-
Bugfix: Fix UI issue under Mac.
22-
</p>
15+
Feature: Better way to report the progress of indicator scanning.
16+
</p>
2317

2418
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
2519

26-
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.17 from <a href="http://jstock.org/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/download.html</a>. After upgrade, your personal data will be preserved.</p>
20+
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.18 from <a href="http://jstock.org/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/download.html</a>. After upgrade, your personal data will be preserved.</p>
2721

2822
</body>
2923
</html>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed
2-
news_id=10/17/16
2+
news_id=12/28/16
33
news_url=http://jstock-static.appspot.com/news_information/index.html

appengine/jstock-android-static/war/news_information/zh/index.html

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,20 @@
44
<body>
55
<!--fe78440e-e0fe-4efb-881d-264a01be483c-->
66

7-
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.17 had been released.</p>
7+
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.18 had been released.</p>
88

99
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
1010

1111
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
12-
Feature: Better way to switch between different auto brokerage fee calculation.
13-
</p>
12+
Feature: JStock is partnering with DriveWealth, to provide U.S. stock trading service. You can own a fraction of share, with total cost as low as $1.99!
13+
</p>
1414
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
15-
Feature: Support large font.
16-
</p>
17-
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
18-
Feature: Added GA.
19-
</p>
20-
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
21-
Bugfix: Fix UI issue under Mac.
22-
</p>
15+
Feature: Better way to report the progress of indicator scanning.
16+
</p>
2317

2418
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
2519

26-
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.17 from <a href="http://jstock.org/zh/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/zh/download.html</a>. After upgrade, your personal data will be preserved.</p>
20+
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.18 from <a href="http://jstock.org/zh/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/zh/download.html</a>. After upgrade, your personal data will be preserved.</p>
2721

2822
</body>
2923
</html>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed
2-
news_id=10/17/16
2+
news_id=12/28/16
33
news_url=http://jstock-static.appspot.com/news_information/zh/index.html
Binary file not shown.
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"Spain":1482076929000,"Brazil":1472877150000,"Taiwan":1471054690000,"Netherlands":1427943613000,"Canada":1427943613000,"China":1427943613000,"India":1413476847000,"UnitedState":1472490105000,"Malaysia":1432597892000,"HongKong":1478435680000,"Portugal":1472881153000,"Indonesia":1471054690000,"Germany":1411400461000,"Singapore":1430835396000,"Australia":1426093909000,"Denmark":1427116925000,"Sweden":1418830110000,"UnitedKingdom":1427943613000,"Japan":1437595530000}
1+
{"Finland":1482551336000,"Russia":1482551336000,"Spain":1482551336000,"Brazil":1472877150000,"Taiwan":1471054690000,"Netherlands":1427943613000,"Canada":1427943613000,"China":1427943613000,"India":1413476847000,"UnitedState":1472490105000,"Malaysia":1432597892000,"HongKong":1478435680000,"Portugal":1472881153000,"Indonesia":1471054690000,"Germany":1411400461000,"Singapore":1430835396000,"Australia":1426093909000,"Denmark":1427116925000,"Sweden":1418830110000,"UnitedKingdom":1427943613000,"Japan":1437595530000}
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
applicationVersionID=1146
2-
windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-17/jstock-1.0.7.17-setup.exe
3-
linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-17/jstock-1.0.7.17-bin.zip
4-
macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-17/jstock-1.0.7.17-bin.zip
5-
solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-17/jstock-1.0.7.17-bin.zip
1+
applicationVersionID=1147
2+
windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-setup.exe
3+
linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
4+
macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
5+
solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
applicationVersionID=1146
2-
windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-17/jstock-1.0.7.17-setup.exe
3-
linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-17/jstock-1.0.7.17-bin.zip
4-
macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-17/jstock-1.0.7.17-bin.zip
5-
solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-17/jstock-1.0.7.17-bin.zip
1+
applicationVersionID=1147
2+
windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-setup.exe
3+
linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
4+
macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
5+
solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip

0 commit comments

Comments
 (0)