valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,700 Commits 24 Branches 182 Tags 341 MiB
781880f0fc
Commit Graph

128 Commits

Author SHA1 Message Date
Colton Myers
c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2 
Conflicts:
    doc/_themes/saltstack2/layout.html
    doc/conf.py
    doc/index.rst
    doc/ref/modules/all/salt.modules.hipchat.rst
    doc/topics/releases/index.rst
    salt/client/ssh/client.py
    salt/cloud/clouds/vsphere.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_route53.py
    salt/modules/data.py
    salt/modules/http.py
    salt/modules/tls.py
    salt/output/compact.py
    salt/states/boto_elb.py
    salt/states/linux_acl.py
    salt/states/rabbitmq_user.py
    salt/states/win_servermanager.py
    salt/utils/dictupdate.py
    salt/wheel/config.py
 2015-05-29 15:10:13 -06:00
rallytime
d8daa9dcd7 Merge #24185 with a couple of fixes 
Refs #24185
 2015-05-27 15:25:27 -06:00
Jacob Hammons
0689815d0e Fixes for doc build errors 2015-05-27 11:40:31 -06:00
Jacob Hammons
1e1eb2b3ea added custom search for each branch, fixed style issues 2015-05-22 11:53:33 -06:00
Colton Myers
9dbafcc051 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/tls.py
 2015-05-20 11:59:59 -06:00
Jacob Hammons
31023c8915 Updates to sphinx saltstack2 doc theme 2015-05-19 15:54:28 -06:00
Jacob Hammons
81ed9c9f59 sphinx saltstack2 doc theme 2015-05-19 13:36:57 -06:00
Colton Myers
a87b057137 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.slack_notify.rst
 2015-05-19 09:53:58 -06:00
Nitin Madhok
9dc1e0b3ae Fixing sphinx errors and warnings 2015-05-18 12:12:07 -04:00
Jacob Hammons
46eb2655ee saltstack2 sphinx theme updates 2015-05-17 20:39:24 -06:00
Jacob Hammons
ee3c1bd4a7 missed one 2015-05-15 16:26:47 -06:00
Jacob Hammons
3872921dd0 More updates to sphinx2 theme 2015-05-15 16:26:11 -06:00
Jacob Hammons
8c32152be0 removed TOC numbering, additional tweaks to layout.html 2015-05-13 21:18:00 -06:00
Jacob Hammons
16d8a753ad saltstack2 sphinx theme and build settings 2015-05-11 17:29:12 -06:00
Dennis Hall
478f42d9b2 Change Github to GitHub 2015-02-15 15:19:54 +01:00
Colton Myers
f625c21d77 Merge branch '2014.7' into mergeforward 
Conflicts:
	salt/cloud/clouds/ec2.py
	salt/daemons/flo/worker.flo
	salt/master.py
	salt/minion.py
	salt/modules/lxc.py
	salt/states/win_update.py
	salt/states/zk_concurrency.py
 2014-10-30 17:42:36 -06:00
Thomas Jackson
9f7dac0674 Spelling fixes for docs 2014-10-28 08:12:27 -07:00
Seth House
872e3286c0 Swap out SaltConf15 sidebar image for one with better scaled fonts 2014-10-22 16:26:26 -06:00
Seth House
fc28d00056 Added SaltConf15 banner and links to sidebar 2014-10-14 19:44:36 -05:00
Seth House
b86e44bbd8 Updated training image 2014-07-21 17:56:55 -06:00
Christobot
a7d62f5b8f Add a fix for long lines. Fixes #13724 2014-06-25 12:57:09 -07:00
christobot
9786fe45d6 Add new styles for code blocks - addresses #13215 2014-06-24 22:30:09 -07:00
Christobot
3d4484d24a Fixed css fonts: 
The path was referenced after the css macro, and the css font names have
changed as well. I update all the weights and styles and fixed some
formatting/indenting issues
 2014-06-17 13:39:31 -07:00
Seth House
978e505b5f Updated Google Analytics tracking code 2014-05-22 16:56:02 -06:00
Seth House
7d484dc86a Restore trackalyzer stuff; opt-in within on_saltstack conditional 2014-05-19 18:29:09 -06:00
Seth House
d6b522a7f1 Add CSS styles to scroll content horizontally 2014-05-13 12:55:00 -06:00
Seth House
321d601022 Removed unused css file 2014-05-13 12:12:55 -06:00
Seth House
7c952dd98e Moved SaltStack events and news to SaltStack-specific sidebar template 2014-04-29 17:57:27 -06:00
Seth House
c3d4816275 Moved Salt version infos to its own sidebar template 2014-04-29 17:57:27 -06:00
Seth House
cf0b79322e Changed env var that denotes if we're building for docs.saltstack.com 
This one is a bit more descriptive.
 2014-04-29 17:57:27 -06:00
Seth House
7c59da6dce Added training graphic 2014-04-18 13:02:23 -06:00
Seth House
a58f122d3d Added training links to the sidebar 2014-04-18 12:52:25 -06:00
Seth House
fccd38b58b Set a variable if we're building for the live docs site or not 
This is useful to customize online / offline search and whether to
include things like Google Analytics.

Fixes #9875
 2014-04-17 17:40:55 -06:00
Seth House
d971b379a0 Replaced Lanyrd embed with link to events page 2014-03-27 10:54:12 -06:00
Pedro Algarvio
ef6bd18784 Update with proper perms 2014-03-23 18:05:05 +00:00
Seth House
89b6a322fc Removed old versions of the Salt logo 2014-03-21 13:51:53 -06:00
Seth House
3fe6bcf042 Removed trackalyzer JS; was returning a 403 and breaking our JS! 2014-03-04 16:20:20 -08:00
Seth House
bbb6893877 Add Glossary and Table of Contents to links header in docs 2014-02-26 18:57:23 -07:00
Mike Place
441c36f969 Update the footer to align with new .com site. 2014-02-11 14:13:12 -07:00
Joseph Hall
6413573dc5 Merge pull request #10177 from whiteinge/remove-saltconf-banner 
Remove saltconf banner
 2014-02-04 11:01:20 -08:00
Seth
475f165bf7 Revert "Added Saltconf banner to docs sidebar" 
This reverts commit 70be208bc5.

Conflicts:
	doc/_themes/saltstack/layout.html
 2014-02-04 11:40:20 -07:00
Joe Healy
6cc4c69716 Rename js file to make minified file relationship clear 2014-02-05 00:06:40 +11:00
Seth House
d6dd60af3a Added note that docs are for the development version 2014-01-02 15:40:57 -07:00
Seth House
9e22ca741a Added styles for the literate-doc directive 2013-12-23 06:02:12 -07:00
Seth House
15589daf1c Fixed docs template to not render sidebar div when no sidebars 2013-12-23 06:02:11 -07:00
Seth House
3bb83cd0b7 Added site verification code to enable Google's Webmaster tools 
Refs #8351
 2013-11-13 12:23:33 -07:00
Seth House
423bd77539 Shortened link text for docs for previous releases 2013-11-11 19:39:26 -07:00
Seth House
84165f8a51 Added link to RTD for previous version builds under main version link 
Fixes #8414
 2013-11-11 18:22:20 -07:00
Seth House
6725558738 Move image out of the theme folder to quiet sphinx warning 2013-11-02 11:54:37 -06:00
Thomas S Hatch
d7a8c5b5eb Merge pull request #8034 from cachedout/7748 
Non-minified version of modernizr-2.6.2-respond-1.1.0.min.js. Refs #7748...
 2013-10-25 09:35:00 -07:00
Colton Myers
6a359974b6 Merge pull request #8077 from cachedout/#7984 
Remove stale files in the docs dir. Refs #7984. Tested against a build a...
 2013-10-24 10:03:32 -07:00
Mike Place
82d6e28125 Remove stale files in the docs dir. Refs #7984. Tested against a build and walk-through of the HTML docs. 2013-10-24 10:09:37 -06:00
Mike Place
cedf587522 Stop shipping fonts in the docset. Start using free-fonts from Google and then fall-back to system fonts if those are not available. 2013-10-23 15:42:24 -06:00
Mike Place
da165cda8d Run yepnope through JSBeautify to unminify for Debian packaging. Refs #7748. 2013-10-23 10:28:45 -06:00
Mike Place
381ca634e9 Non-minified version of modernizr-2.6.2-respond-1.1.0.min.js. Refs #7748. 2013-10-22 20:07:58 -06:00
Seth House
6c23fdbfe1 Updated Saltconf sidebar graphic 2013-10-18 13:28:37 -06:00
Seth House
70be208bc5 Added Saltconf banner to docs sidebar 2013-10-17 17:44:53 -06:00
Seth House
9834a9afda Added SaltConf banner to main docs page 2013-10-17 12:36:19 -06:00
Pedro Algarvio
0f837d2702 Merge pull request #6811 from s0undt3ch/hotfix/absolute-imports 
Because of the recent salt sys module rename, force absolute imports.
 2013-08-20 16:11:41 -07:00
Pedro Algarvio
b6e7c6836e h3 was too big but it can be the same size of p nor h2. 2013-08-21 00:05:48 +01:00
Seth House
b8fa283b61 Added upcoming Salt presentations to sidebar 2013-08-19 17:21:39 -06:00
Erik Johnson
bc6c5fff17 docs: make "current release" a link to the release notes 2013-08-12 14:10:34 -05:00
Seth House
5ef97492ca Removed redundant .highlight style 
The Pygments .highlight-<lang> styles should be preferred. Thanks to
@terminalmage for the report.
 2013-07-22 14:10:03 -06:00
Thomas S Hatch
daa455a528 SaltStack not Salt Stack 2013-07-17 18:24:24 -06:00
Seth House
988b2e50e5 Added the current Salt release to the sidebar 2013-07-15 15:10:34 -06:00
Seth House
3781d8cdf4 Added leadlander code 2013-04-10 20:46:16 -06:00
Seth House
020f5acfe4 Fix placholder Google Analytics code 2013-04-09 12:34:21 -06:00
Erik Johnson
0d1a450e60 Remove unnecessary MacOS metadata file 2013-04-07 00:47:22 -05:00
Seth House
d18086af40 Tabs -> spaces 2013-03-29 13:20:22 -06:00
Seth House
ae5a4fec4f Fixed broken links at docs footer 2013-03-29 13:19:50 -06:00
Seth House
3c626f2bfd Tweak to force headings (only) to appear in custom font 2013-03-29 12:58:25 -06:00
Seth House
c50433556b Removed Nexa font from non-heading text 
Too thin; made reading difficult.
 2013-03-29 12:25:37 -06:00
Seth House
40631dc344 Blacklist old jQuery version that ships with Sphinx 2013-02-27 18:40:54 -07:00
David Boucha
8489f1484f Remove unneeded images for the docs 2013-02-26 15:55:26 -07:00
Seth House
57902fa267 Updated docs with new design 2013-02-26 12:22:03 -07:00
Seth House
259c8848b6 Restored saltstack theme 2013-02-26 12:22:03 -07:00
Seth House
45da8b9578 Removed custom Sphinx theme 
Preparing to move all docs to RTD.
 2012-02-08 03:20:41 -07:00
Seth House
4e3aacc813 Slight modifications to docs in preparation for rtfd.org 
Moved the html customizations into a proper theme and cleaned up the
configs to be useful for the default theme.
 2012-01-16 02:46:41 -07:00