Teja
8b20f0a161
Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam
2014-11-24 22:08:38 +01:00
Philipp Engel
60c8838886
added unsupported statement as bad result
2014-11-24 22:07:49 +01:00
Philipp Engel
cfa6e955f5
upped communication timeout from 5 to 10 seconds
2014-11-24 22:07:33 +01:00
Teja
54052c2744
Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam
2014-11-24 22:04:29 +01:00
Teja
f950a56524
fixed homing gcode sequence
2014-11-24 22:03:41 +01:00
Philipp Engel
0a9c0bcf36
fixed paths
2014-11-24 21:42:21 +01:00
Philipp Engel
c60c05972c
Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam
...
Conflicts:
src/octoprint/templates/index.jinja2
2014-11-24 20:04:56 +01:00
Philipp Engel
fe3b05256a
hacked support for Vector File conversion into the GcodeFilesViewModel and the main javascript file. Should all be encapsulated in the svgtogcode plugin
...
TODO: figure out a way to move the code to the plugin
2014-11-24 20:01:05 +01:00
Philipp Engel
48422d7ea0
changed call to converter method
2014-11-24 20:00:45 +01:00
Philipp Engel
e071a33fae
changed default settings to fit the MrBeam hardware (for auto connection after startup)
2014-11-24 19:59:52 +01:00
Philipp Engel
0af4b3cb37
extended plugin code to use the slicing profiles and apply it to the vector graphics converter. Now supplying parameters through the frontend works.
2014-11-24 19:57:25 +01:00
Gina Häußge
e3253fce16
Changed name of cura plugin to CuraEngine
2014-11-24 17:52:39 +01:00
Teja
af327129d2
default settings for file list: no filtering
2014-11-24 16:38:36 +01:00
Teja
81ca42cd87
ignoring nbproject
2014-11-24 16:13:00 +01:00
Teja
913172e008
label updates: print -> laser
2014-11-24 16:09:59 +01:00
Teja
a4864b8508
disabled sd support
2014-11-24 15:47:12 +01:00
Teja
f15eae5e40
ignoring .directory settings
2014-11-24 15:30:06 +01:00
Philipp Engel
7c95ce39bf
Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam
2014-11-24 11:45:26 +01:00
Philipp Engel
752a42915e
removed extra javascript file
...
small change to the index file
2014-11-24 11:44:39 +01:00
Teja
ce2ca4bd0b
Commented out a lot of 3d printer related features.
2014-11-22 20:41:47 +01:00
Teja
4d72a9c89b
beamification of the octoprint ui.
2014-11-22 19:03:23 +01:00
Gina Häußge
acd6f729f0
Wait at least 5s before reloading the UI
2014-11-20 12:16:59 +01:00
Gina Häußge
ec85cccc75
Initialize logging before plugin manager, otherwise the logging output of the latter will not be visible
2014-11-19 11:33:20 +01:00
Gina Häußge
f3f640c24f
On reconnect to server, check if the version changed and if so hard-reload the UI
2014-11-19 09:16:37 +01:00
Gina Häußge
9c2b42caa2
Added an additional constant for the plugin base url for blueprint plugins
2014-11-19 09:03:50 +01:00
Gina Häußge
a677ffc90e
Only bind additional view models from plugins if they specify a target to bind to
2014-11-19 09:03:11 +01:00
Gina Häußge
254145da22
Also protect resources from blueprint plugins with the api key (unless the plugin specifies otherwise)
2014-11-19 09:02:33 +01:00
Gina Häußge
fec51ebc8e
Fixed a merge error that caused duplicated code and missing auto migration of reverse proxy settings
2014-11-17 13:50:47 +01:00
Gina Häußge
9d66aea843
Documentation and changelog entries updated
2014-11-17 13:49:46 +01:00
Gina Häußge
50895a662a
Updating the settings now fires a new event "SettingsUpdated"
2014-11-17 11:06:54 +01:00
Gina Häußge
048ad78778
Do not deliver API key on settings API unless user has admin rights.
2014-11-14 18:24:57 +01:00
Gina Häußge
e9beffc799
Properly recognize app session keys everywhere. Also fixed a bug where the ApiUser was not properly provisioned with his roles.
2014-11-14 17:58:42 +01:00
Gina Häußge
fe9dd5ef28
Send 401 Unauthorized instead of 403 Forbidden upon failed app session verification
2014-11-14 15:02:52 +01:00
Gina Häußge
468e4b6d55
Support for a new type of API key
...
In order to solve the initial handshake problem with apps, OctoPrint now supports so called app session keys which are basically API keys with a limited validity. Obtaining those keys is based on a handshake procedure backed by RSA signatures. OctoPrint needs to be aware of apps and their associated public keys (with the AppPlugin there exists a mechanism to add additional recognized apps by installing a plugin). Apps perform the handshake by first requesting a temporary key with very limited validity, then sending a message back to OctoPrint containing their id, version, the temporary key and a signature created with their private key over these three pieces of data. OctoPrint then tries to verify the signature and if successful unlocks the key to be used as a fully recognized API key.
2014-11-14 14:30:25 +01:00
Gina Häußge
b48ac505fd
Allow to fetch whole tree from the settings merged with the defaults
2014-11-14 10:42:02 +01:00
Gina Häußge
947de33b5a
Merge branch 'Booli-updateSettingsModal' into devel
2014-11-12 11:28:39 +01:00
Gina Häußge
4b9cd490ab
Merge branch 'updateSettingsModal' of https://github.com/Booli/OctoPrint into Booli-updateSettingsModal
2014-11-12 11:26:23 +01:00
Gina Häußge
784688a9da
Merge branch 'mrbeam-devel' into devel
2014-11-12 11:24:01 +01:00
Gina Häußge
71bb760ce5
Small optimization
2014-11-12 11:22:55 +01:00
Philipp Engel
98a46e8caa
including plugins' main template (='name of the plugin'.jinja2, e.g. cura.jinja2) to index.jinja2
2014-11-11 14:22:30 -08:00
Philipp Engel
c79a9e7e35
including plugins' main template (='name of the plugin'.jinja2, e.g. cura.jinja2) to index.jinja2
2014-11-11 14:09:35 -08:00
Philipp Engel
f61b6e8ad0
moved svg 'slicing' dialog to plugin code
...
added some more files
2014-11-11 13:51:43 -08:00
Gina Häußge
dcdbd3652a
Merge branch 'master' into devel
2014-11-10 09:21:23 +01:00
Gina Häußge
c35b7a66b0
Encoding has to be specified before any other line of code
2014-11-10 09:21:05 +01:00
Gina Häußge
5ec02e2f18
And some more changelog entries (some day I might actually catch up...)
2014-11-08 15:29:49 +01:00
Gina Häußge
9709b97adf
GCODE viewer now doesn't stumble over completely extrusionless GCODE files
2014-11-08 15:27:03 +01:00
Gina Häußge
3be039b1a9
Added a couple of changelog entries for previous commits
2014-11-08 15:23:57 +01:00
Gina Häußge
21bd664edf
Merge branch 'devel' of github.com:foosel/OctoPrint into devel
2014-11-08 15:16:29 +01:00
Gina Häußge
a31c422537
Merge branch 'imrahil-feature_qr_code' into devel
2014-11-08 15:16:15 +01:00
Gina Häußge
e5299d96ad
Added changelog entry for qr code
2014-11-08 15:15:49 +01:00
