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

1639 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
45c1958d83 Versioneer now also returns and persists the branch from which OctoPrint was installed 
Changed version output accordingly to now display "{version} ({branch} branch)" if branch information is available (which should be the case if installation was performed from git).
(cherry picked from commit a48b5de)
 2014-09-03 10:56:39 +02:00
Gina Häußge
e51d9439c5 Modified versioneer to allow specification of manual versions based on branches 
You can now define a lookup file explicitely mapping virtual version tags to branches via regular expressions and a reference commit from which the commit distance will be calculated.

Format of the file is

  <branch-regex> <tag> <reference commit>

The file is processed from top to bottom, the first matching line wins. If <tag> or <reference commit> are left out, the lookup table does not apply to the matched branches and the regular versioneer resolution (via git describe) takes place.

Current configuration makes "master", "staging" and any branch starting with "fix/" make use the default behaviour, all other branches (so basically all development branches) are defined as "1.2.0-dev"
(cherry picked from commit 212f40c)
 2014-09-03 10:53:54 +02:00
Gina Häußge
18952c57ff Added automatic migration of old event subscription format to the new one 
(cherry picked from commit e7088ef)
 2014-08-31 22:54:16 +02:00
Gina Häußge
590d2f2661 Added docs-specific requirements.txt for the docs to build on readthedocs.org 2014-08-31 21:40:03 +02:00
Gina Häußge
9b3569be50 Added release notes for 1.1.0 and documentation of OctoPrint's events and the version resource 2014-08-31 15:17:32 +02:00
Gina Häußge
661302f698 Merge branch 'staging' 2014-08-30 10:14:18 +02:00
Gina Häußge
7a305b5a5c Changed default path to OctoPrint executable 
When installed via python setup.py install, it defaults to /usr/local/bin/octoprint, not /usr/bin/octoprint
 2014-08-30 10:09:29 +02:00
Gina Häußge
9f463707ee Merge remote-tracking branch 'origin/master' 2014-08-30 10:08:52 +02:00
Gina Häußge
e1bcbae975 Changed default path to OctoPrint executable 
When installed via python setup.py install, it defaults to /usr/local/bin/octoprint, not /usr/bin/octoprint
 2014-08-30 10:08:40 +02:00
Gina Häußge
d6959f64c3 Merge remote-tracking branch 'origin/staging' into staging 2014-08-14 16:56:53 +02:00
Aaron Bieber
c5dbc71db3 add serial types for OpenBSD 
(cherry picked from commit a439dc4)
 2014-08-14 16:55:00 +02:00
Gina Häußge
017654852d We want the year in the docs to always be current 
(cherry picked from commit f7f7d5c)
 2014-08-08 17:14:50 +02:00
Gina Häußge
9e2e616e1b Let's see if fetching the version from the octoprint module works on rtd... 
(cherry picked from commit 85fc2b2)
 2014-08-08 17:14:46 +02:00
Gina Häußge
0d5d28e4a6 Submit login form upon enter in password field, switch to password field upon enter in username field 
(cherry picked from commit ff22ab0)
 2014-08-08 17:13:53 +02:00
Gina Häußge
90e50db189 Also update the metadata correctly when an analysis finishes 
Closes #476 for good
(cherry picked from commit 65624ed)
 2014-08-08 17:13:41 +02:00
Gina Häußge
e9a7cad202 Made the navbar static instead of fixed to improve usability on mobile devices 
This is just a hack really, the proper approach would be to finally move to a real responsive design, but this should prove as a valid workaround until that is realized.

Closes #257 for now.
(cherry picked from commit 02212bd)
 2014-08-08 17:12:01 +02:00
Gina Häußge
60cf0b1099 Made the navbar static instead of fixed to improve usability on mobile devices 
This is just a hack really, the proper approach would be to finally move to a real responsive design, but this should prove as a valid workaround until that is realized.

Closes #257 for now.
(cherry picked from commit 02212bd)
 2014-08-08 17:10:42 +02:00
Gina Häußge
aefb72f7cc API version 1.0 is too early, we'll set it to 0.1 for now until it is really stable and not missing things like system commands and such 
(cherry picked from commit 4d434d3)
 2014-08-08 17:07:02 +02:00
Gina Häußge
f69abdcc14 Version resource on API with API and software version 
(cherry picked from commit 907f505)
 2014-08-08 17:04:31 +02:00
Gina Häußge
ee36c31637 Added clean command to setup.py 
(cherry picked from commit 76a9e94)
 2014-08-08 17:03:29 +02:00
Gina Häußge
e0a064a0fa Updated README to fit new installation procedure etc. 2014-08-08 17:00:39 +02:00
Gina Häußge
568fcbf547 Don't close serial port before switching to state "closed serial port" 
Depending on what was happening in the monitoring thread this could lead to an attempt to write to the already closed port, logging an error and killing the interface in the process. Also fixed a timing issue in the state reporting towards the frontend, state updates and readings for clients are now wrapped in a mutex

Closes #492
(cherry picked from commit 11fb18f)
 2014-08-08 16:58:38 +02:00
Gina Häußge
7028bbfbfd GCODE viewer now interprets inverted axes for printer control and mirrors print bed accordingly. 
Should enable people to set their axes origin so that the viewer matches what they see on their printer.

Should close #431
(cherry picked from commit 030ffe6)
 2014-08-08 16:55:05 +02:00
Gina Häußge
c552e9e9be Fixed a couple of issue with the gcode viewer 
Most notably the interfering options tracked in #398, but also made "Center viewport on model" and "Zoom in on model" automatically deselect and de-apply if viewport gets manipulated by user, therefore properly allowing the re-select by the user to work to.

Closes #398
(cherry picked from commit f195af0)
 2014-08-08 16:52:28 +02:00
Gina Häußge
f8e8914f7d Merge branch 'master' into staging 
Conflicts:
	setup.py
	src/octoprint/server/ajax/control.py
 2014-08-08 16:37:25 +02:00
Gina Häußge
48dc27e106 Update CONTRIBUTING.md 2014-08-01 14:23:11 +02:00
Gina Häußge
32a38af4f7 Update CONTRIBUTING.md 2014-07-27 16:18:30 +02:00
Gina Häußge
772ebd198a Fixed setup.py to correctly work with versioneer 
(cherry picked from commit de7808d)
 2014-06-23 10:36:30 +02:00
Gina Häußge
603f667f93 Removed left overs from old VERSION tracking 2014-06-22 01:15:31 +02:00
Gina Häußge
18162cf110 Versioning by versioneer: https://github.com/warner/python-versioneer/ 
(cherry picked from commit 285f464)
 2014-06-22 01:12:06 +02:00
Gina Häußge
f693f26ffc Insert src folder at first position of sys.path 
(cherry picked from commit fa564c6)
 2014-06-22 01:09:22 +02:00
Gina Häußge
4cc1dc405f v1.1.0-rc1 2014-06-22 01:06:39 +02:00
Gina Häußge
f9a9a405cd About time to declare this as a stable version, should have done this ages 
ago...
 2014-06-22 00:42:03 +02:00
Gina Häußge
fa564c6029 Insert src folder at first position of sys.path 2014-06-21 20:16:53 +02:00
Gina Häußge
36d1522f01 Merge pull request #475 from Salandora/master 
Bug fix for Emergency Stop
 2014-05-22 21:53:06 +02:00
Salandora
536e17eac4 Bug fix for Emergency Stop 2014-05-22 17:56:50 +02:00
Gina Häußge
887ec45b6b Create CONTRIBUTING.md 2014-05-19 22:48:41 +02:00
Gina Häußge
deb38f8455 Fixed an embarrassing merge error from waaay back. Didn't disrupt operation but caused funny error messages in the log. 
Thanks to @nophead for reporting this.

Closes #433
 2014-04-18 14:28:52 +02:00
Gina Häußge
64dacc7c70 Merge remote-tracking branch 'origin/devel' into devel 2014-03-15 20:36:56 +01:00
Gina Häußge
f7c75442e7 Merge branch 'master' into devel 
Conflicts:
	src/octoprint/server/api/settings.py
	src/octoprint/settings.py
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/util/comm.py
 2014-03-15 20:36:35 +01:00
Gina Häußge
293611287e New setting for repetier to always assume SD card is present (since firmware does not report whether initialization succeeded via explicit message) 
Fixes #289
 2014-03-15 16:30:29 +01:00
Gina Häußge
6a2a1da5f9 Merge branch 'master' into devel 2014-03-15 10:20:37 +01:00
Gina Häußge
7ebbf5911c Removed the scary start up message when called via run. I'll just keep that script around for sake of simplicity of running stand alone installations out of the pull dir, so why scare people... 2014-03-15 10:20:19 +01:00
Gina Häußge
254c3814d5 Merge pull request #415 from nullie/fix-temperature-table-size 
Revert "Add box-sizing: border-box to temperature table th. Should fix #...
 2014-03-14 16:50:39 +01:00
Gina Häußge
44c1920d9b Merge pull request #414 from nullie/fix-actual-column-style 
Fix style attribute for Actual column header, should fix #412
 2014-03-14 16:17:07 +01:00
Ilya Novoselov
109372d10b Fix style attribute for Actual column header, should fix #412 2014-03-14 21:01:04 +06:00
Ilya Novoselov
94847b846b Revert "Add box-sizing: border-box to temperature table th. Should fix #412" 
This reverts commit 54b01d30da.
 2014-03-14 20:47:56 +06:00
Gina Häußge
3746332eb5 Merge pull request #413 from nullie/fix-temperature-table-size 
Add box-sizing: border-box to temperature table th. Should fix #412
 2014-03-14 14:36:37 +01:00
Ilya Novoselov
54b01d30da Add box-sizing: border-box to temperature table th. Should fix #412 2014-03-14 16:52:07 +06:00
Gina Häußge
0509eb3f0a Merge branch 'master' into devel 
Conflicts:
	setup.py
	src/octoprint/gcodefiles.py
	src/octoprint/printer.py
	src/octoprint/server/ajax/control.py
	src/octoprint/server/ajax/gcodefiles.py
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/main.js
	src/octoprint/util/comm.py
 2014-03-13 20:25:33 +01:00