Gina Häußge
fc777e69e2
API Documentation updated for printer profiles (still a WIP though)
2014-12-02 11:57:03 +01:00
Gina Häußge
2ea1b9df6c
Fully switched to printer profiles
2014-12-02 11:30:00 +01:00
Gina Häußge
05e54fa0c6
Internal representation for extruder offsets changed, adjusted gcode viewer view model to be able to cope
2014-12-01 16:36:08 +01:00
Gina Häußge
0203e6da31
More work on the printer profiles, connection dialog and Settings dialog are now working. GCODE viewer makes trouble
2014-12-01 16:26:55 +01:00
Gina Häußge
93a852e6ea
WIP: Printer profiles & management now functional, but integration with connection dialog still broken
...
The API documentation is also still missing.
2014-11-29 20:55:30 +01:00
Gina Häußge
985b0970f1
More work on the printer profiles
2014-11-29 12:32:55 +01:00
Gina Häußge
a56ddb9ebe
WIP commit, probably a tad bit broken ;)
2014-11-28 11:29:38 +01:00
Gina Häußge
1957d2bb58
WIP First work towards printer profiles
2014-11-28 09:32:44 +01:00
Gina Häußge
e55f11c5b9
Fixed wrong default types for plugin hooks etc
2014-11-26 16:53:35 +01:00
Gina Häußge
07133b79e5
Track modification time of configuration file and reload it if it was externally modified before changing settings
2014-11-25 17:04:27 +01:00
Gina Häußge
183a8feed4
Plugins can now push messages via the websocket as well
2014-11-25 09:08:33 +01:00
Gina Häußge
e3253fce16
Changed name of cura plugin to CuraEngine
2014-11-24 17:52:39 +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
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
Gina Häußge
5675f32a19
QR Code generation uses jquery.qrcode and a custom knockout binding
...
This way it will also be possible to easily add another qrcode to the user api key later. Refused to work for now (value binding doesn't update), so commented out right now, but works in theory.
2014-11-08 15:14:38 +01:00
Gina Häußge
c207578f14
Merge pull request #639 from mangtronix/iphone-autocaps
...
Disable automatic capitalization for username entry field (Safari)
2014-11-07 08:26:10 +01:00
Michael Ang
16801ad3e1
Disable autocapitalization for username
...
Makes it easier to login on iPhone (Mobile Safari)
2014-11-07 00:24:05 +01:00
Jarek Szczepanski
25cfed949d
Added QR code with API key on Settings dialog
2014-11-05 12:24:51 +01:00
Gina Häußge
eacfcab187
Merge branch 'master' into devel
...
Conflicts:
CHANGELOG.md
2014-11-04 10:43:11 +01:00
Gina Häußge
9e014eba1f
Added removal of pyc files (and their parent folders if they are empty after that) to the python setup.py clean command
2014-11-04 10:40:15 +01:00
Gina Häußge
9692b709aa
Merge branch 'Wallacoloo-master'
2014-11-04 10:08:07 +01:00
Gina Häußge
5acb04c180
Fixed a couple of more missing branch fields and added Changelog entry
2014-11-04 10:07:46 +01:00
Gina Häußge
ff96e2e4d6
Also interpret lines starting with "!!" as errors from the firmware
...
(see http://reprap.org/wiki/G-code#Replies_from_the_RepRap_machine_to_the_host_computer )
2014-11-03 21:40:21 +01:00
Pim Rutgers
2e96fa9e1e
Request Settings data on opening modal
...
to counter different browser windows having different settings
2014-11-03 19:14:50 +01:00
Colin Wallace
87234bda05
Fix missing branch field in DEFAULT dict
...
Should fix an error raised on line 951 (SHORT_VERSION_PY % DEFAULT) during Octoprint setup when there's no version info. More info here: https://groups.google.com/forum/#!topic/deltabot/8udyUsJ1c9M
2014-11-03 05:50:09 +00:00
