Skip to content

Commit

Permalink
Merge pull request #75 from shafin-deriv/shafin/DAPI-469/chore-align-…
Browse files Browse the repository at this point in the history
…with-master

Shafin/chore: align feature branch with master
  • Loading branch information
sandeep-deriv committed Jul 23, 2024
2 parents 511b760 + d01641b commit 57bf4c5
Show file tree
Hide file tree
Showing 251 changed files with 22,626 additions and 17,677 deletions.
22 changes: 6 additions & 16 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,11 @@
# ================================================

# yashim-deriv
# matin-binary
# michio-rework
# shafin-deriv
# sandeep-deriv
# ali-hosseini-deriv
# wojciech-deriv
# markwylde-deriv

######################################################################################################
#
Expand All @@ -57,19 +60,6 @@
# (in case no pattern matches a path in a PR - this should be treated as a bug and result in adding the path to CODEOWNERS)
# ==============================================================

* @matin-binary @michio-rework

# ==============================================================
# deriv-api-docs/src/configs
# ==============================================================

/src/configs/* @michio-rework

# ==============================================================
# deriv-api-docs/theme
# ==============================================================

/theme/* @michio-rework

* @wojciech-deriv @markwylde-deriv @ali-hosseini-deriv @sandeep-deriv @shafin-deriv


4 changes: 2 additions & 2 deletions .github/actions/setup_node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Sets up Node.js
runs:
using: composite
steps:
- name: Use Node.js 16.x
- name: Use Node.js 18.x
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8
with:
node-version: 16.x
node-version: 18.x
19 changes: 19 additions & 0 deletions .github/actions/test_build/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: build
description: Build Docusaurus project
inputs:
NODE_ENV:
description: Node environment
required: false
default: staging
TRACKJS_TOKEN:
description: Trackjs Token
required: false
runs:
using: composite
steps:
- name: Building Docusaurus project
env:
NODE_ENV: ${{ inputs.NODE_ENV }}
TRACKJS_TOKEN: ${{ inputs.TRACKJS_TOKEN }}
run: npm run build -- --locale en
shell: bash
2 changes: 1 addition & 1 deletion .github/workflows/coveralls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install dependencies
uses: './.github/actions/npm_install_from_cache'
- name: Build
uses: ./.github/actions/build
uses: ./.github/actions/test_build
- name: Run Tests
run: npm run test -- --collectCoverage
- name: Coveralls
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/translation_pull.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Crowdin Pull

on:
workflow_dispatch:

jobs:
crowdin:
permissions:
contents: write
pull-requests: write
runs-on: ubuntu-latest
environment: Production
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11

- name: Synchronize with Crowdin
uses: crowdin/github-action@v1
with:
upload_sources: false
upload_translations: false
download_translations: true
localization_branch_name: l18n_crowdin_translations
create_pull_request: true
pull_request_title: 'New Crowdin translations'
pull_request_body: 'New Crowdin pull request with translations'
pull_request_base_branch_name: 'master'
env:
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
21 changes: 21 additions & 0 deletions .github/workflows/translation_push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Crowdin Push

on:
workflow_dispatch:

jobs:
crowdin-upload:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11

- name: Crowdin push
uses: crowdin/github-action@v1
with:
upload_sources: true
upload_translations: true
download_translations: false
env:
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
8 changes: 6 additions & 2 deletions _data/v3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ groups:
title: Update Contract History
- name: contracts_for
title: Contracts For Symbol
- name: contracts_for_company
title: Contracts For Company
- name: copy_start
title: 'Copy Trading: Start'
- name: copy_stop
Expand Down Expand Up @@ -213,6 +215,8 @@ groups:
title: Ticks History
- name: time
title: Server Time
- name: tin_validations
title: Tax Identification Number Validations
- name: tnc_approval
title: Terms and Conditions Approval
- name: topup_virtual
Expand All @@ -223,6 +227,8 @@ groups:
title: 'Trading Platform: Investor Password Reset'
- name: trading_platform_password_reset
title: 'Trading Platform: Password Reset'
- name: trading_platform_status
title: Trading Platform Status
- name: trading_servers
title: Server list
- name: trading_times
Expand All @@ -235,8 +241,6 @@ groups:
title: Unsubscribe Email
- name: verify_email
title: Verify Email
- name: verify_email_cellxpert
title: Verify Email Cellxpert
- name: website_config
title: Server Config
- name: website_status
Expand Down
19 changes: 18 additions & 1 deletion config/v3/active_symbols/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,23 @@
"full"
]
},
"barrier_category": {
"description": "[Optional] Category of barrier.",
"type": "array",
"items": {
"description": "",
"type": "string",
"enum": [
"american",
"asian",
"euro_atm",
"euro_non_atm",
"non_financial",
"lookback",
"reset"
]
}
},
"contract_type": {
"description": "[Optional] The proposed contract type",
"type": "array",
Expand Down Expand Up @@ -97,7 +114,7 @@
]
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
2 changes: 1 addition & 1 deletion config/v3/api_token/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
]
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
2 changes: 1 addition & 1 deletion config/v3/app_delete/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"type": "integer"
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
2 changes: 1 addition & 1 deletion config/v3/app_get/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"type": "integer"
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
2 changes: 1 addition & 1 deletion config/v3/app_list/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
]
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
2 changes: 1 addition & 1 deletion config/v3/app_markup_details/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"uniqueItems": true
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
2 changes: 1 addition & 1 deletion config/v3/app_markup_statistics/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"pattern": "^([0-9]{4}-(0?[1-9]|1[012])-(0?[1-9]|[12][0-9]|3[01]) ([01]?[0-9]|2[0-3]):([0-5]?[0-9]):([0-5]?[0-9])|[0-9]{1,10})$"
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
2 changes: 1 addition & 1 deletion config/v3/app_register/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"pattern": "^[a-z][a-z0-9.+\\-]*://[0-9a-zA-Z\\.-]+[\\%\\/\\w \\.-]*$"
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
2 changes: 1 addition & 1 deletion config/v3/app_update/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"pattern": "^[a-z][a-z0-9.+\\-]*://[0-9a-zA-Z\\.-]+[\\%\\/\\w \\.-]*$"
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
2 changes: 1 addition & 1 deletion config/v3/asset_index/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
]
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
6 changes: 3 additions & 3 deletions config/v3/authorize/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"properties": {
"authorize": {
"description": "Authentication token. May be retrieved from https://www.binary.com/en/user/security/api_tokenws.html",
"description": "Authentication token. May be retrieved from https://www.binary.com/en/user/security/api_tokenws.html. Set to MULTI when using multiple tokens.",
"type": "string",
"pattern": "^[\\w\\-]{1,128}$",
"sensitive": 1
Expand All @@ -25,13 +25,13 @@
]
},
"tokens": {
"description": "Additional Authentication tokens of authorized user that may be used in this session. Upto 10 tokens.",
"description": "Additional Authentication tokens of authorized user that may be used in this session. Upto 25 tokens.",
"type": "array",
"items": {
"type": "string",
"pattern": "^[\\w\\-]{1,128}$"
},
"maxItems": 10,
"maxItems": 25,
"sensitive": 1
},
"passthrough": {
Expand Down
2 changes: 1 addition & 1 deletion config/v3/balance/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
]
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
6 changes: 5 additions & 1 deletion config/v3/buy/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,10 @@
"type": "number",
"minimum": 0
},
"payout_per_point": {
"description": "[Optional] Clients can provide payout_per_point directly, and the barrier will be calculated based on this payout_per_point value.",
"type": "number"
},
"product_type": {
"description": "[Optional] The product type.",
"type": "string",
Expand Down Expand Up @@ -209,7 +213,7 @@
]
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
2 changes: 1 addition & 1 deletion config/v3/buy_contract_for_multiple_accounts/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"sensitive": 1
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
2 changes: 1 addition & 1 deletion config/v3/cancel/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"type": "integer"
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
2 changes: 1 addition & 1 deletion config/v3/cashier/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"pattern": "^\\w{8,128}$"
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
2 changes: 1 addition & 1 deletion config/v3/confirm_email/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"verification_code": {
"description": "Email verification code (received from a `verify_email` call, which must be done first).",
"type": "string",
"pattern": "^\\w{8,128}$",
"pattern": "^\\w{6,128}$",
"sensitive": 1
},
"passthrough": {
Expand Down
2 changes: 1 addition & 1 deletion config/v3/contract_update/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
}
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
2 changes: 1 addition & 1 deletion config/v3/contract_update_history/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"minimum": 1
},
"loginid": {
"description": "[Optional] The login id of the user. If left unspecified, it defaults to the initial authorized token's login id.",
"description": "[Optional] The login id of the user. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
Expand Down
Loading

0 comments on commit 57bf4c5

Please sign in to comment.