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
7e595b27ed
Bugfix: configfile parameter was not properly used for settings in all cases
2013-03-16 01:48:28 +01:00
1e381cc793
Moved setup instructions for Raspbian to a wiki page.
2013-03-16 00:34:40 +01:00
3350b48a76
Merge remote-tracking branch 'origin/master' into devel
2013-03-16 00:32:18 +01:00
e08783c8bf
Merge remote-tracking branch 'daprice/master' into devel
2013-03-16 00:28:37 +01:00
dc5b8d9606
Update README.md
2013-03-16 00:17:12 +01:00
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
625ad32f6c
Merge pull request #75 from daprice/master
...
Fix storing of ItemListHelper sorting/filtering in localStorage
2013-03-13 02:36:10 -07:00
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
4b8260b933
Fixed some indentation
2013-03-11 21:46:05 +01:00
e2798de727
Merge branch 'daftscience-master' into devel
2013-03-11 21:15:27 +01:00
1afb690b8f
... it's been a long day.
2013-03-11 21:05:52 +01:00
b7a3105655
Smallish fixes for argparser
2013-03-11 21:04:56 +01:00
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
8570f73794
Merge branch 'master' into devel
2013-03-11 18:41:35 +01:00
f10e10f5b3
Converts commands uppercase
2013-03-11 10:39:03 -04:00
2904bd62d7
Enter key sends command
...
Sending a command also clears the field.
2013-03-11 10:38:41 -04:00
b23098a265
Fixed TimedTimelapse
...
Fixed access of interval attribute
2013-03-11 09:39:54 +01:00
09adb8dfda
Fixed TimedTimelapse
...
Interval parameter gets now accessed correctly
2013-03-11 09:38:36 +01:00
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
fe1e02a1de
Added run-as-daemon to the readme.
2013-03-10 21:33:45 +01:00
53d6ee2484
Added credits to daemon.py
2013-03-10 21:08:14 +01:00
54dcbd3cc6
Fixed some identation and an obsolete import
2013-03-10 21:02:47 +01:00
1b1f118646
Merge branch 'richardjm-daemon' into daemon
...
Conflicts:
octoprint/server.py
2013-03-10 19:11:16 +01:00
1ead7ba23c
Added Pines Notify to the credits.
2013-03-10 17:55:31 +01:00
7fc8dd22a1
Added some info to the readme regarding system commands
2013-03-10 17:46:46 +01:00
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
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
ad175c24fd
Logging not working because start() not called
2013-03-10 15:54:58 +00:00
07caef034b
Improve comment reason
2013-03-10 13:40:53 +00:00
37f3f771fb
Incorrect indentation
2013-03-10 13:18:34 +00:00
7226c1edae
Lots of work to daemonise - logging still not working
2013-03-10 13:14:37 +00:00
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
1d2a2c873f
Fixed settings for ffmpeg path
2013-03-09 00:29:07 +01:00
07d4a8fd4f
Added (optional!) watermark addition to generated timelapse movies.
2013-03-09 00:23:52 +01:00
3b50fdcf3f
Switched column sizes for gcode and timelapse file tables to pixel values.
2013-03-08 23:25:04 +01:00
70f5ea3f7f
Fixed configuration of snapshot url
2013-03-08 23:24:30 +01:00
133831e08e
Fixed buggy column styles for gcode and timelapse file tables
2013-03-08 21:47:51 +01:00
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
95d6c18183
Use contrast function for calculating text color in navbar
2013-03-08 20:36:18 +01:00
1361c48bf6
Merge pull request #63 from richardjm/devel
...
Missing semi-colon causing problems
2013-03-08 00:45:30 -08:00
26c6c0fb5f
Missing semi-colon causing problems
2013-03-08 06:34:31 +00:00
72c0e703b9
Merge branch 'richardjm-devel' into devel
...
Conflicts:
octoprint/static/css/ui.css
octoprint/templates/index.html
2013-03-07 22:20:45 +01:00
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
f68b0ddc04
not sure why i commented that out
2013-03-07 21:10:42 +00:00
69980a3401
Fix up for less support
2013-03-07 21:08:16 +00:00
2ade4948fc
The jog controls aren't ugly any more and we have some more stuff than just jog controls now
2013-03-06 23:44:58 +01:00
59ffa94cde
Playing around with less...
2013-03-06 23:38:31 +01:00
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
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