Commit Graph

55 Commits

Author SHA1 Message Date
Joseph Nix 9449a161ec [master] Flipping incorrect comment explaining try/except 2018-12-04 12:58:59 -06:00
Joseph Nix 408416a842 [lektor-619] Fixing https://github.com/lektor/lektor/issues/619, cuased by https://github.com/pypa/virtualenv/issues/1241 2018-12-04 12:48:16 -06:00
Joseph Nix b10d32fa51 [showcase-style-fixes] Fixing main container expanding in size on medium viewport, and cropping tall thumbnails on showcase page. 2018-06-08 16:32:45 -05:00
Joseph Nix af90510192 [pluginlist-update] Updated templates to final version with many updates, made project-data plugin more robust, tweaked some css and ran webpack again. 2018-05-14 16:41:39 -05:00
Joseph Nix 460693eccb [pluginlist-update] Adding lektor-tags for plugins, adding assets for another webpack build, plugin template tweaks. 2018-05-14 16:41:38 -05:00
Joseph Nix ae9e7090eb [pluginlist-update] Rerunning webpack, adding section to plugins/publishing explaining how to get your plugin listed, adding custom summary field to plugin model, adding Disqus to plugin pages, finishing project_data plugin and using it to fill out plugin page, finishing plugin page. 2018-05-14 16:41:38 -05:00
Joseph Nix 894b2471c3 [master] Fixing formatting error in print messages. 2018-01-30 12:15:17 -06:00
Joseph Nix 0a87bdb15b
Merge pull request #111 from singingwolfboy/code-nowrap
Prevent <code> blocks from wrapping lines
2018-01-17 17:50:31 -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
Евгений 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
Joseph Nix beb5c3d0f0 Fixing python 3 import of winreg in installer asset. 2017-08-16 15:36:12 -05:00
David Baumgold ca22f06a5b Fix Python 3 import problems in install scripts 2017-06-16 10:50:54 -04:00
Joseph Nix 63551fca17 Merge pull request #100 from singingwolfboy/py3
Document Python 3 support
2017-06-12 16:58:18 -05:00
Stuart Laughlin 502f36bcdb Allows Lektor to be installed without prompt by setting env var. 2016-10-11 12:07:16 -05:00
David Baumgold c3eeebdb18 Rerun webpack, commit results 2016-08-04 16:05:21 -04:00
David Baumgold e52d85abaf Updated NPM dependencies
* Updated devDependencies in package.json to their latest versions
  on NPM
* Added "babel-preset-es2015" to compile ES6 to ES5 before passing
  to UglifyJS, since Uglify can't handle ES6 yet
* Suppress warnings from UglifyJS
* Ran Webpack to regenerate assets
2016-07-22 16:41:01 -04:00
David Baumgold 0ecf8c4575 Add favicon 2016-07-22 11:22:23 -04:00
David Baumgold a98b2fe9f9 Document Python 3 support
Now that Lektor supports Python 3, we need to document this support.
This change is perhaps a bit extreme: it replaces all explicit
references to Python 2.7 with explicit references to Python 3.5.
However, it's a good start, and it can and should be reviewed before
being merged.
2016-06-02 21:55:55 -07:00
Armin Ronacher 3bcd146b44 Merge pull request #72 from lektor/feature/install-windows
Same dialog as in unix install script and small fixes
2016-03-17 17:27:44 +01:00
Elias Zeitfogel 718ea1b6b0 Fix prints 2016-02-10 19:31:53 +01:00
Elias Zeitfogel 6e8ffd9329 Same dialog is unix installation 2016-02-10 19:25:33 +01:00
Elias Zeitfogel 0caf39384e Added improvements from https://github.com/lektor/lektor-website/pull/70 2016-02-10 17:55:41 +01:00
Anthony Plunkett 0a6ac772ee More helpful user-actionable failure. 2016-02-09 17:47:11 -04:00
Anthony Plunkett 6db7d177ae Only try and delete if exists! 2016-02-09 17:36:22 -04:00
Anthony Plunkett f06f96cc3a Error reporting if deletion fails. 2016-02-09 17:28:51 -04:00
Anthony Plunkett 441b47fb55 in/== 2016-02-09 17:23:56 -04:00
Anthony Plunkett cc51dbe3b0 Windows reinstallation option (handy for upgrades). 2016-02-09 17:18:35 -04:00
Armin Ronacher 156c73df57 Imported new images 2016-01-09 10:27:02 +01:00
A. Jesse Jiryu Davis d015f8ce66 Add prev/next links to blog posts. 2016-01-06 16:53:47 -05:00
Armin Ronacher 9346ba5719 Improved gitter integration 2015-12-30 00:25:24 +01:00
Armin Ronacher 06a3f32639 Added showcase 2015-12-27 21:46:27 +01:00
Armin Ronacher 58be61f2c0 Fixes for mobile 2015-12-27 13:44:15 +01:00
Armin Ronacher 7b29ad6eb9 Update install.sh
Fixed a python detection bug.
2015-12-27 12:03:28 +01:00
Armin Ronacher eaeaec76ad Try python2 and python for the install script 2015-12-27 00:36:08 +01:00
Armin Ronacher bc74916054 Style updates 2015-12-26 20:17:07 +01:00
Armin Ronacher 7e72742bea banner -> page-banner because adblock -.- 2015-12-26 11:16:34 +01:00
Armin Ronacher d9e7456c45 Improved rendering of banners and simplified model 2015-12-26 10:52:00 +01:00
Elias Zeitfogel 283fbcd819 Merge pull request #25 from lektor/feature/install-nix
Ubuntu requirements and wiping previous installations on confirmation.
2015-12-25 13:34:10 +01:00
Armin Ronacher b260294f97 Added admonitions 2015-12-25 13:21:49 +01:00
Elias Zeitfogel 3f9daf0e0f Wiping previous installation upon confirmation 2015-12-25 12:26:52 +01:00
Armin Ronacher 325eb1fe7e Added publisher docs 2015-12-24 20:54:55 +01:00
Armin Ronacher 10fd87b3db Merge pull request #20 from lektor/feature/install-nix
Wiping previous lektor installations
2015-12-23 20:06:19 +01:00
Elias Zeitfogel 258c889679 Wiping previous lektor installations 2015-12-23 18:54:17 +01:00
Armin Ronacher 40858112a7 Blend in buttons to pop less 2015-12-23 12:33:31 +01:00
Armin Ronacher 736f53e4cb Updated installation docs 2015-12-21 13:22:49 +01:00
Armin Ronacher e0964fe6b4 Merge branch 'pr/1' 2015-12-21 13:16:02 +01:00
Armin Ronacher f0ecbc7e02 Design and license update 2015-12-20 21:37:07 +01:00
Elias Zeitfogel b206af8f50 Updated docu for windows and switched to pypi install. 2015-12-20 17:21:02 +01:00
Armin Ronacher 69da84811e Updated focus color for theme 2015-12-20 13:51:21 +01:00