Accalia de Elementia
|
f484cfedc4
|
fix merge errors
|
2016-12-20 13:28:20 +00:00 |
|
Accalia de Elementia
|
23af4833bf
|
Merge remote-tracking branch 'upstream/master' into replace-babel-with-browserify
Conflicts:
dist/debug.js
test/.babelrc
test/debug_spec.js
|
2016-12-20 13:22:38 +00:00 |
|
Yami
|
3e1a15d062
|
fix: merged again, because it didn't take. Guess I did it wrong?
|
2016-12-20 12:53:42 +00:00 |
|
Yami
|
67182fdb00
|
fix: Whoops, didn't merge the tests properly. Resolved.
|
2016-12-20 12:33:56 +00:00 |
|
Yami
|
2a01c6c775
|
Merged from upstream/master. I left the dist/debug in place because my hook now updates it automatically, but I removed the babelrc file since we don't need it anymore.
|
2016-12-20 12:27:29 +00:00 |
|
Yami
|
0d7c9ebcc9
|
fix: remove ES6 features since this also now runs on the browser
|
2016-12-19 12:12:35 +00:00 |
|
Yami
|
92e0e88570
|
feature: Combined backend and frontend tests
|
2016-12-19 12:06:38 +00:00 |
|
Hristo Iliev
|
50ffa9d85e
|
Enable use of custom log function (#379)
* Enable use of custom log function
* Add test for custom log function
|
2016-12-17 22:56:14 -08:00 |
|
Yami
|
f42b962792
|
refactor: Moved source files to /src. Moved test files to client and server side tests. Added karma for front-end testing.
|
2016-12-16 15:19:40 +00:00 |
|
Andrew E. Rhyne
|
f77ca5d56c
|
added linting and testing boilerplate with sanity check
|
2016-12-14 00:20:05 -08:00 |
|