pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1099 commits 20 branches 22 tags 141 MiB
Commit graph

111 commits

Author SHA1 Message Date
Dale Price
71f3dbbdcc add tooltips to file controls 2013-03-25 23:55:53 -05:00
Gina Häußge
178b2f36d7 Only log the terminal output to disk if the "--debug" commandline switch is given 
Otherwise slowdowns might be caused on Raspberry Pi when dumping all printer communication to SD
 2013-03-17 22:32:35 +01:00
Gina Häußge
1477fb31fb Merge branch 'devel' 2013-03-17 16:42:48 +01:00
Gina Häußge
192952c03f Logging statements for timelapse creation 2013-03-17 16:31:20 +01:00
Gina Häußge
8543d628b5 New serial log at ~/.octoprint/logs/serial.log 
Logs the same content as the terminal tab and is restricted to 2MB in size (hopefully).

Closes #77
 2013-03-16 02:24:33 +01:00
Gina Häußge
7e595b27ed Bugfix: configfile parameter was not properly used for settings in all cases 2013-03-16 01:48:28 +01:00
Gina Häußge
e08783c8bf Merge remote-tracking branch 'daprice/master' into devel 2013-03-16 00:28:37 +01:00
Dale Price
088253e564 work around a bug in iOS 6 where ajax requests get cached and only work once 2013-03-14 20:55:02 -05:00
Dale Price
d564176c9c fix localStorage bug by not trying (and failing) to make it a multidimensional array; use JSON to store array of filters in localStorage 2013-03-13 03:01:18 -05:00
Gina Häußge
4b8260b933 Fixed some indentation 2013-03-11 21:46:05 +01:00
Gina Häußge
e2798de727 Merge branch 'daftscience-master' into devel 2013-03-11 21:15:27 +01:00
Gina Häußge
363f00775b New config options for daemonization, configfile location and basedir location 
Using --daemon {start|stop|restart} OctoPrint can now be daemonized/controlled in daemon mode. Via --pidfile it's possible to set the pidfile to use, --configfile allows specification of the config.yaml to use, --basedir specifies the location of the basedir from which to base off the upload, timelapse and log folders. I also updated the README to include some config file settings which were previously undocumented.
 2013-03-11 21:00:43 +01:00
Tom
f10e10f5b3 Converts commands uppercase 2013-03-11 10:39:03 -04:00
Tom
2904bd62d7 Enter key sends command 
Sending a command also clears the field.
 2013-03-11 10:38:41 -04:00
Gina Häußge
b23098a265 Fixed TimedTimelapse 
Fixed access of interval attribute
 2013-03-11 09:39:54 +01:00
Gina Häußge
09adb8dfda Fixed TimedTimelapse 
Interval parameter gets now accessed correctly
 2013-03-11 09:38:36 +01:00
Gina Häußge
1ebc0c0ce9 Temporary workaround for the gcode viewer options not cooperating until those are integrated a bit more. 
Targets #35.
 2013-03-10 22:06:08 +01:00
Gina Häußge
53d6ee2484 Added credits to daemon.py 2013-03-10 21:08:14 +01:00
Gina Häußge
1b1f118646 Merge branch 'richardjm-daemon' into daemon 
Conflicts:
	octoprint/server.py
 2013-03-10 19:11:16 +01:00
Gina Häußge
ff1678ab30 Set shell=True in subprocess calls to allow usage of string commands (instead of lists separating command from arguments) 2013-03-10 17:17:50 +01:00
Gina Häußge
eb3832b028 Implemented support for customizable system actions/commands, e.g. for shutting down/rebooting the system OctoPrint's running on from within the UI. 2013-03-10 17:04:05 +01:00
Richard Mitchell
07caef034b Improve comment reason 2013-03-10 13:40:53 +00:00
Richard Mitchell
37f3f771fb Incorrect indentation 2013-03-10 13:18:34 +00:00
Richard Mitchell
7226c1edae Lots of work to daemonise - logging still not working 2013-03-10 13:14:37 +00:00
Gina Häußge
a261896186 Fixed using wrong item collection for timelapse files, lead to always displaying all files, not just the ones of the current page. 2013-03-09 12:58:15 +01:00
Gina Häußge
1d2a2c873f Fixed settings for ffmpeg path 2013-03-09 00:29:07 +01:00
Gina Häußge
07d4a8fd4f Added (optional!) watermark addition to generated timelapse movies. 2013-03-09 00:23:52 +01:00
Gina Häußge
3b50fdcf3f Switched column sizes for gcode and timelapse file tables to pixel values. 2013-03-08 23:25:04 +01:00
Gina Häußge
70f5ea3f7f Fixed configuration of snapshot url 2013-03-08 23:24:30 +01:00
Gina Häußge
133831e08e Fixed buggy column styles for gcode and timelapse file tables 2013-03-08 21:47:51 +01:00
Gina Häußge
f1dc0a629a Fixed state information for gcode file upload. Now offers some status text that gives feedback whether file is still uploading to the server or being saved to disk on the server. 2013-03-08 21:05:53 +01:00
Gina Häußge
95d6c18183 Use contrast function for calculating text color in navbar 2013-03-08 20:36:18 +01:00
Richard Mitchell
26c6c0fb5f Missing semi-colon causing problems 2013-03-08 06:34:31 +00:00
Gina Häußge
6eb8991035 Migrated ui.css to LESS (just some small touch ups compared to plain css version, nothing fancy) 2013-03-07 22:19:33 +01:00
Gina Häußge
59ffa94cde Playing around with less... 2013-03-06 23:38:31 +01:00
Gina Häußge
1fbb73e448 Refactored pagination/sorting/filtering of gcode files into own configurable listHelper now used to provide pagination etc to both gcode and timelapse file list. 2013-03-06 23:27:16 +01:00
Gina Häußge
dae1c0367a Merge branch 'daprice-sorting_persistence' into devel 
Conflicts:
	octoprint/static/js/ui.js
 2013-03-03 19:38:26 +01:00
Gina Häußge
98a7c3d8b8 New option to sort gcode files by size, reverted former utc "fix" (doesn't work anymore, works without the fix, I have no idea...), added adjusted modernizr, delete metadata from old gcode file version when adding a new one 2013-03-03 19:37:52 +01:00
Gina Häußge
9b3fc0c65e Set default instance name to empty string 2013-03-03 16:57:35 +01:00
Dale Price
eecb19ecf6 store file sorting options in the browser's LocalStorage 2013-03-02 22:56:58 -06:00
Gina Häußge
c1f2866a94 Moved totalExtrusion calculation into existing branches, added calculation of currentE for relative extruders (in case GCODE switches back to absolute) 2013-03-02 13:39:44 +01:00
Gina Häußge
766e9f0e7f Show custom title first in head in case of small tabs 2013-03-02 13:38:30 +01:00
Gina Häußge
63888f5e2e Merge branch 'AxTheB-devel' into devel 2013-03-02 13:29:08 +01:00
Gina Häußge
e0b405054a Fixed some whitespace and reworked custom title to always include an "OctoPrint" prefix (gotta protect the "brand" here ;)) 2013-03-02 12:42:35 +01:00
Gina Häußge
bd28c73bc5 Merge branch 'richard-jm/appearance' into devel 2013-03-02 12:20:24 +01:00
Richard Mitchell
260606601d Title and limited color control via settings 2013-03-02 10:56:32 +00:00
Richard Mitchell
943d734993 That was easy enough to continue temp monitoring whilst paused 2013-03-01 22:19:58 +00:00
Richard Mitchell
b2408c92a5 Didn't add the restart button after all 2013-03-01 21:57:13 +00:00
Richard Mitchell
324601dfed Did clever stuff at first for restart but replacing the appearance of start is all that is needed I believe 2013-03-01 21:52:15 +00:00
Václav 'Ax' Hůla
d667a0ff56 Fix filament measurement for relative extruders 2013-03-01 17:55:25 +01:00