Code

chore: rebase development#131

Code

Merged

tomaszantas merged 175 commits intolaunchpad_such_wowAltalogy/tari:launchpad_such_wowfrom launchpad/rebase_developmentAltalogy/tari:launchpad/rebase_developmentCopy head branch name to clipboardMay 4, 2022

+2,575-1,611

Commits

Commits on Apr 26, 2022

• test: fix coverage action (tari-project#4036)

  Show description for c9a9bfe
  Cifko

  authored
  c9a9bfe

  Copy full SHA for c9a9bfe

Commits on Apr 28, 2022

• ci: move npm audit to development only (tari-project#4055)

  Show description for d3d4acd
  stringhandler

  authored
  d3d4acd

  Copy full SHA for d3d4acd

• chore(deps): bump async from 2.6.3 to 2.6.4 in /applications/launchpad/gui-vue (tari-project#4053)

  Show description for a66502b
  dependabot[bot]

  authored
  a66502b

  Copy full SHA for a66502b

• feat(tari_explorer): add total hashrate chart (tari-project#4054)

  Show description for 9e0ec36
  mrnaveira

  authored
  9e0ec36

  Copy full SHA for 9e0ec36

• chore(deps): bump ejs from 3.1.6 to 3.1.7 in /applications/tari_web_extension (tari-project#4056)

  Show description for 93bfb88
  dependabot[bot]

  authored
  93bfb88

  Copy full SHA for 93bfb88

• chore: remove unused else (tari-project#4051)

  Show description for 6a975ae
  SWvheerden

  authored
  6a975ae

  Copy full SHA for 6a975ae

• refactor(base-node): use existing peer feature methods to check if is a base or client node (tari-project#4048)

  Show description for 24f8aac
  mrnaveira

  authored
  24f8aac

  Copy full SHA for 24f8aac

• fix: makes header consensus encoding infallible (tari-project#4045)

  Show description for 5ebf129
  sdbondi

  authored
  5ebf129

  Copy full SHA for 5ebf129

• fix(wallet): do not prompt for password if given in config (tari-project#4040)

  Show description for fc1aa65
  sdbondi

  authored
  fc1aa65

  Copy full SHA for fc1aa65

• test: cucumber saf test (tari-project#3135)

  Show description for 0ab487f
  Cifko

  authored
  0ab487f

  Copy full SHA for 0ab487f

• chore: obscure grpc error response (tari-project#3995)

  Show description for 1fe5811
  Cifko

  authored
  1fe5811

  Copy full SHA for 1fe5811

Commits on Apr 29, 2022

• test(covenant): improve test coverage (tari-project#4052)

  Show description for d01d94f
  sdbondi

  authored
  d01d94f

  Copy full SHA for d01d94f

• fix: weird behaviour of dates in base node banned peers (tari-project#4037)

  Show description for 7097185
  mrnaveira

  authored
  7097185

  Copy full SHA for 7097185

• chore(deps): bump async from 2.6.3 to 2.6.4 in /applications/tari_web_extension (tari-project#4059)

  Show description for aca072e
  dependabot[bot]

  authored
  aca072e

  Copy full SHA for aca072e

• chore(deps): bump async from 3.2.1 to 3.2.3 in /integration_tests (tari-project#4035)

  Show description for 8b7877e
  dependabot[bot]

  authored
  8b7877e

  Copy full SHA for 8b7877e

• docs: add key manager docs (tari-project#4050)

  Show description for 7032667
  SWvheerden

  authored
  7032667

  Copy full SHA for 7032667

• fix: only count base nodes in peers count in base node status (tari-project#4039)

  Show description for 190d75a
  mrnaveira

  authored
  190d75a

  Copy full SHA for 190d75a

• docs(comms): adds documentation for comms public interface (tari-project#4033)

  Show description for 50a4d19
  sdbondi

  authored
  50a4d19

  Copy full SHA for 50a4d19

• refactor(dht): use CipherKey new type for diffie-hellman key (tari-project#4038)

  Show description for dacb3cd
  sdbondi

  authored
  dacb3cd

  Copy full SHA for dacb3cd

• refactor(rpc-macros): split into smaller functions (clippy) (tari-project#4063)

  Show description for c37d1ba
  sdbondi

  authored
  c37d1ba

  Copy full SHA for c37d1ba

Commits on Apr 30, 2022

• fix: update daily test configuration (tari-project#4049)

  Show description for b15d682
  sdbondi

  authored
  b15d682

  Copy full SHA for b15d682

Commits on May 3, 2022

• refactor(comms): reduce length of long functions (clippy) (tari-project#4065)

  Show description for 2ad5c51
  sdbondi

  authored
  2ad5c51

  Copy full SHA for 2ad5c51

• test(cucumber): use separate FFI target dir (tari-project#4067)

  Show description for ed8a769
  sdbondi

  authored
  ed8a769

  Copy full SHA for ed8a769

• fix(key-manager): remove floating point math from mnemonic code (tari-project#4064)

  Show description for c2d60b3
  sdbondi

  authored
  c2d60b3

  Copy full SHA for c2d60b3

• feat(p2p): adds tor.forward_address setting (tari-project#4070)

  Show description for 8c78717
  sdbondi

  authored
  8c78717

  Copy full SHA for 8c78717

• ci: fix coverage (tari-project#4071)

  Show description for a4e3be8
  stringhandler

  authored
  a4e3be8

  Copy full SHA for a4e3be8

• chore: remove deprecated ExtendBytes, update EpochTime (tari-project#3914)

  Show description for 6d21bc2
  sdbondi

  authored
  6d21bc2

  Copy full SHA for 6d21bc2

• chore(deps): bump ejs from 3.1.6 to 3.1.7 in /applications/tari_collectibles/web-app (tari-project#4057)

  Show description for d2ceedc
  dependabot[bot]

  authored
  d2ceedc

  Copy full SHA for d2ceedc

• feat(collectibles): add list assets command (tari-project#3908)

  Show description for 5b726a6
  stringhandler

  authored
  5b726a6

  Copy full SHA for 5b726a6

• fix: support safe non-interactive mode (tari-project#4072)

  Show description for b34f79d
  CjS77

  authored
  b34f79d

  Copy full SHA for b34f79d

• feat: allow network to be set by TARI_NETWORK env var (tari-project#4073)

  Show description for c27be5c
  sdbondi

  authored
  c27be5c

  Copy full SHA for c27be5c

Commits on May 4, 2022

• chore: update launchpad backend (tari-project#4017)

  Show description for 65f1147
  CjS77

  authored
  65f1147

  Copy full SHA for 65f1147

• test: unignore working tests (tari-project#4020)

  Show description for 9bb3968
  sdbondi

  authored
  9bb3968

  Copy full SHA for 9bb3968

• Set up new Launchpad v2 with Tauri and CRA

  

  tomaszantas

  authored and

  tarnas14

  committed
  06b95b1

  Copy full SHA for 06b95b1

• port (copy) backend from previous launchpad to launchpad_v2

  tarnas14

  committed
  ccc7e49

  Copy full SHA for ccc7e49

• call tari backend for list of available docker images

  tarnas14

  committed
  d9eacd9

  Copy full SHA for d9eacd9

• remove legacy main.rs from src-tauri

  tarnas14

  committed
  6cb54c0

  Copy full SHA for 6cb54c0

• added .gitkeep to cra build directory to avoid CI panic

  tarnas14

  committed
  0465dc7

  Copy full SHA for 0465dc7

• changed javascript build to build launchpad_v2

  tarnas14

  committed
  3003c72

  Copy full SHA for 3003c72

• Set up React project tree

  

  tomaszantas

  authored and

  tarnas14

  committed
  560de6b

  Copy full SHA for 560de6b

• Add ESLint

  

  tomaszantas

  authored and

  tarnas14

  committed
  7ff9533

  Copy full SHA for 7ff9533

• Add no-console eslint warning

  

  tomaszantas

  authored and

  tarnas14

  committed
  23dfe66

  Copy full SHA for 23dfe66

• Remove package-json.lock

  

  tomaszantas

  authored and

  tarnas14

  committed
  5f36889

  Copy full SHA for 5f36889

• Switch tabs to spaces

  

  tomaszantas

  authored and

  tarnas14

  committed
  9e91c9c

  Copy full SHA for 9e91c9c

• Add SVG icon components for extracted Figma icon set (#53)

  Show description for ea1bdad
  

  corquaid

  authored and

  tarnas14

  committed
  ea1bdad

  Copy full SHA for ea1bdad

• Add initial content to the Readme.md (#52)

  Show description for 0867486
  

  tomaszantas

  and

  tarnas14

  committed
  0867486

  Copy full SHA for 0867486

• Adding styled components, replacing yarn.lock with package-lock

  

  corquaid

  authored and

  tarnas14

  committed
  1079b85

  Copy full SHA for 1079b85

• Updating README to use npm

  

  corquaid

  authored and

  tarnas14

  committed
  6952c97

  Copy full SHA for 6952c97

• Add colors & gradients, linting icon component files

  

  corquaid

  authored and

  tarnas14

  committed
  dbb0ac8

  Copy full SHA for dbb0ac8

• Add theme files, refactoring

  

  corquaid

  authored and

  tarnas14

  committed
  6efd272

  Copy full SHA for 6efd272

• Add color variables to gradients where possible

  

  corquaid

  authored and

  tarnas14

  committed
  269351c

  Copy full SHA for 269351c

• feat: launchpad CI (#55)

  Show description for 6f4d782
  

  tomaszantas

  and

  tarnas14

  committed
  6f4d782

  Copy full SHA for 6f4d782

• quick and dirty one-file dropdown

  tarnas14

  committed
  74dcf3f

  Copy full SHA for 74dcf3f

• added label to select

  tarnas14

  committed
  5cc79a2

  Copy full SHA for 5cc79a2

• extracted value and options and made it configurable in the select

  tarnas14

  committed
  d61566d

  Copy full SHA for d61566d

• extract Select to a reusable dumb component

  tarnas14

  committed
  969d123

  Copy full SHA for 969d123

• refactor WithTheme HoC to correctly set displayName

  tarnas14

  committed
  bbe6e8a

  Copy full SHA for bbe6e8a

• extract transparent background to theme

  tarnas14

  committed
  11bace2

  Copy full SHA for 11bace2

• fix types for styledComponents in Select

  tarnas14

  committed
  3c8a17b

  Copy full SHA for 3c8a17b

• add basic tests to Select component

  tarnas14

  committed
  065d5ed

  Copy full SHA for 065d5ed

• typescript children: ReactNode typing

  tarnas14

  committed
  5aefcf0

  Copy full SHA for 5aefcf0

• change darkBackground prop name to inverted

  tarnas14

  committed
  c8cc12f

  Copy full SHA for c8cc12f

• use default export in Select component

  tarnas14

  committed
  b58da6f

  Copy full SHA for b58da6f

• move type declarations to separate types.ts files

  tarnas14

  committed
  e5161dd

  Copy full SHA for e5161dd

• fix test to use correct import

  tarnas14

  committed
  2fbad7f

  Copy full SHA for 2fbad7f

• feat: add typography and fonts

  

  corquaid

  authored and

  tarnas14

  committed
  5323b25

  Copy full SHA for 5323b25

• add jsdoc to Select component

  tarnas14

  committed
  5f21b1c

  Copy full SHA for 5f21b1c

• improve jsdoc

  tarnas14

  committed
  f2abe74

  Copy full SHA for f2abe74

• feat: main layout (#64)

  Show description for cb4f142
  

  tomaszantas

  authored and

  tarnas14

  committed
  cb4f142

  Copy full SHA for cb4f142

• improved styling with the inverted values

  tarnas14

  committed
  dc19bfb

  Copy full SHA for dc19bfb

• fix Select tests - pass correct theme

  tarnas14

  committed
  3353e6c

  Copy full SHA for 3353e6c

• remove last darkBackground reference

  tarnas14

  committed
  53e92b0

  Copy full SHA for 53e92b0

• avoid using optional chaining to not angry CI gods

  tarnas14

  committed
  2fc2b13

  Copy full SHA for 2fc2b13

• hooked up prettier to eslint and fixed all

  tarnas14

  committed
  174130b

  Copy full SHA for 174130b

• rename MyListboxProps to SelectProps

  tarnas14

  committed
  671b9d3

  Copy full SHA for 671b9d3

• feat(primitive): add text component

  Show description for 48115c5
  

  corquaid

  authored and

  tarnas14

  committed
  48115c5

  Copy full SHA for 48115c5

• refactor: move globalStyles, set default Text type

  

  corquaid

  authored and

  tarnas14

  committed
  084b888

  Copy full SHA for 084b888

• remove unnecessary fragment, formatting

  

  corquaid

  authored and

  tarnas14

  committed
  96925da

  Copy full SHA for 96925da

• chore: eslint rule update and readme addition (#79)

  Show description for 22fa81d
  

  tarnas14

  and

  tomaszantas

  committed
  22fa81d

  Copy full SHA for 22fa81d

• Fixed CI tests, refactor d.ts files

  

  corquaid

  authored and

  tarnas14

  committed
  1c27201

  Copy full SHA for 1c27201

• Removed GlobalStyle, moved fonts to App.css

  

  corquaid

  authored and

  tarnas14

  committed
  5480b26

  Copy full SHA for 5480b26

• lint fix with prettier after merge

  tarnas14

  committed
  c376e3e

  Copy full SHA for c376e3e

• dirty one file implementation of a box

  tarnas14

  committed
  c551f0b

  Copy full SHA for c551f0b

• move Box component to separate files

  tarnas14

  committed
  0208ee2

  Copy full SHA for 0208ee2

• add all styles declaration to DefaultTheme in custom.d.ts

  tarnas14

  committed
  f87e023

  Copy full SHA for f87e023

• add jsdoc to Box component

  tarnas14

  committed
  165c1c7

  Copy full SHA for 165c1c7

• add basic test for Box component

  tarnas14

  committed
  da1b953

  Copy full SHA for da1b953

• update Select tests to conform to test standard

  tarnas14

  committed
  df8f4a7

  Copy full SHA for df8f4a7

• fix Box test

  tarnas14

  committed
  9c9773b

  Copy full SHA for 9c9773b

• Launchpad on Github Actions (#88)

  

  tomaszantas

  authored and

  tarnas14

  committed
  b435f03

  Copy full SHA for b435f03

• Add tag component files, update theme

  

  corquaid

  authored and

  tarnas14

  committed
  da44613

  Copy full SHA for da44613

• Add unit tests

  

  corquaid

  authored and

  tarnas14

  committed
  dca3a4a

  Copy full SHA for dca3a4a

• More unit tests, changes from PR comments

  

  corquaid

  authored and

  tarnas14

  committed
  7235021

  Copy full SHA for 7235021

• Adjust the audit job (#91)

  

  tomaszantas

  authored and

  tarnas14

  committed
  f6786b6

  Copy full SHA for f6786b6

• feat: footer & keyboardkeys (#86)

  Show description for db18629
  

  tomaszantas

  authored and

  tarnas14

  committed
  db18629

  Copy full SHA for db18629

• Improve Switch component (#89)

  

  tomaszantas

  authored and

  tarnas14

  committed
  6153fa9

  Copy full SHA for 6153fa9

• chore: tests for icons (#97)

  Show description for dea7c75
  

  tomaszantas

  authored and

  tarnas14

  committed
  dea7c75

  Copy full SHA for dea7c75

• layout for inactive state of base node

  tarnas14

  committed
  15eadf1

  Copy full SHA for 15eadf1

• prepared layout for dark (running) base node

  tarnas14

  committed
  eb7aa80

  Copy full SHA for eb7aa80

• extract view component from base node container

  tarnas14

  committed
  4e53b94

  Copy full SHA for 4e53b94

• connect base node container to store; improve styling

  tarnas14

  committed
  7981587

  Copy full SHA for 7981587

• cleanup and document Loading component

  tarnas14

  committed
  f96da71

  Copy full SHA for f96da71

• fix unused payload in base node slice

  tarnas14

  committed
  0845b65

  Copy full SHA for 0845b65

• add placeholder for "running" tag on basenode

  tarnas14

  committed
  807abcf

  Copy full SHA for 807abcf

• add Running tag to a running base node container

  tarnas14

  committed
  42b980f

  Copy full SHA for 42b980f

• add tests for Loading indicator

  tarnas14

  committed
  541aff0

  Copy full SHA for 541aff0

• move base node store slice to /store/baseNode

  tarnas14

  committed
  0e813cc

  Copy full SHA for 0e813cc

• reverse Network type import

  tarnas14

  committed
  5525d2a

  Copy full SHA for 5525d2a

• feat: tabs and ts issue (#94)

  Show description for aa60163
  

  tomaszantas

  authored and

  tarnas14

  committed
  aa60163

  Copy full SHA for aa60163

• Remove unused props and imports (#99)

  

  tomaszantas

  authored and

  tarnas14

  committed
  c490a3a

  Copy full SHA for c490a3a

• Fix box sizing of the main container (#102)

  

  tomaszantas

  authored and

  tarnas14

  committed
  42cd949

  Copy full SHA for 42cd949

• Add Text test (#106)

  

  tomaszantas

  authored and

  tarnas14

  committed
  d1718e7

  Copy full SHA for d1718e7

• Change the size of large tags to 26px (#104)

  

  tomaszantas

  authored and

  tarnas14

  committed
  2e0ca32

  Copy full SHA for 2e0ca32

• Polishing Select component: text color and spacing (#105)

  

  tomaszantas

  authored and

  tarnas14

  committed
  3be621c

  Copy full SHA for 3be621c

• prepared ui for password input

  tarnas14

  committed
  d4e744b

  Copy full SHA for d4e744b

• include tari signed in wallet password page

  tarnas14

  committed
  0aaab69

  Copy full SHA for 0aaab69

• prepared main wallet layout (without inputs)

  tarnas14

  committed
  a0fb844

  Copy full SHA for a0fb844

• add loading prop to button

  tarnas14

  committed
  4a3972c

  Copy full SHA for 4a3972c

• connect wallet to store

  tarnas14

  committed
  bf10a96

  Copy full SHA for bf10a96

• fix tabs component to memoize tabs content

  tarnas14

  committed
  62a834c

  Copy full SHA for 62a834c

• move lines from wallet components to locales

  tarnas14

  committed
  5a96d9c

  Copy full SHA for 5a96d9c

• remove Send funds button

  tarnas14

  committed
  f1a7998

  Copy full SHA for f1a7998

• add password input and disabling submit button below certain password length threshold

  tarnas14

  committed
  b35efc4

  Copy full SHA for b35efc4

• border-box sizing for box

  tarnas14

  committed
  466f952

  Copy full SHA for 466f952

• change loading indicator to be relatively positioned in button

  tarnas14

  committed
  a6d75fa

  Copy full SHA for a6d75fa

• cleaned up Button disabled styling; removed unnecessary variants and types

  tarnas14

  committed
  43ec284

  Copy full SHA for 43ec284

• allowing loading and disabled to be controlled separately

  tarnas14

  committed
  2abd7c7

  Copy full SHA for 2abd7c7

• rename Chart icon component

  tarnas14

  committed
  d48bd48

  Copy full SHA for d48bd48

• add WalletContainer basic tests

  tarnas14

  committed
  393a3ca

  Copy full SHA for 393a3ca

• make sure buttons always have the same height/width

  tarnas14

  committed
  f4b1419

  Copy full SHA for f4b1419

• Add password strength + smiley icons

  

  corquaid

  authored and

  tarnas14

  committed
  df7ff08

  Copy full SHA for df7ff08

• Add TextInput component files, fix password strength icons, update themes

  

  corquaid

  authored and

  tarnas14

  committed
  35edd29

  Copy full SHA for 35edd29

• Add unit tests

  

  corquaid

  authored and

  tarnas14

  committed
  9798e10

  Copy full SHA for 9798e10

• Add JSDoc

  

  corquaid

  authored and

  tarnas14

  committed
  80d81dc

  Copy full SHA for 80d81dc

• Add unit tests for new icons, delete icon images from assets

  

  corquaid

  authored and

  tarnas14

  committed
  a52947c

  Copy full SHA for a52947c

• Modal component

  tarnas14

  committed
  4777fa1

  Copy full SHA for 4777fa1

• extracted modal styling to separate files

  tarnas14

  committed
  bafdac0

  Copy full SHA for bafdac0

• add modal tests

  tarnas14

  committed
  00f157b

  Copy full SHA for 00f157b

• add tari wallet box with emoji toggle

  tarnas14

  committed
  9297719

  Copy full SHA for 9297719

• extract wallet components and styles to separate files

  tarnas14

  committed
  db86190

  Copy full SHA for db86190

• justify base node to center

  tarnas14

  committed
  d74647b

  Copy full SHA for d74647b

• introduce CenteredLayout component to layout basenode and wallet containers centered

  tarnas14

  committed
  bc13688

  Copy full SHA for bc13688

• Add copy/paste/select keyboard functionality

  

  corquaid

  authored and

  tarnas14

  committed
  d48175a

  Copy full SHA for d48175a

• dont clear password field

  tarnas14

  committed
  ef420b1

  Copy full SHA for ef420b1

• fix tari wallet id box

  tarnas14

  committed
  ea4632d

  Copy full SHA for ea4632d

• extract reusable Input component and built TextInput on top of it

  tarnas14

  committed
  bc6ac98

  Copy full SHA for bc6ac98

• add PasswordInput and use it in wallet password box

  tarnas14

  committed
  5dc11ff

  Copy full SHA for 5dc11ff

• disabling input icon when whole component is disabled

  tarnas14

  committed
  1ba43df

  Copy full SHA for 1ba43df

• set up static layout of settings modal

  tarnas14

  committed
  785cd9f

  Copy full SHA for 785cd9f

• make the cancel button on settings "secondary"

  tarnas14

  committed
  72ba638

  Copy full SHA for 72ba638

• fix buttons in icon for settings button in title bar

  tarnas14

  committed
  e801ee9

  Copy full SHA for e801ee9

• created static layout for wallet settings

  tarnas14

  committed
  8c6ade5

  Copy full SHA for 8c6ade5

• extracted components to separate files, connected SettingsContainer to store

  tarnas14

  committed
  6a6c246

  Copy full SHA for 6a6c246

• allow opening settings on specific page

  tarnas14

  committed
  535586f

  Copy full SHA for 535586f

• connecting wallet settings page component to store

  tarnas14

  committed
  933e3e1

  Copy full SHA for 933e3e1

• showing running indicator on wallet box conditionally

  tarnas14

  committed
  058a268

  Copy full SHA for 058a268

• pending indicator on button in wallet settings instead of running tag

  tarnas14

  committed
  a030ee7

  Copy full SHA for a030ee7

• extracted styled components from CopyBox

  tarnas14

  committed
  dc04a27

  Copy full SHA for dc04a27

• cleaned up WalletSettings component with extracted styles and locales

  tarnas14

  committed
  4e535ea

  Copy full SHA for 4e535ea

• dont block wallet settings if wallet is locked

  tarnas14

  committed
  a106f47

  Copy full SHA for a106f47

• Fixing Tag component background styling, App.tsx typo

  

  corquaid

  authored and

  tarnas14

  committed
  e550ee1

  Copy full SHA for e550ee1

• Fixing svg icon colour attributes

  

  corquaid

  authored and

  tarnas14

  committed
  4112143

  Copy full SHA for 4112143

• feat: mining dashboard (#108)

  Show description for bb21941
  

  tomaszantas

  authored and

  tarnas14

  committed
  bb21941

  Copy full SHA for bb21941

• add JSDoc for copybox

  tarnas14

  committed
  a99ec4a

  Copy full SHA for a99ec4a

• remove Link component, use Button with href on wallet settings

  tarnas14

  committed
  cb1ec54

  Copy full SHA for cb1ec54

• moved react gui over to launchpad

  tarnas14

  committed
  b1335b3

  Copy full SHA for b1335b3

• update github actions to point to gui-react directory

  tarnas14

  committed
  e00fd75

  Copy full SHA for e00fd75

• remove launchpad_v2 workspace from root Cargo.toml

  tarnas14

  committed
  c64a27b

  Copy full SHA for c64a27b

• remove reference to tauri-apps/cli from gui-react (not needed)

  tarnas14

  committed
  db37a59

  Copy full SHA for db37a59

• Remove useBootstrapper

  

  tomaszantas

  authored and

  tarnas14

  committed
  aacc079

  Copy full SHA for aacc079

• added dev-vue package.json script to launch vue version of the application in development mode

  tarnas14

  committed
  dff8b17

  Copy full SHA for dff8b17

• remove useBoostrapper flag from tauri.vue.conf.json after bumping to rc9

  tarnas14

  committed
  77949ee

  Copy full SHA for 77949ee

• remove tauri scripts from gui-react

  tarnas14

  committed
  aabe7fa

  Copy full SHA for aabe7fa

• Fix typography letter-spacing

  

  corquaid

  authored and

  tarnas14

  committed
  cceed77

  Copy full SHA for cceed77

• Merge branch 'launchpad_such_wow' into launchpad/rebase_development

  tarnas14

  committed
  c2d1925

  Copy full SHA for c2d1925