Commit Graph

  • ceb89b9664 Return to idle state when Doodle was to big. peteruithoven 2013-10-23 17:41:49 +0200
  • f59feb7d44 Added helpcontent file to makefile peteruithoven 2013-10-23 17:26:19 +0200
  • c3fb6fc016 Console logging leave warning peteruithoven 2013-10-23 17:25:46 +0200
  • 7cc5b01b37 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver Adriaan Wormgoor 2013-10-23 17:02:12 +0200
  • 3058ef5c79 updated intro Tour behavior Adriaan Wormgoor 2013-10-23 17:01:59 +0200
  • 8bd62c93ec Lowering max drawing complexity peteruithoven 2013-10-23 16:45:41 +0200
  • 2b319c5dd6 Also showing warning when gcode file is to big peteruithoven 2013-10-23 16:45:24 +0200
  • 580b0ef33e Messages auto hide after 2 > 5 seconds peteruithoven 2013-10-23 15:33:10 +0200
  • 11c1764074 Settings validation messages are properly cleared peteruithoven 2013-10-23 15:32:28 +0200
  • cc2bcf962c Prevent preheat while buffering/printing/stopping peteruithoven 2013-10-23 12:45:41 +0200
  • 3b192078b4 Add logic for stepping through saved sketches (WIP, untested). Wouter R 2013-10-23 11:29:12 +0200
  • f7bcd6e7c4 Spelling correction peteruithoven 2013-10-23 12:16:39 +0200
  • 7daa661f3c index.html didn't point to the minified version of a js file Adriaan Wormgoor 2013-10-23 11:40:54 +0200
  • 06a969446a corrected: pointed to js file outside of www dir Adriaan Wormgoor 2013-10-23 11:39:25 +0200
  • d7d30f8167 lot of new files (will weed out later, some are probably not going to be used by us) Adriaan Wormgoor 2013-10-23 06:49:14 +0200
  • ff98a24526 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver Adriaan Wormgoor 2013-10-23 06:48:29 +0200
  • d3029096a7 added a simple help layer to the app (jquery joyride) Adriaan Wormgoor 2013-10-23 06:46:07 +0200
  • 9fc106b916 loading/saving sketches: metadata is now written in cdata as json and loaded back so sketches can be fully restored. Wouter R 2013-10-23 02:43:58 +0200
  • 56d404522a Move loadFromSvg and saveToSvg to better position in file. Wouter R 2013-10-23 01:31:03 +0200
  • 77a58849e8 Load sketch path from svg (WIP, metadata is not parsed yet). Wouter R 2013-10-23 01:29:50 +0200
  • 81bdabd2d5 Clean up empty directories on package removal. Wouter R 2013-10-22 22:38:42 +0200
  • 02d026e52a Re-added two css files which were accidentally untracked. Wouter R 2013-10-22 21:45:56 +0200
  • db4ed0df8a Re-added two css files which were accidentally untracked. Wouter R 2013-10-22 21:45:56 +0200
  • 86dcb57677 Untrack and ignore derived files in www/js and www/css directories. Wouter R 2013-10-22 21:19:37 +0200
  • 21b5f5d03e Untrack and ignore derived files in www/js and www/css directories. Wouter R 2013-10-22 21:19:37 +0200
  • feae8ba3e6 Merge branch 'feature/printerdriver' into feature/savingsketches Wouter R 2013-10-22 20:49:20 +0200
  • 6e79e70c0b Change references to minified stylesheets. Wouter R 2013-10-22 19:43:37 +0200
  • 1f79986f54 Add openwrt package Makefile. Add short description of steps to build css and js files. Wouter R 2013-10-22 18:23:29 +0200
  • 7b44b52cdd Fix permissions. Wouter R 2013-10-22 17:39:44 +0200
  • df98330259 - some more files w.r.t. help - fixed issue #3 https://github.com/Doodle3D/doodle3d-client/issues/3 Adriaan Wormgoor 2013-10-22 16:54:10 +0200
  • cda7b43163 - new libs and files for the in-app help - moved some uncompressed js libs to js_src/libs Adriaan Wormgoor 2013-10-22 16:37:56 +0200
  • 476e7d3e2d Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver Adriaan Wormgoor 2013-10-22 16:21:06 +0200
  • b3823c1fc5 .gitignore Adriaan Wormgoor 2013-10-22 16:17:38 +0200
  • 4899f7f510 Added bed temperature settings and replacement patterns peteruithoven 2013-10-22 15:33:08 +0200
  • d06008b3dc Correcting spelling mistake peteruithoven 2013-10-22 13:50:32 +0200
  • b55a9be25f slight change Adriaan Wormgoor 2013-10-22 12:21:45 +0200
  • f0f97198ec Big changes to order and placement of JS files: - grunt file updated to include automatic production of doodle3d-client.js and doodle3d-client.min.js - all individual JS files moved to outside scope of 'www' dir to reflect these changes Adriaan Wormgoor 2013-10-22 12:04:46 +0200
  • 90e00913ab Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver Adriaan Wormgoor 2013-10-22 11:01:11 +0200
  • 447b245c5b fix bug where progressguage and thermometer were making print and stop button non-clickable Adriaan Wormgoor 2013-10-22 11:00:33 +0200
  • 48a602e856 UpdatePanel peteruithoven 2013-10-22 03:31:12 +0200
  • 9c9086ab91 Small svg fix. Path is now translated so the data can actually be previewed properly. Change metadata to be put in a single comment. Wouter R 2013-10-21 23:09:19 +0200
  • 28c179aa77 Hacky implementation of an SVG generator + api call to save generated data. Wouter R 2013-10-21 22:37:10 +0200
  • 13b500f267 further squeezing of kilobytes from the assets to save space on the 'kastje' Adriaan Wormgoor 2013-10-21 16:48:41 +0200
  • eb2f941639 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver Adriaan Wormgoor 2013-10-21 15:44:54 +0200
  • 8289c084ca - Grunt configured - first install the dependencies with 'sudo npm install' - then run with 'grunt' Adriaan Wormgoor 2013-10-21 15:44:09 +0200
  • bc15491bf4 store settings locally on save peteruithoven 2013-10-21 15:14:00 +0200
  • 4ec660fd74 overhaul of client files to 'www' dir. This dir will now as a 'bin' dir of sorts. Outside of the 'www' dir there will be old files, temp files and also shell scripts which support continuous compilation and minification of css and js files Adriaan Wormgoor 2013-10-21 11:40:38 +0200
  • 66271c5287 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver Adriaan Wormgoor 2013-10-21 10:39:21 +0200
  • 524643e28a clearfix fix for progressguage and thermometer layouting Adriaan Wormgoor 2013-10-21 10:28:04 +0200
  • 2950638873 Small css tweak peteruithoven 2013-10-18 23:57:06 +0200
  • 10724b1746 Messages! Showing info about buffering, connection to wifibox and printer peteruithoven 2013-10-18 19:11:10 +0200
  • 46d2ae4bfc Leave warning while sending peteruithoven 2013-10-18 16:38:20 +0200
  • 5ceabf41ba Added heatup in startgcode and replace {printingTemp} and {preheatTemp} for settings peteruithoven 2013-10-18 15:55:11 +0200
  • 10ca22d7e9 Added network reconnect hint peteruithoven 2013-10-18 13:23:50 +0200
  • b978b5ada5 Integrated progressbar peteruithoven 2013-10-17 14:40:33 +0200
  • 53e8ccc294 Save settings before connect to network / create access point and display validation errors and only close settings when settings are saved peteruithoven 2013-10-17 14:09:09 +0200
  • b2191217cb better margins for thermo and progress Adriaan Wormgoor 2013-10-16 23:32:50 +0200
  • b89f2385b8 removed debug-method (thermo and progress (dis)appearing) Adriaan Wormgoor 2013-10-16 23:20:13 +0200
  • 69933b3b41 bigger thermo and progress Adriaan Wormgoor 2013-10-16 23:19:18 +0200
  • 5c9c8c8e8c Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver Adriaan Wormgoor 2013-10-16 23:11:13 +0200
  • e01175ed81 styles and html pertaining to the new Progressbar and Thermometer look and feel Adriaan Wormgoor 2013-10-16 23:11:06 +0200
  • 7d9b099aec progressguage images Adriaan Wormgoor 2013-10-16 23:03:03 +0200
  • ff14078d46 Check gcode generation feasibility check to prevent iPad/iPhone crashes peteruithoven 2013-10-16 22:25:15 +0200
  • b1ded5d41b Removing confirm peteruithoven 2013-10-16 18:32:24 +0200
  • d5aef3bf95 stop status checks on override and start them again when there is a first response peteruithoven 2013-10-16 18:27:10 +0200
  • 9ab36d999e reset the status check when printer state is overruled peteruithoven 2013-10-16 18:00:01 +0200
  • 1df94100f3 modified styles w.r.t. mobile screen - sidebar buttons not at top - doodle area larger - preview manipulation buttons smaller Adriaan Wormgoor 2013-10-16 16:12:30 +0200
  • b32f6d8c61 Class for Progressbar Adriaan Wormgoor 2013-10-16 15:57:30 +0200
  • 828a6a3b0a new extruder algorithm and retrieving gcodestart and end from settings peteruithoven 2013-10-16 14:28:19 +0200
  • 6419af4055 Using cgi-bin for network/openap and network/associate peteruithoven 2013-10-16 12:31:22 +0200
  • 50cb44b865 Wait for heating peteruithoven 2013-10-16 12:30:36 +0200
  • 51e4394491 Slight delay for gcode generation so that display is updated first. Hide stop untill gcode is send completely. CinekidRelease peteruithoven 2013-10-14 18:51:37 +0200
  • e29dd1576c Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into HEAD Wouter R 2013-10-14 17:47:33 +0200
  • 356630e7ba NOTE: hack! this is temporary. Hide stop button after print is started, until gcode sending is completed (to prevent sending gcode after stopping). Wouter R 2013-10-14 17:46:55 +0200
  • 9fb9ee2bc4 More robust state override peteruithoven 2013-10-14 17:40:56 +0200
  • 07fa1f62e8 NOTE: this commit is temporary and should be reverted! Add confirmation dialog when stop print button is pressed. Add modal alert when print is started to prevent repeated clicking of button (which in turn corrupts gcode buffering). Change preheat M109 to M104 to speed up printing cycle. Wouter R 2013-10-14 16:40:48 +0200
  • a23de73f8d Added access point password to settings peteruithoven 2013-10-14 15:09:30 +0200
  • bd341d6ff7 Also send next gcode part when buffering peteruithoven 2013-10-14 15:09:06 +0200
  • f84b1639d5 Stop sending print parts when print is stopped peteruithoven 2013-10-14 14:55:22 +0200
  • 399c55f84f Only send a start argument with api:printer/print on the first send peteruithoven 2013-10-12 17:46:15 +0200
  • af325f4bd3 Remove event handler from stop butten when disabled peteruithoven 2013-10-12 17:30:39 +0200
  • 51d44c9086 Removed piece of unnecessary CSS which was interfering with removing onmouseover 'hand' icon for disabled UI buttons Adriaan Wormgoor 2013-10-12 15:38:19 +0200
  • 81173c1379 made top-logo less wide when smaller (not visually, just cropped the tranparent whitespace). This will mainly prevent unwanted user interaction on the mobile display (eg. user tapping on logo's whitespace when intending to tap on the sidebar button) Adriaan Wormgoor 2013-10-12 15:37:07 +0200
  • 12337f6ceb in debugmode, canvas should be manipulable through touch Adriaan Wormgoor 2013-10-12 15:34:57 +0200
  • 8311fdd9c1 vertical shapes sidebar now auto-resizes as well Adriaan Wormgoor 2013-10-12 12:13:33 +0200
  • 613be4e619 fixed Firefox layouting issue of settings popup Adriaan Wormgoor 2013-10-11 23:33:19 +0200
  • 632a0a0895 ..removed too much Adriaan Wormgoor 2013-10-11 18:42:33 +0200
  • aea89d3422 - fixed canvasdrawing bug w.r.t. touch-enabled devices - removed some superfluous lines Adriaan Wormgoor 2013-10-11 18:40:03 +0200
  • 53e9a7e4a4 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver Adriaan Wormgoor 2013-10-11 18:00:17 +0200
  • fe53e31c27 removed unnecessary files, but moreover fixed a bug which was badly affecting the settings popup Adriaan Wormgoor 2013-10-11 18:00:10 +0200
  • 7126f1db79 Readded print and stop button disabled css peteruithoven 2013-10-11 16:18:38 +0200
  • 253561210d hasControl feedback peteruithoven 2013-10-11 16:17:58 +0200
  • d61b9cb0d8 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver Adriaan Wormgoor 2013-10-11 15:44:22 +0200
  • c1ae40d952 removed unnecessary file Adriaan Wormgoor 2013-10-11 15:44:13 +0200
  • 8ff028dce1 Fixing double printer.print call peteruithoven 2013-10-11 15:33:51 +0200
  • 1c930efdf5 Starting print right away, remove some target temp display hacks peteruithoven 2013-10-11 15:33:37 +0200
  • 8f5a2f7664 minor updates. Adriaan Wormgoor 2013-10-11 15:08:50 +0200
  • 88c6845592 some js files were postfixed with version numbers (eg. v01, v02, etc), but this is bullshit from source control perspective, hence removed the postfixes Adriaan Wormgoor 2013-10-11 15:06:32 +0200
  • 58b3a12c6b massive commit due to merging branch 'new_layouting_approach' into feature/printerdriver Adriaan Wormgoor 2013-10-11 15:02:26 +0200
  • 759616a8d4 changed chmod Adriaan Wormgoor 2013-10-11 14:07:15 +0200