Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master_refactoring branch #210

Merged
merged 257 commits into from
Nov 12, 2018
Merged

Merge master_refactoring branch #210

merged 257 commits into from
Nov 12, 2018

Conversation

filippsen
Copy link
Contributor

@filippsen filippsen commented Nov 12, 2018 •
edited
Loading

Description of the Change

Merge master_refactoring, which is a combination of master and refactoring branches, with a few extra additions submitted on November 11 and 12, 2018.

Github Issues

Please refer to #166. This also fixes the following Issues:

filippsen and others added 30 commits October 6, 2018 12:52
@filippsen
Update Solidity compiler to version 0.4.25
8e037f5 
* Update pragma statements for all templates

* Update all templates to use the new constructor keyword
@bashlund
WIP
2e303bb
Changed icons for adding files
e909856
Added comment in backend.js
c7e886e
Fixed dropdown view for fs items
a0940c9
Minor change
14e79b7
@bashlund
Format dappfile JSON readablee
9f12a1e
@bashlund
Fix so that deleting/moving folders which contain contracts actually …
2b381f7 
…updates the dappfile with new locations.

Fix so renaming accounts updates the dappfile.
Fixed right click area for dropdown
b56c5fa
Changed contract ordering of items
7fad3d2
@Spejbl
Update UI for filesystem
46ded7c
@Spejbl
Refactor FileItem class - Split into multiple classes
e191019
@bashlund
Merge branch 'refactoring' of github.com:SuperblocksHQ/superblocks-la…
db3b143 
…b into refactoring
@bashlund
Fix deletion and move of directory structures which contains contract…
d6a3943 
…s in deep levels
Refactored fileitem to a component and added react-dnd
004e85d
First approach to change preact for react
d86393c
Formatted all code to follow prettier ruling
1436513
Ejected react-scripts
f437714
@Spejbl
Fix problems with dropdown padding, UI file system fix
1e15e4e
Removed sass stuff
8507517
A shit ton of compiling fixes
f339956
minor fix
928e901
Added a bunch of other fixes
856c467
Even more changes
0e56907
Modified all setState to use forceUpdate as intended instead
fecbc6c
Fixed copy files in webpack
d6b8dde
copy assets for production
b730c86
Progress
ba128a0
@bashlund
Merge branch 'refactoring' of github.com:SuperblocksHQ/superblocks-la…
9c68e5d 
…b into refactoring
@bashlund
Fix bug when moving contracts
c3ba059 
Move build files when contract is moved/renamed
Spejbl and others added 12 commits November 9, 2018 14:36
@Spejbl
Fix splash centering and newDapp padding
7758027
@bashlund
Pulverize T02.
ac86931
@filippsen
Fix unsupported style property
8839aa3
@bashlund
A13. Allow app preview to show without any contracts being compiled/d…
8d8002d 
…eployed.
@bashlund
A5.
83e21d2
@filippsen
Move base app before merge
2ccd32e
@filippsen
Merge branch 'refactoring' into master_refactoring
5d8cc04 
Conflicts:
	src/actions/projects.test.js
	src/components/app/app2.js
	src/components/blockexplorer/transactionlogdata.js
	src/components/console/index.js
	src/components/projecteditor/control/control.js
	src/components/projecteditor/editor-account.js
	src/components/projecteditor/editor-contract.js
	src/components/projecteditor/editor.js
	src/components/projecteditor/welcome/index.js
Moved templates outside the assets folder
f4af088
Fixed protypes warning for NetworkPreferences
4e6f539
A14
3a3f3b3
Removed un-necessary console log (A10)
db07288
@filippsen
Fix tests considering latest changes f4af088
2a9be1f
@filippsen filippsen merged commit bb62c95 into master Nov 12, 2018
This was referenced Nov 12, 2018
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
@javier-tarazaga javier-tarazaga deleted the master_refactoring branch January 2, 2019 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@javier-tarazaga javier-tarazaga javier-tarazaga approved these changes

@bashlund bashlund Awaiting requested review from bashlund

@waheed25 waheed25 Awaiting requested review from waheed25

@Spejbl Spejbl Awaiting requested review from Spejbl

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@filippsen @javier-tarazaga @bashlund @Spejbl