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

210 commits

Author SHA1 Message Date
Gina Häußge
77753ca026 Preparing release of 1.3.5 2017-10-16 13:21:27 +02:00
Gina Häußge
e88e6ba292 Preparing release of 1.3.5rc4 2017-10-04 13:33:46 +02:00
Gina Häußge
679674df22 Preparing release of 1.3.5rc3 2017-08-25 11:46:40 +02:00
Gina Häußge
1f9fe8c868 Preparing release of 1.3.5rc2 2017-07-27 13:33:45 +02:00
Gina Häußge
1a6dbb3f4a Preparing release of 1.3.5rc1 2017-07-26 12:47:47 +02:00
Gina Häußge
fe481e12b3 Prepare release of 1.3.4 (hotfix) 2017-06-01 12:22:23 +02:00
Gina Häußge
b55c4ef5ca Preparing release of 1.3.3 2017-05-31 15:49:01 +02:00
Gina Häußge
ce1541e956 Preparing release of 1.3.3rc3 2017-05-24 13:26:06 +02:00
Gina Häußge
2bae87b85a Preparing release of 1.3.3rc2 2017-05-17 10:59:48 +02:00
Gina Häußge
3fbd477d15 Preparing release of 1.3.3rc1 2017-05-11 15:25:43 +02:00
Gina Häußge
0a69dbeddb Preparing release of 1.3.2 2017-03-16 13:08:31 +01:00
Gina Häußge
1c132c39ad Preparing release of 1.3.2rc1 2017-03-10 14:35:11 +01:00
Gina Häußge
6393de8c7d Preparing release of 1.3.1 2017-01-25 08:24:07 +01:00
Gina Häußge
adbd6b7fa1 Preparing release of 1.3.1rc2 2017-01-20 15:33:32 +01:00
Gina Häußge
5b3a7bed93 Preparing release of 1.3.1rc1 2017-01-13 13:56:50 +01:00
Gina Häußge
7f5d03d054 Preparing release of 1.3.0 2016-12-08 09:25:13 +01:00
Gina Häußge
229f3a2744 Preparing release of 1.3.0rc3 2016-12-02 12:39:28 +01:00
Gina Häußge
4541148aa5 Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
 2016-11-30 14:34:21 +01:00
Gina Häußge
1d0657a8eb Preparing release of 1.2.18 2016-11-30 11:24:50 +01:00
Gina Häußge
69412d0b8b Preparing release of 1.3.0rc2 part 2 2016-11-24 12:20:29 +01:00
Gina Häußge
01b221ab30 Prepare release of 1.3.0rc2 2016-11-24 11:08:43 +01:00
Gina Häußge
8ff1834442 Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
#	src/octoprint/translations/de/LC_MESSAGES/messages.mo
#	src/octoprint/translations/de/LC_MESSAGES/messages.po
#	translations/de/LC_MESSAGES/messages.mo
#	translations/de/LC_MESSAGES/messages.po
#	translations/messages.pot
 2016-11-22 13:49:19 +01:00
Gina Häußge
ec04364b47 Preparing release of 1.2.18rc1 2016-11-22 12:47:29 +01:00
Gina Häußge
1c57769af3 Merge branch 'maintenance' into devel 2016-11-08 15:27:33 +01:00
Gina Häußge
6976ac9edd Preparing release of 1.2.17 2016-11-08 11:31:16 +01:00
Gina Häußge
b38d1810dc Preparing release of 1.3.0rc1 2016-10-19 12:32:25 +02:00
Gina Häußge
c66be226b1 Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
 2016-10-17 14:24:17 +02:00
Gina Häußge
2f79d9d226 Preparing release of 1.2.17rc4 2016-10-17 12:25:51 +02:00
Gina Häußge
613363379f Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
#	src/octoprint/templates/javascripts.jinja2
 2016-10-13 17:17:44 +02:00
Gina Häußge
eabff453cd Preparing release of 1.2.17rc3 2016-10-13 16:12:57 +02:00
Gina Häußge
9de78001dd Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
#	docs/plugins/concepts.rst
#	src/octoprint/__init__.py
#	src/octoprint/server/__init__.py
#	src/octoprint/templates/javascripts.jinja2
#	src/octoprint/timelapse.py

Merge branch 'devel' into dev/wizard

# Conflicts:
#	octoprint_octobullet/__init__.py
#	octoprint_octobullet/templates/octobullet_settings.jinja2

Merge branch 'devel' into dev/wizard

# Conflicts:
#	octoprint_octobullet/__init__.py
#	octoprint_octobullet/templates/octobullet_settings.jinja2
 2016-10-13 14:22:40 +02:00
Gina Häußge
91ef5480b1 Preparing release of 1.2.17rc2 2016-10-13 12:12:09 +02:00
Gina Häußge
982d121d3b Revert "Preparing release of 1.2.17" 
This reverts commit 28de87441f.
 2016-10-12 18:36:41 +02:00
Gina Häußge
28de87441f Preparing release of 1.2.17 2016-10-12 16:50:22 +02:00
Gina Häußge
d802602e1e Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
 2016-10-06 16:21:13 +02:00
Gina Häußge
891fd18f0e Preparing release of 1.2.17rc1 2016-10-06 15:31:28 +02:00
Gina Häußge
aca3dfae49 Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
 2016-09-23 14:35:31 +02:00
Gina Häußge
354042b84d Preparing release of 1.2.16 2016-09-23 09:51:45 +02:00
Gina Häußge
650e1971d4 Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
#	src/octoprint/static/js/app/viewmodels/usersettings.js
 2016-09-16 14:11:43 +02:00
Gina Häußge
26fb208f48 Preparing release of 1.2.16rc2 2016-09-16 12:54:48 +02:00
Gina Häußge
2fc86e095f 1.2.16rc1 was actually pushed out on 2016-09-09, not -08 2016-09-12 12:49:04 +02:00
Gina Häußge
b6fbbb353a Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
#	src/octoprint/filemanager/storage.py
#	src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2
 2016-09-09 12:31:29 +02:00
Gina Häußge
079430e3c8 Preparing release of 1.2.16rc1 2016-09-09 11:52:56 +02:00
Gina Häußge
039412183c Merge branch 'maintenance' into devel 
Conflicts:
	CHANGELOG.md
 2016-07-30 09:57:31 +02:00
Gina Häußge
afdb98a92f Postponing the release of 1.2.15 until tomorrow 2016-07-29 21:50:45 +02:00
Gina Häußge
7b48270239 Preparing release of 1.2.15 2016-07-29 16:30:55 +02:00
Gina Häußge
aae01fe81b Merge branch 'maintenance' into devel 
Conflicts:
	CHANGELOG.md
	docs/api/fileops.rst
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/api/files.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/main.js
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/sidebar/state.jinja2
	src/octoprint/util/comm.py
 2016-07-28 15:00:23 +02:00
Gina Häußge
14969e5508 Preparing release of 1.2.14 2016-07-28 12:15:22 +02:00
Gina Häußge
b32c231c47 Merge branch 'maintenance' into devel 
Conflicts:
	CHANGELOG.md
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/static/js/app/viewmodels/gcode.js
 2016-06-21 16:10:02 +02:00
Gina Häußge
c70708e915 Fixed changelog for 1.2.13 
Will stay this way now for 1.2.13 though, already released. Follow up versions
should reflect the contents of the release notes however.
 2016-06-16 13:26:30 +02:00