index
:
dexon-0x-contracts
dev
master
stable
DEXON fork of 0x protocol contracts forked from 0x-monorepo (https://github.com/dexon-foundation/0x-contracts)
LAN-TW
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
packages
/
sol-compiler
Commit message (
Expand
)
Author
Age
Files
Lines
*
Publish
Jacob Evans
2018-11-28
1
-3
/
+3
*
Updated CHANGELOGS
Jacob Evans
2018-11-28
2
-0
/
+13
*
Publish
Fabio Berger
2018-11-22
1
-8
/
+8
*
Updated CHANGELOGS
Fabio Berger
2018-11-22
2
-0
/
+13
*
Publish
Leonid Logvinov
2018-11-14
1
-6
/
+6
*
Updated CHANGELOGS
Leonid Logvinov
2018-11-14
2
-0
/
+13
*
Publish
Leonid Logvinov
2018-11-14
1
-3
/
+3
*
Updated CHANGELOGS
Leonid Logvinov
2018-11-14
2
-0
/
+13
*
Publish
Leonid Logvinov
2018-11-12
1
-5
/
+5
*
Updated CHANGELOGS
Leonid Logvinov
2018-11-12
2
-0
/
+13
*
Publish
Jacob Evans
2018-11-09
1
-11
/
+11
*
Updated CHANGELOGS
Jacob Evans
2018-11-09
2
-0
/
+13
*
chore: Add --format stylish to tslint
Alex Browne
2018-10-24
1
-1
/
+1
*
Publish
Leonid Logvinov
2018-10-18
1
-11
/
+11
*
Updated CHANGELOGS
Leonid Logvinov
2018-10-18
2
-1
/
+14
*
Fix ethereum-types versions
Leonid Logvinov
2018-10-18
1
-1
/
+1
*
chore: change README.md from 0xproject to 0x
Jacob Evans
2018-10-18
1
-8
/
+8
*
chore: change tslint.json from 0xproject to 0x
Jacob Evans
2018-10-18
1
-1
/
+1
*
chore: change package org from 0xproject to 0x
Jacob Evans
2018-10-18
7
-19
/
+19
*
chore: tslint fix
Fabio Berger
2018-10-18
1
-0
/
+1
*
chore: Fix remaining necessary casts
Fabio Berger
2018-10-18
1
-2
/
+3
*
chore: Update TypeDoc to 0.13.0 (supports TS v3.1)
Fabio Berger
2018-10-17
1
-1
/
+1
*
Publish
Brandon Millman
2018-10-05
1
-11
/
+11
*
Updated CHANGELOGS
Brandon Millman
2018-10-05
2
-6
/
+6
*
fix: comment need for sourceCodes pruning
F. Eugene Aumson
2018-10-03
1
-1
/
+5
*
fix: use original source ID's from compiler output
F. Eugene Aumson
2018-10-03
1
-13
/
+24
*
Fix some small bugs in compiler.ts
Alex Browne
2018-10-03
1
-3
/
+18
*
fix: persist artifacts with only relevant sources
F. Eugene Aumson
2018-10-03
1
-5
/
+52
*
Introduce a build:ci command that doesn't build webpack bundles
Leonid Logvinov
2018-10-02
1
-0
/
+1
*
Updated CHANGELOGS
Leonid Logvinov
2018-10-02
2
-0
/
+13
*
Publish
Fabio Berger
2018-09-29
1
-10
/
+10
*
Updated CHANGELOGS
Fabio Berger
2018-09-29
2
-0
/
+13
*
Un-nest the interface to fix the doc rendering
Fabio Berger
2018-09-29
1
-0
/
+1
*
Merge remote-tracking branch 'upstream/development' into sol-doc
F. Eugene Aumson
2018-09-26
3
-10
/
+23
|
\
|
*
Publish
Fabio Berger
2018-09-26
1
-10
/
+10
|
*
Updated CHANGELOGS
Fabio Berger
2018-09-26
2
-0
/
+13
*
|
Merge remote-tracking branch 'upstream/development' into sol-doc
F. Eugene Aumson
2018-09-26
3
-8
/
+21
|
\
|
|
*
Publish
Leonid Logvinov
2018-09-25
1
-8
/
+8
|
*
Updated CHANGELOGS
Leonid Logvinov
2018-09-25
2
-0
/
+13
*
|
Merge remote-tracking branch 'upstream/development' into sol-doc
F. Eugene Aumson
2018-09-25
3
-10
/
+23
|
\
|
|
*
Publish
Leonid Logvinov
2018-09-21
1
-10
/
+10
|
*
Updated CHANGELOGS
Leonid Logvinov
2018-09-21
2
-0
/
+13
*
|
feat: add sol-doc command-line interface
F. Eugene Aumson
2018-09-22
2
-8
/
+10
*
|
Merge branch 'development' into sol-doc
F. Eugene Aumson
2018-09-12
3
-11
/
+24
|
\
|
|
*
Publish
Fabio Berger
2018-09-05
1
-11
/
+11
|
*
Updated CHANGELOGS
Fabio Berger
2018-09-05
2
-0
/
+13
*
|
Merge remote-tracking branch 'upstream/development' into sol-doc
F. Eugene Aumson
2018-08-31
3
-3
/
+11
|
\
|
|
*
feat: Add support for TypeScript project references (#991)
Alex Browne
2018-08-30
3
-3
/
+11
*
|
add named references for returned objects
F. Eugene Aumson
2018-08-30
1
-3
/
+6
*
|
re-word comment: 'construction' -> 'instantiation'
F. Eugene Aumson
2018-08-30
1
-1
/
+1
*
|
rename method _addHexPrefixes
F. Eugene Aumson
2018-08-30
1
-2
/
+2
*
|
add devdoc support to solc typings, and use it
F. Eugene Aumson
2018-08-29
2
-8
/
+24
*
|
add package sol-doc
F. Eugene Aumson
2018-08-29
1
-0
/
+1
*
|
add interface to return compiler output...
F. Eugene Aumson
2018-08-29
1
-11
/
+33
*
|
rename var `compiledData` to `compiledContract`
F. Eugene Aumson
2018-08-29
1
-13
/
+13
*
|
extract method _getContractNamesToCompile()
F. Eugene Aumson
2018-08-29
1
-4
/
+5
*
|
split method
F. Eugene Aumson
2018-08-29
1
-22
/
+29
|
/
*
Publish
Fabio Berger
2018-08-27
1
-8
/
+8
*
Updated CHANGELOGS
Fabio Berger
2018-08-27
2
-0
/
+13
*
Publish
Fabio Berger
2018-08-25
1
-11
/
+11
*
Updated CHANGELOGS
Fabio Berger
2018-08-25
2
-4
/
+11
*
Stop nesting interfaces and add necessary type exports
Fabio Berger
2018-08-24
1
-1
/
+7
*
Upgrade Typedoc to 0.12.0, which works with TS 3.x
Fabio Berger
2018-08-23
1
-1
/
+1
*
Refactor publish script so that root package.json configs.packagesWithDocs is...
Fabio Berger
2018-08-23
1
-2
/
+1
*
Fix many linter errors that showed up upon upgrading tsutil
Fabio Berger
2018-08-23
1
-1
/
+1
*
Update all CHANGELOGs
Fabio Berger
2018-08-22
1
-0
/
+8
*
Merge development branch
Fabio Berger
2018-08-22
8
-92
/
+276
|
\
|
*
Merge branch 'development' into sol-compile-lot
F. Eugene Aumson
2018-08-17
1
-2
/
+2
|
|
\
|
*
|
move doesFileExist to fsWrapper
F. Eugene Aumson
2018-08-17
2
-13
/
+13
|
*
|
change some *Sync to *Async
F. Eugene Aumson
2018-08-17
2
-4
/
+19
|
*
|
clarify variable names for artifact mod times
F. Eugene Aumson
2018-08-17
1
-6
/
+6
|
*
|
flatten out interface to verifyAndPersist* method
F. Eugene Aumson
2018-08-17
1
-6
/
+6
|
*
|
clarify iteration range
F. Eugene Aumson
2018-08-17
1
-1
/
+2
|
*
|
scrap comments in favor of self-documentation
F. Eugene Aumson
2018-08-17
1
-3
/
+2
|
*
|
declare contractData before adding to map
F. Eugene Aumson
2018-08-17
1
-2
/
+3
|
*
|
change `return Promise<void>` to `await...`
F. Eugene Aumson
2018-08-17
1
-1
/
+1
|
*
|
consolidate binPaths... ref's into fullSolcVersion
F. Eugene Aumson
2018-08-17
1
-2
/
+2
|
*
|
extract method _shouldCompile()
F. Eugene Aumson
2018-08-16
1
-13
/
+12
|
*
|
clarify recompilation tests
F. Eugene Aumson
2018-08-16
1
-6
/
+8
|
*
|
change .rejectedWith(error) to .rejected()
F. Eugene Aumson
2018-08-16
1
-1
/
+1
|
*
|
follow chai_setup pattern
F. Eugene Aumson
2018-08-16
3
-2
/
+16
|
*
|
renamed variable `compiled` to `compilerOutput`
F. Eugene Aumson
2018-08-16
1
-6
/
+6
|
*
|
use `for...of _.keys` instead of `for...in`
F. Eugene Aumson
2018-08-16
1
-5
/
+1
|
*
|
raise error for unknown compiler version
F. Eugene Aumson
2018-08-16
1
-0
/
+3
|
*
|
comments
F. Eugene Aumson
2018-08-16
1
-0
/
+3
|
*
|
remedy missing *IfExists identifier suffix
F. Eugene Aumson
2018-08-16
1
-6
/
+3
|
*
|
extract interfaces for re-used complex data types
F. Eugene Aumson
2018-08-16
1
-23
/
+28
|
*
|
move getSolcAsync to static private method
F. Eugene Aumson
2018-08-16
1
-23
/
+23
|
*
|
rename variable inputsByVersion to versionToInputs
F. Eugene Aumson
2018-08-16
1
-8
/
+8
|
*
|
move getSolcAsync to static private method
F. Eugene Aumson
2018-08-16
1
-25
/
+24
|
*
|
Update changelog
F. Eugene Aumson
2018-08-15
1
-0
/
+10
|
*
|
test compiler
F. Eugene Aumson
2018-08-15
4
-12
/
+82
|
*
|
simplify method interface
F. Eugene Aumson
2018-08-15
1
-8
/
+12
|
*
|
simplify method parameter
F. Eugene Aumson
2018-08-15
1
-6
/
+4
|
*
|
corrected whitespace (no functional changes)
F. Eugene Aumson
2018-08-15
1
-39
/
+41
|
*
|
compile contracts in batches
F. Eugene Aumson
2018-08-15
1
-31
/
+70
|
*
|
extract method _verifyAndPersistCompilationAsync()
F. Eugene Aumson
2018-08-15
1
-1
/
+18
|
*
|
extract method _compile()
F. Eugene Aumson
2018-08-15
1
-24
/
+27
|
*
|
extract function getSolcAsync()
F. Eugene Aumson
2018-08-15
1
-18
/
+25
*
|
|
Fix index.ts given fix in doc generation
Fabio Berger
2018-08-22
1
-1
/
+1
*
|
|
Move types from sol-compiler to types so they can be used in other places wit...
Fabio Berger
2018-08-22
5
-79
/
+4
*
|
|
Add generated_docs dir to clean command
Fabio Berger
2018-08-22
1
-1
/
+1
*
|
|
Fix sol-compiler index.ts
Fabio Berger
2018-08-22
1
-9
/
+1
*
|
|
Merge development
Fabio Berger
2018-08-17
1
-2
/
+2
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
Bump copyfiles from 1.2.0 to 2.0.0
dependabot[bot]
2018-08-15
1
-1
/
+1
|
*
|
feat: Upgrade TypeScript to 3.0.1
Alex Browne
2018-08-15
1
-1
/
+1
|
|
/
*
|
Flesh out 0x.js index.ts and added some exports to other index.ts in the process
Fabio Berger
2018-08-15
1
-0
/
+2
*
|
Merge development
Fabio Berger
2018-08-15
4
-16
/
+31
|
\
|
|
*
Publish
Alex Browne
2018-08-14
1
-12
/
+12
|
*
Updated CHANGELOGS
Alex Browne
2018-08-14
2
-2
/
+15
|
*
fix(sol-compiler, sol-resolver): Bug where sol-resolver tried to read a direc...
Alex Browne
2018-08-14
2
-0
/
+2
|
*
fix: Update dependencies
Alex Browne
2018-08-10
1
-2
/
+2
|
*
Update TypeScript to version 2.9.2
Alex Browne
2018-08-09
1
-1
/
+1
*
|
Add missing compiler comments
Fabio Berger
2018-08-04
1
-0
/
+1
*
|
Add comments for types and unnest type declarations
Fabio Berger
2018-08-03
1
-8
/
+36
*
|
Add missing type exports
Fabio Berger
2018-08-03
1
-1
/
+8
*
|
Add missing exports discovered by generating compact typedoc JSON
Fabio Berger
2018-07-30
1
-2
/
+1
*
|
Remove all in-package monorepo-scripts by adding doc gen/upload and aggregate...
Fabio Berger
2018-07-30
3
-31
/
+4
|
/
*
Publish
Fabio Berger
2018-07-26
1
-8
/
+8
*
Updated CHANGELOGS
Fabio Berger
2018-07-26
2
-0
/
+13
*
Point to actual current version
Fabio Berger
2018-07-26
1
-1
/
+1
*
Publish
Fabio Berger
2018-07-26
1
-12
/
+12
*
Updated CHANGELOGS
Fabio Berger
2018-07-26
2
-0
/
+13
*
Publish
Fabio Berger
2018-07-26
1
-12
/
+12
*
Updated CHANGELOGS
Fabio Berger
2018-07-26
2
-0
/
+13
*
Revert to publishing ethereum-types
Fabio Berger
2018-07-26
1
-1
/
+1
*
Temporarily have all packages depend on an older, published version of ethere...
Fabio Berger
2018-07-26
1
-1
/
+1
*
Revert "Temporarily add changelog & package.json version changes"
Fabio Berger
2018-07-25
2
-13
/
+0
*
Temporarily add changelog & package.json version changes
Fabio Berger
2018-07-24
2
-0
/
+13
*
Revert "Revert "Publish""
Fabio Berger
2018-07-24
1
-12
/
+12
*
Revert "Publish"
Leonid Logvinov
2018-07-23
1
-12
/
+12
*
Publish
Leonid Logvinov
2018-07-23
1
-12
/
+12
*
Updated CHANGELOGS
Leonid Logvinov
2018-07-23
2
-3
/
+22
*
Add missing timestamp to CHANGELOG entries
Fabio Berger
2018-07-21
1
-0
/
+1
*
FIx a typo
Leonid Logvinov
2018-07-20
1
-1
/
+1
*
@0xproject/sol-compiler@1.0.0
Leonid Logvinov
2018-07-20
2
-1
/
+9
*
Change all package to depend on the new @0xproject/dev-utils@1.0.0
Leonid Logvinov
2018-07-20
1
-1
/
+1
*
Change all package to depend on the new @0xproject/web3-wrapper@1.0.0
Leonid Logvinov
2018-07-20
1
-1
/
+1
*
Change all package to depend on the new @0xproject/assert@1.0.0
Leonid Logvinov
2018-07-20
1
-1
/
+1
*
Change all package to depend on the new @0xproject/sol-resolver@1.0.0
Leonid Logvinov
2018-07-20
1
-1
/
+1
*
Change all package to depend on the new @0xproject/json-schemas@1.0.0-rc.1
Leonid Logvinov
2018-07-20
1
-1
/
+1
*
Change all package to depend on the new @0xproject/utils@1.0.0
Leonid Logvinov
2018-07-20
1
-1
/
+1
*
Change all package to depend on the new @0xproject/types@1.0.0-rc.1
Leonid Logvinov
2018-07-20
1
-1
/
+1
*
Change all package to depend on the new @0xproject/tslint-config@1.0.0
Leonid Logvinov
2018-07-20
1
-1
/
+1
*
Change all package to depend on the new @0xproject/typescript-typings@1.0.0
Leonid Logvinov
2018-07-20
1
-1
/
+1
*
Change all package to depend on the new @0xproject/monorepo-scripts@1.0.0
Leonid Logvinov
2018-07-20
1
-1
/
+1
*
Change all package to depend on the new ethereum-types@1.0.0
Leonid Logvinov
2018-07-20
1
-1
/
+1
*
merge v2-prototype
Fabio Berger
2018-07-19
5
-19
/
+30
|
\
|
*
Update package versions
Fabio Berger
2018-07-18
1
-6
/
+6
|
*
Update changelogs
Fabio Berger
2018-07-18
2
-0
/
+13
|
*
Fix tslint issues
Leonid Logvinov
2018-07-17
2
-8
/
+8
|
*
Upgrade tslint to the newest version
Leonid Logvinov
2018-07-17
1
-1
/
+1
|
*
-fetch';
Fabio Berger
2018-07-13
2
-4
/
+2
*
|
merge v2-prototype
Fabio Berger
2018-07-10
3
-11
/
+24
|
\
|
|
*
Update package versions
Fabio Berger
2018-07-10
1
-11
/
+11
|
*
Update changelogs
Fabio Berger
2018-07-09
2
-0
/
+13
*
|
Add ability to nest doc ref markdown under specific versions
Fabio Berger
2018-07-10
1
-1
/
+1
|
/
*
Merge pull request #831 from 0xProject/fix-readme-intros
Fabio Berger
2018-07-06
1
-1
/
+7
|
\
|
*
Update readme and doc intros
Fabio Berger
2018-07-06
1
-1
/
+7
*
|
Merge pull request #522 from 0xProject/feature/contracts/forwarder
Jacob Evans
2018-07-06
1
-2
/
+5
|
\
\
|
|
/
|
/
|
|
*
Forwarding contract (squashed commits)
Jacob Evans
2018-07-06
1
-2
/
+5
*
|
Remove unused imported Web3.js
Fabio Berger
2018-07-04
1
-1
/
+0
*
|
Update incorrect versions of deps
Fabio Berger
2018-07-02
1
-1
/
+1
|
/
*
Use make-promises-safe as a preloader instead of manually importing
Alex Browne
2018-06-22
3
-3
/
+1
*
Fix additional versions and update yarn.lock
Fabio Berger
2018-06-19
1
-1
/
+1
*
Update all package versions to match latest published to NPM
Fabio Berger
2018-06-19
1
-10
/
+10
*
Update CHANGELOG's with publishes performed on development branch
Fabio Berger
2018-06-19
2
-1
/
+18
*
Fix solidityVersion schema regex
Leonid Logvinov
2018-06-12
1
-1
/
+1
*
Merge pull request #676 from 0xProject/feature/mocha-source-maps
Alex Browne
2018-06-08
1
-1
/
+1
|
\
|
*
Use source-map-support package to include correct line numbers in mocha
Alex Browne
2018-06-07
1
-1
/
+1
*
|
Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...
fragosti
2018-06-07
1
-2
/
+4
|
\
|
|
*
Merge v2-prototype
Fabio Berger
2018-06-06
1
-1
/
+1
|
|
\
|
*
|
- Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ...
Fabio Berger
2018-06-05
1
-2
/
+4
*
|
|
merge v2-prototype
Fabio Berger
2018-06-06
1
-1
/
+2
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
Replace `-` with `_` in yarn script name so that we are consistent across yar...
Fabio Berger
2018-06-05
1
-1
/
+1
|
|
/
|
*
Don't automatically rebuild when running yarn test
Alex Browne
2018-06-05
1
-1
/
+2
*
|
Try enabling no-unused-variable...
fragosti
2018-06-05
6
-29
/
+5
|
/
*
Fix linter errors
Leonid Logvinov
2018-06-01
1
-1
/
+1
*
Add ethereum-types to extraFileIncludes
Leonid Logvinov
2018-06-01
1
-1
/
+2
*
Introduce ethereum-types package
Leonid Logvinov
2018-06-01
5
-4
/
+5
*
Add a CHANGELOG entry
Leonid Logvinov
2018-05-30
1
-0
/
+4
*
Make opts param optional in Compiler
Leonid Logvinov
2018-05-30
1
-6
/
+7
*
Add CHANGELOG entry
Leonid Logvinov
2018-05-30
2
-1
/
+10
*
Add schema assertions on public methods of @0xproject/sol-compiler
Leonid Logvinov
2018-05-30
4
-1
/
+33
*
Add errMsg when throwing on unrecognized error
Amir Bandeali
2018-05-25
1
-1
/
+1
*
Revert to an earlier version that works
Fabio Berger
2018-05-24
1
-1
/
+1
*
Remove the caret so it actually installs this version
Fabio Berger
2018-05-24
1
-1
/
+1
*
Bump all dependencies on json-schemas down a patch version so that they don't...
Fabio Berger
2018-05-24
1
-1
/
+1
*
Publish
Leonid Logvinov
2018-05-23
1
-10
/
+10
*
Updated CHANGELOGS
Leonid Logvinov
2018-05-23
2
-2
/
+7
*
Improve a CHANGELOG comment
Leonid Logvinov
2018-05-23
1
-1
/
+1
*
Remove web3Factory.create and remove dev-tools dependency on sol-cov
Leonid Logvinov
2018-05-23
1
-2
/
+1
*
Add CHANGELOG entries
Leonid Logvinov
2018-05-23
1
-0
/
+4
*
Add solcVersion to CompilerOpts
Leonid Logvinov
2018-05-23
3
-4
/
+11
*
merge development
Fabio Berger
2018-05-23
2
-3
/
+9
|
\
|
*
Merge pull request #594 from 0xProject/improvement/addCustomTslintRules
Fabio Berger
2018-05-23
2
-3
/
+9
|
|
\
|
|
*
Improve naming
Fabio Berger
2018-05-17
1
-3
/
+4
|
|
*
Merge branch 'development' into improvement/addCustomTslintRules
Fabio Berger
2018-05-16
1
-0
/
+3
|
|
|
\
|
|
*
|
Fix TSLint rules
Fabio Berger
2018-05-16
2
-3
/
+8
*
|
|
|
Merge pull request #572 from 0xProject/feature/contracts/atomicMatching
Greg Hysen
2018-05-22
1
-0
/
+1
|
\
\
\
\
|
*
|
|
|
Upgraded to Solidity 0.4.24
Greg Hysen
2018-05-19
1
-0
/
+1
*
|
|
|
|
merge development
Fabio Berger
2018-05-22
3
-1
/
+4
|
\
\
\
\
\
|
|
/
/
/
/
|
/
|
/
/
/
|
|
/
/
/
|
*
|
/
Use make-promises-safe to catch unhandled rejections in tests
Alex Browne
2018-05-17
3
-1
/
+4
|
|
|
/
|
|
/
|
*
/
|
Fix prettier
Brandon Millman
2018-05-19
1
-1
/
+3
|
/
/
*
|
Merge pull request #578 from 0xProject/document-node-version
Alex Browne
2018-05-16
1
-0
/
+3
|
\
\
|
|
/
|
/
|
|
*
Change minimum Node version to 6.12
Alex Browne
2018-05-15
1
-1
/
+1
|
*
Document Node.js version requirement and add it to package.json
Alex Browne
2018-05-15
1
-0
/
+3
*
|
Add changelog entries for packages where executable binary exporting fixed
Fabio Berger
2018-05-15
1
-0
/
+9
*
|
Fix sol-compiler binary so it can be called directly from packages
Fabio Berger
2018-05-15
2
-1
/
+3
*
|
Remove build from docs:stage commands
Fabio Berger
2018-05-15
1
-1
/
+1
*
|
Move from using lerna multi-package commands to wsrun, update README's accord...
Fabio Berger
2018-05-15
2
-16
/
+4
|
/
*
Add missing type definitions
Leonid Logvinov
2018-05-14
1
-1
/
+1
*
Revert "Remove gitkeeps"
Fabio Berger
2018-05-12
1
-0
/
+0
*
Remove gitkeeps
Fabio Berger
2018-05-11
1
-0
/
+0
*
Merge branch 'development' into breakUp0xjs
Fabio Berger
2018-05-11
4
-4
/
+7
*
Fix a bug in compiler config precedence
Leonid Logvinov
2018-05-11
1
-2
/
+4
*
Fix templates
Leonid Logvinov
2018-05-10
1
-0
/
+0
*
Remove unused deployer docs configs
Leonid Logvinov
2018-05-10
1
-3
/
+1
*
Fix linter issues
Leonid Logvinov
2018-05-10
4
-4
/
+7
*
Rename deployer to sol-compiler
Leonid Logvinov
2018-05-10
29
-0
/
+1962