Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
c8a3164
self exclusion message for uk clients
nazaninreihani Apr 2, 2019
37b57dc
Merge branch 'dev' of github.com:binary-com/mobile into self_exclusion
nazaninreihani Apr 22, 2019
99014d9
self exclusion notes
nazaninreihani Apr 22, 2019
ccdf33b
self exclusion notes
nazaninreihani Apr 22, 2019
dc4a1e5
show bottom note in self exclusion
nazaninreihani Apr 22, 2019
9453071
fix eslint error
nazaninreihani Apr 22, 2019
4ecb10a
remove commited files by mistake
nazaninreihani Apr 24, 2019
a50ce55
remove commited files by mistake
nazaninreihani Apr 24, 2019
2dff53d
remove commited files by mistake
nazaninreihani Apr 24, 2019
050b776
remove commited files by mistake
nazaninreihani Apr 24, 2019
49e0af5
remove commited files by mistake
nazaninreihani Apr 24, 2019
f0b3480
remove commited files by mistake
nazaninreihani Apr 24, 2019
491c684
remove commited files by mistake
nazaninreihani Apr 24, 2019
e748e2c
remove commited files by mistake
nazaninreihani Apr 24, 2019
ca9467d
fix exclude until datepicker
nazaninreihani Apr 24, 2019
3f7a131
fix style of datetime-local input indicator
nazaninreihani Apr 24, 2019
b842448
Merge pull request #1295 from nazaninreihani/self_exclusion
ashkanx Apr 25, 2019
6dfd590
New translations en.json (Italian)
ashkanx Apr 25, 2019
76e8fb8
New translations en.json (Spanish)
ashkanx Apr 25, 2019
64d6da2
New translations en.json (Chinese Simplified)
ashkanx Apr 25, 2019
7e6d743
New translations en.json (Chinese Traditional)
ashkanx Apr 25, 2019
e984490
New translations en.json (French)
ashkanx Apr 25, 2019
61377c1
New translations en.json (German)
ashkanx Apr 25, 2019
24aed25
New translations en.json (Indonesian)
ashkanx Apr 25, 2019
ab52d4f
New translations en.json (Polish)
ashkanx Apr 25, 2019
c17b717
New translations en.json (Portuguese)
ashkanx Apr 25, 2019
a278cb2
New translations en.json (Russian)
ashkanx Apr 25, 2019
be86593
New translations en.json (Thai)
ashkanx Apr 25, 2019
119b78e
New translations en.json (Vietnamese)
ashkanx Apr 25, 2019
596a351
New translations en.json (Acholi)
ashkanx Apr 25, 2019
3821459
New translations en.json (Vietnamese)
ashkanx Apr 25, 2019
678a8b4
New translations en.json (Thai)
ashkanx Apr 26, 2019
f7a4210
New translations en.json (Thai)
ashkanx Apr 26, 2019
1dbc5e6
New translations en.json (Thai)
ashkanx Apr 26, 2019
80c5725
New translations en.json (Russian)
ashkanx Apr 28, 2019
2c98d66
New translations en.json (Indonesian)
ashkanx Apr 29, 2019
4d5f0b8
New translations en.json (Indonesian)
ashkanx Apr 29, 2019
f1857bc
New translations en.json (Spanish)
ashkanx Apr 29, 2019
628b8a9
New translations en.json (Spanish)
ashkanx Apr 29, 2019
165e3d3
New translations en.json (Spanish)
ashkanx Apr 29, 2019
9d0abb7
New translations en.json (Spanish)
ashkanx Apr 29, 2019
15b8fa9
New translations en.json (Spanish)
ashkanx Apr 29, 2019
0e410b3
New translations en.json (Spanish)
ashkanx Apr 29, 2019
cd4d7e4
New translations en.json (Spanish)
ashkanx Apr 29, 2019
aec7597
New translations en.json (Spanish)
ashkanx Apr 29, 2019
55e9621
New translations en.json (German)
ashkanx Apr 29, 2019
9b21d5f
New translations en.json (Spanish)
ashkanx Apr 29, 2019
ba7a5b3
New translations en.json (Spanish)
ashkanx Apr 29, 2019
3bf2530
New translations en.json (Spanish)
ashkanx Apr 29, 2019
ece2daa
New translations en.json (Chinese Simplified)
ashkanx Apr 29, 2019
74f4f03
New translations en.json (Chinese Traditional)
ashkanx Apr 29, 2019
2fc30bd
Merge pull request #1302 from binary-com/CrowdIn
ashkanx Apr 29, 2019
6be8b67
New translations en.json (Italian)
ashkanx Apr 30, 2019
ffb0d3a
New translations en.json (French)
ashkanx Apr 30, 2019
4855ab4
New translations en.json (Polish)
ashkanx Apr 30, 2019
d205417
New translations en.json (Portuguese)
ashkanx Apr 30, 2019
38f7b2d
Merge pull request #1303 from binary-com/CrowdIn
ashkanx Apr 30, 2019
73a9c42
New translations en.json (Thai)
ashkanx Apr 30, 2019
ef9a3ec
Change Malta office address
nazaninreihani May 1, 2019
a0441ae
New translations en.json (French)
ashkanx May 2, 2019
d576b51
Merge pull request #1305 from nazaninreihani/malta_address
ashkanx May 2, 2019
eb25c79
New translations en.json (Italian)
ashkanx May 2, 2019
5d4d2a3
New translations en.json (Spanish)
ashkanx May 2, 2019
2d6213f
New translations en.json (Chinese Simplified)
ashkanx May 2, 2019
69c0479
New translations en.json (Chinese Traditional)
ashkanx May 2, 2019
c1b70bc
New translations en.json (French)
ashkanx May 2, 2019
4d87c76
New translations en.json (German)
ashkanx May 2, 2019
57b1d32
New translations en.json (Indonesian)
ashkanx May 2, 2019
b95f034
New translations en.json (Polish)
ashkanx May 2, 2019
94f7d73
New translations en.json (Portuguese)
ashkanx May 2, 2019
91878c6
New translations en.json (Russian)
ashkanx May 2, 2019
01c37a0
New translations en.json (Thai)
ashkanx May 2, 2019
d854d14
New translations en.json (Vietnamese)
ashkanx May 2, 2019
49a3266
New translations en.json (Acholi)
ashkanx May 2, 2019
1a1c3c8
New translations en.json (Vietnamese)
ashkanx May 2, 2019
d394e27
New translations en.json (Portuguese)
ashkanx May 2, 2019
710c279
New translations en.json (Portuguese)
ashkanx May 2, 2019
b46d9e5
New translations en.json (Italian)
ashkanx May 3, 2019
ca9d6cf
New translations en.json (Italian)
ashkanx May 3, 2019
a265d96
New translations en.json (Italian)
ashkanx May 3, 2019
e05feee
New translations en.json (Italian)
ashkanx May 3, 2019
825fc84
New translations en.json (Italian)
ashkanx May 3, 2019
ea38f17
New translations en.json (Italian)
ashkanx May 3, 2019
3a6770e
New translations en.json (Thai)
ashkanx May 3, 2019
84a6e23
New translations en.json (Thai)
ashkanx May 3, 2019
aa4d988
New translations en.json (Russian)
ashkanx May 4, 2019
f902f26
Add responsible trading, fix outage service and language page
nazaninreihani May 6, 2019
7f07442
remove app id
nazaninreihani May 6, 2019
6e019a3
change responsible trading icon
nazaninreihani May 6, 2019
5dfae23
New translations en.json (Polish)
ashkanx May 6, 2019
52e9b11
Merge pull request #1306 from nazaninreihani/responsible_trading_and_…
ashkanx May 7, 2019
390bde2
New translations en.json (Italian)
ashkanx May 7, 2019
9c7e7dd
New translations en.json (Spanish)
ashkanx May 7, 2019
876b10a
New translations en.json (Chinese Simplified)
ashkanx May 7, 2019
57c6e2c
New translations en.json (Chinese Traditional)
ashkanx May 7, 2019
4c9ba74
New translations en.json (French)
ashkanx May 7, 2019
9392956
New translations en.json (German)
ashkanx May 7, 2019
16d069c
New translations en.json (Indonesian)
ashkanx May 7, 2019
8af4c02
New translations en.json (Polish)
ashkanx May 7, 2019
6381625
New translations en.json (Portuguese)
ashkanx May 7, 2019
581e5e4
New translations en.json (Russian)
ashkanx May 7, 2019
c259a9e
New translations en.json (Thai)
ashkanx May 7, 2019
f21a9db
New translations en.json (Vietnamese)
ashkanx May 7, 2019
c8a05fe
New translations en.json (Acholi)
ashkanx May 7, 2019
54131ce
New translations en.json (Italian)
ashkanx May 7, 2019
74752c6
New translations en.json (Spanish)
ashkanx May 7, 2019
47d6656
New translations en.json (Chinese Simplified)
ashkanx May 7, 2019
fcb6856
New translations en.json (Chinese Traditional)
ashkanx May 7, 2019
5a5508d
New translations en.json (French)
ashkanx May 7, 2019
8b0f573
New translations en.json (German)
ashkanx May 7, 2019
5681c17
New translations en.json (Indonesian)
ashkanx May 7, 2019
ef34807
New translations en.json (Polish)
ashkanx May 7, 2019
021a827
New translations en.json (Portuguese)
ashkanx May 7, 2019
e1c565f
New translations en.json (Russian)
ashkanx May 7, 2019
d3a9068
New translations en.json (Thai)
ashkanx May 7, 2019
f286d59
New translations en.json (Vietnamese)
ashkanx May 7, 2019
88b59f4
New translations en.json (Thai)
ashkanx May 7, 2019
c1c8118
New translations en.json (Polish)
ashkanx May 7, 2019
8f481a8
Merge pull request #1304 from binary-com/CrowdIn
ashkanx May 9, 2019
44d54f2
Fix issue of app stuck in purchase mood
nazaninreihani May 28, 2019
009fe28
refactor
nazaninreihani May 28, 2019
6e26af9
support both string and integer as contract_id
nazaninreihani May 28, 2019
a9eb200
fix statement variable types
nazaninreihani May 28, 2019
6b3f0be
fix statement variable types
nazaninreihani May 28, 2019
75cc60f
Merge pull request #1308 from nazaninreihani/fix_purchase
ashkanx May 29, 2019
b60fc87
Merge branch 'dev' of github.com:binary-com/mobile into transaction_d…
nazaninreihani May 30, 2019
05aefe7
Merge pull request #1309 from nazaninreihani/transaction_details
ashkanx May 31, 2019
d60a652
Fixed the issue of loading languages list in signin page
morteza-binary Jun 7, 2019
778c218
Merge pull request #1310 from morteza-binary/morteza/login_languages_…
morteza-binary Jun 7, 2019
920cd6b
Fixed the issue of loading languages in settings page
morteza-binary Jun 7, 2019
dea5e6f
Merge pull request #1311 from morteza-binary/settings_languages_list
morteza-binary Jun 7, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scss/shared/_general.scss
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,10 @@ input {
top: 2px;
position: relative;
}
&[type="date"] {
&[type="date"], &[type="datetime-local"] {
min-height: 30px!important;
}
&[type="date"]::-webkit-calendar-picker-indicator {
&[type="date"]::-webkit-calendar-picker-indicator, &[type="datetime-local"]::-webkit-calendar-picker-indicator {
color: $secondaryContentColor;
}
}
Expand Down
17 changes: 13 additions & 4 deletions www/i18n/ach.json
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,8 @@
"open_financial": "crwdns45003:0crwdne45003:0",
"create_account": "crwdns45004:0crwdne45004:0",
"accounts_list": "crwdns45005:0crwdne45005:0",
"network_status": "crwdns45006:0crwdne45006:0"
"network_status": "crwdns45006:0crwdne45006:0",
"responsible_trading": "crwdns53748:0crwdne53748:0"
},
"settings": {
"settings": "crwdns18010:0crwdne18010:0",
Expand Down Expand Up @@ -384,7 +385,15 @@
"success": "crwdns18039:0crwdne18039:0",
"warning": "crwdns19405:0crwdne19405:0",
"not_zero": "crwdns45950:0crwdne45950:0",
"error": "crwdns45951:0crwdne45951:0"
"error": "crwdns45951:0crwdne45951:0",
"customer_support": "crwdns53682:0crwdne53682:0",
"info": "crwdns53684:0crwdne53684:0",
"ukgc_info_1": "crwdns53686:0crwdne53686:0",
"ukgc_info_2": "crwdns53688:0crwdne53688:0",
"ukgc_info_3": "crwdns53690:0crwdne53690:0",
"info_bottom_1": "crwdns53692:0crwdne53692:0",
"info_bottom_2": "crwdns53694:0crwdne53694:0",
"info_bottom_3": "crwdns53696:0crwdne53696:0"
},
"profile": {
"personal_details": "crwdns18040:0crwdne18040:0",
Expand Down Expand Up @@ -583,7 +592,7 @@
"marketing_email": "crwdns45161:0crwdne45161:0",
"company_addresses": "crwdns45162:0crwdne45162:0",
"malta": "crwdns19705:0crwdne19705:0",
"malta_address": "crwdns19706:0crwdne19706:0",
"malta_address": "crwdns53728:0crwdne53728:0",
"japan": "crwdns19707:0crwdne19707:0",
"japan_address": "crwdns19708:0crwdne19708:0",
"malaysia": "crwdns19710:0crwdne19710:0",
Expand Down Expand Up @@ -790,4 +799,4 @@
"what_is_this": "crwdns45935:0crwdne45935:0",
"submit": "crwdns45936:0crwdne45936:0"
}
}
}
17 changes: 13 additions & 4 deletions www/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,8 @@
"open_financial": "Finanzkonto eröffnen",
"create_account": "Konto einrichten",
"accounts_list": "Kontenliste",
"network_status": "Netzwerkstatus"
"network_status": "Netzwerkstatus",
"responsible_trading": "Verantwortungsbewusstes Handeln"
},
"settings": {
"settings": "Einstellungen",
Expand Down Expand Up @@ -384,7 +385,15 @@
"success": "Erfolg",
"warning": "Achtung",
"not_zero": "Wert kann nicht 0 sein",
"error": "Leider ist während der Bearbeitung Ihrer Anfrage ein Fehler aufgetreten."
"error": "Leider ist während der Bearbeitung Ihrer Anfrage ein Fehler aufgetreten.",
"customer_support": "kundenunterstützung",
"info": "Online trading can become addictive. Fill in the form below to limit your participation on the website or send a signed letter or fax to our customer support team. Once set, you can only tighten your limits. Limits will only be removed or loosened after 7 days with the exception of the self-exclusion date, which cannot be removed or altered once you have confirmed it. To remove or increase your limits, please contact",
"ukgc_info_1": "Wenn Sie einen Selbstausschluss erwägen, können Sie sich bei GAMSTOP registrieren.",
"ukgc_info_2": "GAMSTOP ist ein kostenloser Service, der es Ihnen ermöglicht, sich aus allen Online-Glücksspiel-Unternehmen, die in Großbritannien zugelassen sind, selbst auszuschließen.",
"ukgc_info_3": "Um mehr zu erfahren und um sich mit GAMSTOP zu registrieren, besuchen Sie bitte",
"info_bottom_1": "Self-exclusion on this website only applies to your Binary.com account and does not include other companies or websites.",
"info_bottom_2": "Da Sie das Bedürfnis haben, sich selbst auszuschließen, empfehlen wir Ihnen sich von ähnlichen Diensten, für die Sie sich eventuell angemeldet haben, abzumelden.",
"info_bottom_3": "Um sich von allen Online-Glücksspiel-Unternehmen, die in Großbritannien lizenziert sind, selbst auszuschließen, gehen Sie bitte zu "
},
"profile": {
"personal_details": "Persönliche Angaben",
Expand Down Expand Up @@ -583,7 +592,7 @@
"marketing_email": "Für Partner, Partnerschaft und andere Marketing-bezogene Anfragen",
"company_addresses": "Firmenanschriften",
"malta": "Malta",
"malta_address": "Binary (Europe) Ltd & Binary Investments (Europe) Ltd, Mompalao Building, Suite 2, Tower Road, Msida MSD1825",
"malta_address": "Binary (Europe) Ltd & Binary Investments (Europe) Ltd, W Business Centre, Level 3, Triq Dun Karm, Birkirkara, BKR 9033",
"japan": "Japan",
"japan_address": "Binary KK, Hiroo Miyata Bldg 3F, 9-16, Hiroo 1-chome, Shibuya-ku, Tokio 150-0012, Japan",
"malaysia": "Malaysia",
Expand Down Expand Up @@ -790,4 +799,4 @@
"what_is_this": "Was ist das?",
"submit": "Absenden"
}
}
}
15 changes: 12 additions & 3 deletions www/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,8 @@
"open_financial": "Open A Financial Account",
"create_account": "Create Account",
"accounts_list": "Accounts List",
"network_status": "Network Status"
"network_status": "Network Status",
"responsible_trading": "Responsible Trading"
},
"settings": {
"settings": "Settings",
Expand Down Expand Up @@ -384,7 +385,15 @@
"success": "Success",
"warning": "Warning",
"not_zero": "Value can not be 0",
"error": "Sorry, an error occurred while processing your request."
"error": "Sorry, an error occurred while processing your request.",
"customer_support": "customer support",
"info": "Online trading can become addictive. Fill in the form below to limit your participation on the website or send a signed letter or fax to our customer support team. Once set, you can only tighten your limits. Limits will only be removed or loosened after 7 days with the exception of the self-exclusion date, which cannot be removed or altered once you have confirmed it. To remove or increase your limits, please contact",
"ukgc_info_1": "If you are considering self-exclusion, you may wish to register with GAMSTOP.",
"ukgc_info_2": "GAMSTOP is a free service that enables you to self-exclude from all online gambling companies licensed in Great Britain.",
"ukgc_info_3": "To find out more and to sign up with GAMSTOP, please visit",
"info_bottom_1": "Self-exclusion on this website only applies to your Binary.com account and does not include other companies or websites.",
"info_bottom_2": "Since you feel the need to self-exclude, we strongly encourage you to exclude yourself from similar services that you may have signed up for.",
"info_bottom_3": "To self-exclude from all online gambling companies licensed in Great Britain, you may go to "
},
"profile": {
"personal_details": "Personal Details",
Expand Down Expand Up @@ -583,7 +592,7 @@
"marketing_email": "For affiliate, partnership, and other marketing-related queries",
"company_addresses": "Company addresses",
"malta": "Malta",
"malta_address": "Binary (Europe) Ltd & Binary Investments (Europe) Ltd, Mompalao Building, Suite 2, Tower Road, Msida MSD1825",
"malta_address": "Binary (Europe) Ltd & Binary Investments (Europe) Ltd, W Business Centre, Level 3, Triq Dun Karm, Birkirkara, BKR 9033",
"japan": "Japan",
"japan_address": "Binary KK, Hiroo Miyata Bldg 3F, 9-16, Hiroo 1-chome, Shibuya-ku, Tokyo 150-0012, Japan",
"malaysia": "Malaysia",
Expand Down
Loading