ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity

resolving merge conflict

This commit is contained in:
Tim Daubenschütz 2015-05-15 15:22:29 +02:00
parent 23c033f12f b000ecd925
commit f96ec92df6
6 changed files with 19943 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -14,4 +14,4 @@ results
node_modules
npm-debug.log
build/
build/app.js

2
README.md
View File

@ -14,7 +14,7 @@ Getting started
git clone git@bitbucket.org:ascribe/onion.git
cd onion
npm install
npm run build
npm run watch
```

0
build/.keep Normal file
View File

19935
build/bundle.js Normal file
View File

File diff suppressed because one or more lines are too long

2
index.html
View File

@ -11,6 +11,6 @@
<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
<div id="main"></div>
<script src="js/bundle.js"></script>
<script src="build/app.js"></script>
</body>
</html>

5
package.json
View File

@ -4,8 +4,13 @@
"description": "Das neue web client for Ascribe",
"main": "js/app.js",
"scripts": {
<<<<<<< HEAD
"start": "watchify -o js/bundle.js -v -d js/app.js",
"build": "browserify . -t [envify --NODE_ENV production] | uglifyjs -cm > js/bundle.min.js",
=======
"watch": "watchify -o build/app.js -v -d js/app.js",
"build": "browserify . -t [envify --NODE_ENV production] | uglifyjs -cm > build/app.js",
>>>>>>> b000ecd925e2e23febd47b088384cf6d5d155a9c
"test": "jest"
},
"author": "Ascribe",