Skip to content
Snippets Groups Projects

Add page from Cesium v1, add management of peer

Merged Add page from Cesium v1, add management of peer
feature/distance_pre-computation into master
3 unresolved threads
Merged Dorian Marco requested to merge feature/distance_pre-computation into master
3 unresolved threads

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
src/theme/_ionic.globals.scss
63 63 $light-primary-text: white;
64 64 $light-secondary-text: rgba(white, 0.7);
65 65 $light-disabled-text: rgba(white, 0.5);
66 $text-color: $dark-primary-text;
66 $text-color: rgba(black, 1);
  • Benoit Lavenier
    Benoit Lavenier @blavenie started a thread on the diff
    • src/assets/i18n/fr.json
    259 266 "TAB_WOT": "Toile de confiance",
    260 267 "TAB_NETWORK": "Réseau",
    261 268 "TAB_BLOCKS": "Blocs",
    262 "CURRENCY_SHORT_DESCRIPTION": "{{currency}} est une <b>monnaie libre</b>, démarrée {{firstBlockTime|formatFromNow}}. Elle compte actuellement <b>{{N}} membres</b>, qui produisent et perçoivent un <a ng-click=\"showHelpModal('ud')\">Dividende Universel</a> (DU), chaque {{dt|formatPeriod}}.",
    269 "CURRENCY_SHORT_DESCRIPTION": "{{currency}} est une <b>monnaie libre</b>, démarrée {{firstBlockTime}}. Elle compte actuellement <b>{{N}} membres</b>, qui produisent et perçoivent un <a class='open-modal' (click)='onDividendeClick()' style='cursor: pointer;'>Dividende Universel</a> (DU), chaque {{dt}}.",
    • Benoit Lavenier
      Benoit Lavenier @blavenie ·
      Owner

      IL ne faut pas appeller des fonction trop précise dans ce fichier. Mieux vaut quelque chose comme showHelpModal('ud') et implémenter le traitement de 'ud' dans la fonction.

    • Please register or sign in to reply
  • Benoit Lavenier
    Benoit Lavenier @blavenie started a thread on the diff
    • src/assets/i18n/en-GB.json
    171 172 "HOUR": "After {{value}}h of inactivity",
    172 173 "ALWAYS": "At the end of the session"
    173 174 },
    175 "REDEEM_UD_PERIOD_OPTION": {
  • Benoit Lavenier approved this merge request

    approved this merge request

  • Benoit Lavenier merged

    merged

  • Benoit Lavenier mentioned in commit 257a97ba

    mentioned in commit 257a97ba

  • Benoit Lavenier changed milestone to %2.0.0-alpha45

    changed milestone to %2.0.0-alpha45

  • Dorian Marco changed title from enh(environnement): add new environment variable to Add page from Cesium v1, add management of peer

    changed title from enh(environnement): add new environment variable to Add page from Cesium v1, add management of peer

    • Please register or sign in to reply