0
0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-09-28 22:18:38 +02:00
doodle3d-client/js_src
Adriaan Wormgoor ff98a24526 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver
# By Wouter R
# Via Wouter R
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Re-added two css files which were accidentally untracked.
  Untrack and ignore derived files in www/js and www/css directories.
  Change references to minified stylesheets.
  Add openwrt package Makefile. Add short description of steps to build css and js files.
  Fix permissions.

Conflicts:
	www/css/styles.css
	www/css/styles.min.css
	www/index.html
	www/js/doodle3d-client.js
	www/js/doodle3d-client.min.js
2013-10-23 06:48:29 +02:00
..
libs Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver 2013-10-23 06:48:29 +02:00
buttonbehaviors.js Big changes to order and placement of JS files: 2013-10-22 12:04:46 +02:00
canvasDrawing.js Big changes to order and placement of JS files: 2013-10-22 12:04:46 +02:00
d3dServerInterfacing.js Big changes to order and placement of JS files: 2013-10-22 12:04:46 +02:00
gcodeGenerating.js Added bed temperature settings and replacement patterns 2013-10-22 16:00:59 +02:00
Help.js added a simple help layer to the app (jquery joyride) 2013-10-23 06:46:07 +02:00
init_layout.js Big changes to order and placement of JS files: 2013-10-22 12:04:46 +02:00
main.js Added bed temperature settings and replacement patterns 2013-10-22 16:00:59 +02:00
Message.js Big changes to order and placement of JS files: 2013-10-22 12:04:46 +02:00
previewRendering.js Big changes to order and placement of JS files: 2013-10-22 12:04:46 +02:00
Printer.js Big changes to order and placement of JS files: 2013-10-22 12:04:46 +02:00
Progressbar.js Big changes to order and placement of JS files: 2013-10-22 12:04:46 +02:00
SettingsWindow.js Big changes to order and placement of JS files: 2013-10-22 12:04:46 +02:00
sidebar.js Big changes to order and placement of JS files: 2013-10-22 12:04:46 +02:00
Thermometer.js Big changes to order and placement of JS files: 2013-10-22 12:04:46 +02:00
UpdatePanel.js Big changes to order and placement of JS files: 2013-10-22 12:04:46 +02:00
utils.js Big changes to order and placement of JS files: 2013-10-22 12:04:46 +02:00
verticalShapes.js Big changes to order and placement of JS files: 2013-10-22 12:04:46 +02:00