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

41 commits

Author SHA1 Message Date
Claudiu Ceia
01e970553f Fix typo: Celcius to Celsius (#1826) 2017-03-20 10:26:53 +01:00
Gina Häußge
d7b29a8725 Added @kantlivelong to AUTHORS.md 2017-03-09 15:36:26 +01:00
Andy Werner
8a4934e6f8 Fix an issue in user settings 
* UserSettings: crashed if overwrite an existing key with primitive value by same key with complex value. Also reduced number of calls to user.get_setting()

* Updated tests

(cherry picked from commit b75b53d)
 2017-03-08 18:11:36 +01:00
Gina Häußge
cad66fcea7 Added @ghulands to AUTHORS.md 2017-02-21 16:55:17 +01:00
Gina Häußge
9250cd0c3b Whitespace, comments & added @eyal0 to AUTHORS.md 
(cherry picked from commit c7f67cc)
 2017-01-24 11:38:52 +01:00
Gina Häußge
c194fdbb28 Added @noahsmartin to AUTHORS 2017-01-13 13:30:38 +01:00
I-am-me
75489bf71b Added @I-am-me to AUTHORS.md 2016-10-04 17:30:57 +02:00
clemniem
74fd5e8956 Fixed KeyError in events.py that prevented a command associated with the ClientOpened event from execution. 
The if-statement checked against currentData["job"] is not None, although it was not None even if there was no job.
 2016-09-16 16:21:28 +02:00
Mathias Rangel Wulff
b794a4672f Correct check for undefined variable 
The code was comparing the result of `typeof` with a variable named `undefined`.

As typeof returns a string it should compare to `'undefined'`.
 2016-09-12 09:43:46 +00:00
Gina Häußge
b1ffbf4a00 Added @eyck to AUTHORS.md 2016-07-06 14:04:21 +02:00
Gina Häußge
a2cd46899c Merge branch 'improve/intermediaryUrlsAndTimeouts' into devel 
Conflicts:
	AUTHORS.md
	src/octoprint/plugins/virtual_printer/virtual.py
 2016-07-06 13:32:03 +02:00
Gina Häußge
bef989961d Added @MoonshineSG to AUTHORS.md 2016-07-06 13:30:28 +02:00
Gina Häußge
9c89d45c10 Use print_function import + added @MirceDan to AUTHORS.md 2016-06-15 10:52:49 +02:00
Gina Häußge
888fb2669c Added @javierma to AUTHORS.md 2016-05-19 18:21:02 +02:00
Gina Häußge
2c0fa7c1d1 Added @kevans91 to AUTHORS.md 
(cherry picked from commit 425fa8e)
 2016-05-12 10:52:25 +02:00
Gina Häußge
425fa8e639 Added @kevans91 to AUTHORS.md 2016-05-12 10:17:15 +02:00
Gina Häußge
9e2a1f81a1 Added @philphilphil to AUTHORS.md 2016-05-09 15:51:42 +02:00
Gina Häußge
4e0d9e8d8e Merge branch 'dev/gcodeLayerButton' of https://github.com/agarwali/OctoPrint into pr/agarwali/dev/gcodeLayerButton 
Conflicts:
	AUTHORS.md
 2016-05-09 12:56:42 +02:00
Gina Häußge
5ff16bcbf4 Merge branch 'dev/fahrenheit' of https://github.com/therealbstern/OctoPrint into pr/therealbstern/dev/fahrenheit 
Conflicts:
	AUTHORS.md
 2016-05-09 11:33:57 +02:00
agarwali
173c544a5e Forgot to add names to Authors.md 2016-04-07 23:49:33 -04:00
Gina Häußge
d8ea8efd68 Added @Alex9779 to AUTHORS.md 2016-03-18 15:36:59 +01:00
Gina Häußge
7bdc4418fd Merge branch 'maintenance' into devel 
Conflicts:
	CHANGELOG.md
	docs/configuration/config_yaml.rst
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/__init__.py
	src/octoprint/settings.py
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/dialogs/settings/serialconnection.jinja2
	src/octoprint/util/comm.py
 2016-03-16 11:24:52 +01:00
Gina Häußge
5807b606f0 Added @2bitoperations to AUTHORS.md 
Was missing from PR #1255
 2016-03-14 11:50:50 +01:00
Ben Stern
5af78de226 Add output in Fahrenheit as well as Celsius. 2016-03-05 14:25:16 -05:00
Gina Häußge
d20a9f64a2 Updated AUTHORS.md 
(cherry picked from commit ab52e28)
 2016-02-10 10:16:04 +01:00
Gina Häußge
ab52e2850a Updated AUTHORS.md 2016-02-10 10:15:01 +01:00
Gina Häußge
6f0bfb38d7 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/static/css/octoprint.css
 2016-02-03 09:16:20 +01:00
Gina Häußge
73a587b3e4 Added missing entries to AUTHORS.md 2016-02-03 09:04:27 +01:00
Gina Häußge
62a25767a3 Merge branch 'maintenance' into devel 2016-01-05 11:43:20 +01:00
Gina Häußge
450e24bbc2 Added missing AUTHORS.md entry 2016-01-05 11:42:38 +01:00
Mark Bastiaans
682e78c256 Added name to authors 
(cherry picked from commit 406fe75)
 2015-12-04 17:37:27 +01:00
Gina Häußge
1728e579b1 Merge branch 'fix/temperatureYaxisCutoff' into devel 
Conflicts:
	AUTHORS.md
 2015-10-30 16:54:17 +01:00
Gina Häußge
a44eb43f0f Added @kevingelion to AUTHORS.md 2015-10-30 16:53:17 +01:00
Gina Häußge
ef06c51154 Added @punkkeks to AUTHORS.md 2015-09-11 11:53:33 +02:00
Mark Bastiaans
406fe75bc4 Added name to authors 2015-09-08 13:14:43 +02:00
Gina Häußge
5808c1bd8a Added @masterhou to AUTHORS.md 
(cherry picked from commit 7c90fe5)
 2015-07-29 09:19:51 +02:00
Gina Häußge
7c90fe599c Added @masterhou to AUTHORS.md 2015-07-29 09:16:55 +02:00
Nicanor Romero Venier
6d24a46e88 Fixed form field truncation in upload requests 
(cherry picked from commit 1f6c852)
 2015-07-15 10:35:59 +02:00
Gina Häußge
db866d2310 Finally added a proper AUTHORS file 
Also adjusted contribution guidelines to ask people to include themselves when filing
a PR.
(cherry picked from commit 1b594b2)
 2015-07-15 10:35:38 +02:00
Nicanor Romero Venier
1f6c85228b Fixed form field truncation in upload requests 2015-07-15 10:29:26 +02:00
Gina Häußge
1b594b2ec3 Finally added a proper AUTHORS file 
Also adjusted contribution guidelines to ask people to include themselves when filing
a PR.
 2015-07-07 22:43:36 +02:00