Commit Graph

408 Commits

Author SHA1 Message Date
Joseph Nix 298522b1f2
Merge pull request #120 from sclaughl/master
Allows Lektor to be installed without prompt by setting env var.
2018-01-17 17:19:15 -06:00
Joseph Nix 885ddf2b08
formatting tweak 2018-01-17 17:18:31 -06:00
Joseph Nix fc4403d051
Merge branch 'master' into master 2018-01-17 17:17:33 -06:00
Joseph Nix e201fc8c75
Merge pull request #152 from madebr/webpack2
Upgrade webpack example in documentation to webpack v2
2018-01-17 17:10:21 -06:00
Joseph Nix ff5d148938
Merge pull request #116 from philippbosch/patch-1
Fix on_setup_env example code
2018-01-17 13:39:31 -06:00
Joseph Nix 8ecba4429f
Merge pull request #165 from rlaverde/themes-doc
Add documentation for themes.
2018-01-11 17:30:10 -06:00
Joseph Nix b98ef6c9ff
Capitalizing a subtitle 2018-01-11 17:28:04 -06:00
Joseph Nix c61ce28a4e
Further content tweaks to main themes page 2018-01-11 17:25:46 -06:00
Joseph Nix 6d5a0e0c01
Tweaks to themes packages 2018-01-11 17:15:45 -06:00
Joseph Nix 0cd18e7b5e
Tweaks to Theme Creating 2018-01-11 17:11:59 -06:00
Joseph Nix ae41c217ff
Tweaks to customizing themes page 2018-01-11 16:56:35 -06:00
Joseph Nix 8f8c0271a1
Capitalizing title 2018-01-11 16:53:29 -06:00
Joseph Nix 1b358cf3f7
Tweaks and more info on themes installation 2018-01-11 16:50:06 -06:00
Joseph Nix 724525623f
Updating text in main theme docs page
Added a little info and tweaks.
2018-01-11 14:27:04 -06:00
Joseph Nix 7898699ebb
Merge pull request #166 from lurebound/showcase-playwarwick
Add playwarwick.com to showcase
2018-01-10 18:26:16 -06:00
Joseph Nix 65a9bad0d7
Merge pull request #167 from BarnabyShearer/patch-1
Add `lektor-make` to the list of plugins
2018-01-10 18:12:26 -06:00
Joseph Nix d01c5af948
Merge pull request #168 from arkane0906/patch-1
Encoding issue with parsing response from https://pypi.python.org/pypi/virtualenv/json
2018-01-10 18:09:52 -06:00
Joseph Nix 2bef9af05a
Merge pull request #173 from dwt/patch-1
Looks legit to me. Thanks @dwt!
2018-01-10 18:05:40 -06:00
Joseph Nix 1d52102ae2
Merge pull request #171 from Limpan/fix/single-page-example
Fixed query in single page example.
2018-01-10 18:02:59 -06:00
‮rekcäH nitraM‮ 0c24d239c4
Link to different atom plugin GitHub profile
Seems the original author of the atom plugin doesn't work on it anymore - so the mantle has probably gone to me for now.

Not sure if this is the right way, but I propose listing my repo here now.
2018-01-03 11:16:13 +01:00
Joseph Nix 7041c1e1c2
Merge pull request #172 from Jossnaz/fix-image-access
/content/docs/templates/imageops fix .query to .get
2017-12-22 16:36:20 -06:00
lukas fd7c9c063b /content/docs/templates/imageops fix .query to .get 2017-12-21 22:45:27 -05:00
Joseph Nix 2e2923a7ac
Merge pull request #170 from Jossnaz/image-doc
/content/docs/templates/imageops added way to access single images an…
2017-12-21 15:41:47 -06:00
Linus Törngren b8da574e12 Fixed query in single page example. 2017-12-19 10:03:20 +01:00
lukas baaa63cafd /content/docs/templates/imageops added way to access single images and cross content folder image access 2017-12-13 08:59:40 -05:00
Евгений a434eb5333
Update install.sh
Fix to avoid "TypeError: the JSON object must be str, not 'bytes'" error while installing.

Traceback:
curl -sf https://www.getlektor.com/install.sh | sudo sh

Welcome to Lektor

This script will install Lektor on your computer.

Installing at:
  bin: /usr/local/bin
  app: /usr/local/lib/lektor

Continue? [Yn] y
Traceback (most recent call last):
  File "<stdin>", line 142, in <module>
  File "<stdin>", line 130, in main
  File "/usr/lib/python3.5/json/__init__.py", line 268, in load
    parse_constant=parse_constant, object_pairs_hook=object_pairs_hook, **kw)
  File "/usr/lib/python3.5/json/__init__.py", line 312, in loads
    s.__class__.__name__))
TypeError: the JSON object must be str, not 'bytes'
2017-11-19 12:19:49 +03:00
Barnaby Shearer aee2266687
Add `lektor-make` to the list of plugins
On the one hand this is the simplest possible plug-in, a few characters changed form the tutorial; on the other it is actually really useful.
2017-11-04 17:39:24 +00:00
Jacopo Cascioli f4a3a903e5 Add playwarwick.com to showcase 2017-11-04 18:24:08 +01:00
Rafael Laverde ad25b34460 Add documentation for themes. 2017-10-26 09:07:39 -05:00
Joseph Nix 7c0cb368fa Merge pull request #161 from lektor/lektor-website-160
[lektor-website-160] Fixing link to homepage source.
2017-08-28 12:34:38 -05:00
Joseph Nix 3663a19ed7 [lektor-website-160] Fixing link to homepage source. 2017-08-28 12:33:04 -05:00
Joseph Nix 239c20dad0 Merge pull request #158 from fschulze/patch-1
Add lektor-rst plugin
2017-08-23 09:59:37 -05:00
Florian Schulze bef05e1538 Update contents.lr 2017-08-23 13:39:42 +02:00
Joseph Nix beb5c3d0f0 Fixing python 3 import of winreg in installer asset. 2017-08-16 15:36:12 -05:00
Joseph Nix f84521da7e Merge pull request #155 from skorokithakis/patch-1
Add plugins
2017-08-14 16:02:15 -05:00
Joseph Nix e336200a85 Merge pull request #121 from eswarm/master
@eswarm Sorry this has hung out here forever! Merged.
2017-08-14 15:53:39 -05:00
Joseph Nix 64d27dffa8 Merge pull request #123 from enguerran/patch-1
Update documentation to fit to #240
2017-08-14 09:03:31 -05:00
Joseph Nix 3d22c7d9a0 Merge pull request #154 from drewja/patch-1
contents.lr double negative
2017-08-14 08:59:32 -05:00
Stavros Korokithakis 1acf3acd0c Add plugins 2017-07-14 11:55:01 +03:00
Andrew Arendt 5563b92a52 Update contents.lr
Easier to understand wording.
2017-07-13 11:50:16 -05:00
Joseph Nix e0e6b8633b Added text to encourage others to link their showcase to its source code. 2017-07-11 14:14:15 -05:00
David Baumgold ca22f06a5b Fix Python 3 import problems in install scripts 2017-06-16 10:50:54 -04:00
Anonymous Maarten 5f10829b6d Upgrade webpack example in documentation to webpack v2
See:
- https://webpack.js.org/guides/migrating
- http://javascriptplayground.com/blog/2016/10/moving-to-webpack-2/
- https://github.com/webpack/webpack/issues/3043
2017-06-14 19:55:04 +02:00
Joseph Nix 63551fca17 Merge pull request #100 from singingwolfboy/py3
Document Python 3 support
2017-06-12 16:58:18 -05:00
Dr. Tarique Sani 0aed16e221 Merge pull request #148 from mkjsix/patch-1
A simple Lektor plugin for gulp
2017-04-28 16:03:27 +05:30
Dr. Tarique Sani f59ec0ea9e Merge pull request #149 from marksteve/patch-1
Fix on_setup_env example
2017-04-28 16:02:11 +05:30
Mark Steve Samson 0b363747da Fix example 2017-04-25 15:22:00 +08:00
Maurizio Turatti 313653598c Update contents.lr
A simple Lektor plugin for gulp
2017-04-19 04:53:09 +02:00
Dr. Tarique Sani 56c0c566dc Merge pull request #146 from adamwolf/patch-2
s/arguemnts/arguements
2017-04-03 08:37:32 +05:30
Adam Wolf bac2e9724e s/arguemnts/arguements 2017-04-01 23:41:06 -07:00