Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: lektor/lektor-archive
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.3.0
Choose a base ref
...
head repository: lektor/lektor-archive
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Nov 27, 2015

  1. Copy the full SHA
    7b47035 View commit details
  2. Copy the full SHA
    97c827d View commit details
  3. Fixed file

    mitsuhiko committed Nov 27, 2015
    Copy the full SHA
    7845f2f View commit details
  4. windows fix for locate_executable

    Elias Zeitfogel committed Nov 27, 2015
    Copy the full SHA
    955df4c View commit details

Commits on Nov 28, 2015

  1. File copy fix and extension handling

    Elias Zeitfogel committed Nov 28, 2015
    Copy the full SHA
    c6e50b2 View commit details

Commits on Nov 29, 2015

  1. Added basic babel support

    mitsuhiko committed Nov 29, 2015
    Copy the full SHA
    f8ef57e View commit details
  2. Copy the full SHA
    fefd429 View commit details
  3. Copy the full SHA
    e66f5f5 View commit details
  4. Copy the full SHA
    dfbaf1b View commit details

Commits on Nov 30, 2015

  1. Copy the full SHA
    2855e70 View commit details
  2. Copy the full SHA
    863466f View commit details

Commits on Dec 1, 2015

  1. Added external URL support

    mitsuhiko committed Dec 1, 2015
    Copy the full SHA
    f625f90 View commit details

Commits on Dec 3, 2015

  1. Copy the full SHA
    923699b View commit details
  2. UNCACHED -> Ellipsis

    mitsuhiko committed Dec 3, 2015
    Copy the full SHA
    4d8dae9 View commit details

Commits on Dec 4, 2015

  1. Copy the full SHA
    ba3aaec View commit details
  2. Fixed type check

    mitsuhiko committed Dec 4, 2015
    Copy the full SHA
    ed3d62f View commit details
  3. Flip it around

    mitsuhiko committed Dec 4, 2015
    Copy the full SHA
    a6ab1a8 View commit details
  4. Copy the full SHA
    711ec5f View commit details
  5. Copy the full SHA
    df3862c View commit details

Commits on Dec 5, 2015

  1. Renamed method

    mitsuhiko committed Dec 5, 2015
    Copy the full SHA
    7057559 View commit details

Commits on Dec 6, 2015

  1. Copy the full SHA
    90c730c View commit details
  2. Fixed pagination

    mitsuhiko committed Dec 6, 2015
    Copy the full SHA
    e641fdd View commit details

Commits on Dec 12, 2015

  1. Updated EXIF code

    mitsuhiko committed Dec 12, 2015
    Copy the full SHA
    007d808 View commit details
  2. Improved source object code

    mitsuhiko committed Dec 12, 2015
    Copy the full SHA
    4aeaa7a View commit details
  3. Copy the full SHA
    1fbabc7 View commit details

Commits on Dec 13, 2015

  1. Renamed some attributes

    mitsuhiko committed Dec 13, 2015
    Copy the full SHA
    541b961 View commit details
  2. Added file contents support

    mitsuhiko committed Dec 13, 2015
    Copy the full SHA
    2f1313b View commit details
  3. Copy the full SHA
    9b71724 View commit details
  4. Rsync based on checksum

    mitsuhiko committed Dec 13, 2015
    Copy the full SHA
    20efeb4 View commit details

Commits on Dec 14, 2015

  1. Copy the full SHA
    d0fae4b View commit details
  2. Fixed broken dev server

    mitsuhiko committed Dec 14, 2015
    Copy the full SHA
    4b2b064 View commit details
  3. Changed plugin cli around.

    mitsuhiko committed Dec 14, 2015
    Copy the full SHA
    9b3924f View commit details
  4. Some cli cleanup

    mitsuhiko committed Dec 14, 2015
    Copy the full SHA
    90636e9 View commit details

Commits on Dec 15, 2015

  1. Force deps for history

    mitsuhiko committed Dec 15, 2015
    Copy the full SHA
    7b2c56b View commit details

Commits on Dec 16, 2015

  1. Fixed a typo

    mitsuhiko committed Dec 16, 2015
    Copy the full SHA
    8eb7915 View commit details

Commits on Dec 19, 2015

  1. Various random fixes

    mitsuhiko committed Dec 19, 2015
    Copy the full SHA
    da221be View commit details
  2. truncated readme

    mitsuhiko committed Dec 19, 2015
    Copy the full SHA
    d2ab208 View commit details
Showing with 2,410 additions and 20,274 deletions.
  1. +1 −0 MANIFEST.in
  2. +3 −38 README.md
  3. +20 −0 example/Example.lektorproject
  4. +0 −10 example/Website.lektorproject
  5. +0 −470 example/assets/static/css/bootstrap-theme.css
  6. +0 −1 example/assets/static/css/bootstrap-theme.css.map
  7. +0 −5 example/assets/static/css/bootstrap-theme.min.css
  8. +0 −6,332 example/assets/static/css/bootstrap.css
  9. +0 −1 example/assets/static/css/bootstrap.css.map
  10. +0 −5 example/assets/static/css/bootstrap.min.css
  11. 0 example/assets/static/css/style.css
  12. +0 −3 example/assets/static/css/style.less
  13. +0 −2,320 example/assets/static/js/bootstrap.js
  14. +0 −7 example/assets/static/js/bootstrap.min.js
  15. +0 −185 example/assets/static/js/fixedsticky.js
  16. +0 −9,789 example/assets/static/js/jquery.js
  17. +0 −13 example/assets/static/js/npm.js
  18. +0 −3 example/assets/static/js/script.js
  19. +42 −0 example/assets/static/style.css
  20. +7 −0 example/content/about/contents.lr
  21. +1 −0 example/content/blog/contents.lr
  22. +9 −0 example/content/blog/first-post/contents.lr
  23. +3 −7 example/content/contents.lr
  24. +9 −1 example/content/projects/contents.lr
  25. +0 −5 example/content/projects/flask/contents.lr
  26. +0 −5 example/content/projects/lektor/contents.lr
  27. +0 −10 example/flowblocks/image.ini
  28. +0 −14 example/flowblocks/quote.ini
  29. +0 −6 example/flowblocks/text.ini
  30. +29 −0 example/models/blog-post.ini
  31. +12 −0 example/models/blog.ini
  32. +1 −1 example/models/page.ini
  33. +0 −16 example/models/project.ini
  34. +0 −9 example/models/projects.ini
  35. +0 −9 example/packages/demo/lektor_demo.py
  36. +0 −15 example/packages/demo/setup.py
  37. +0 −11 example/templates/blocks/quote.html
  38. +0 −3 example/templates/blocks/text.html
  39. +6 −0 example/templates/blog-post.html
  40. +8 −0 example/templates/blog.html
  41. +25 −40 example/templates/layout.html
  42. +20 −0 example/templates/macros/blog.html
  43. +2 −1 example/templates/page.html
  44. +0 −10 example/templates/project.html
  45. +0 −10 example/templates/projects.html
  46. +25 −22 lektor/admin/modules/api.py
  47. +3 −4 lektor/admin/modules/common.py
  48. +1 −1 lektor/admin/modules/dash.py
  49. +144 −0 lektor/admin/modules/serve.py
  50. +2 −2 lektor/admin/package.json
  51. +1 −1 lektor/admin/static/js/components/Component.jsx
  52. 0 lektor/admin/static/js/components/{dialogSlot.jsx → DialogSlot.jsx}
  53. 0 lektor/admin/static/js/components/{serverStatus.jsx → ServerStatus.jsx}
  54. +8 −5 lektor/admin/static/js/main.jsx
  55. +10 −0 lektor/admin/static/less/main.less
  56. +7 −0 lektor/admin/templates/base.html
  57. +8 −0 lektor/admin/templates/build-failure.html
  58. +19 −16 lektor/admin/templates/dash.html
  59. +4 −0 lektor/admin/templates/layout.html
  60. +66 −12 lektor/admin/webui.py
  61. +0 −6 lektor/assets.py
  62. +54 −42 lektor/build_programs.py
  63. +324 −177 lektor/builder.py
  64. +69 −0 lektor/buildfailures.py
  65. +174 −42 lektor/cli.py
  66. +77 −2 lektor/context.py
  67. +7 −3 lektor/databags.py
  68. +8 −2 lektor/datamodel.py
  69. +111 −78 lektor/db.py
  70. +0 −1 lektor/devcli.py
  71. +15 −205 lektor/devserver.py
  72. +90 −22 lektor/environment.py
  73. +92 −0 lektor/filecontents.py
  74. +152 −32 lektor/imagetools.py
  75. +66 −0 lektor/packages.py
  76. +99 −0 lektor/pagination.py
  77. 0 lektor/plugins/__init__.py
  78. +0 −56 lektor/plugins/less.py
  79. +40 −18 lektor/pluginsystem.py
  80. +5 −0 lektor/project.py
  81. +209 −26 lektor/publisher.py
  82. +1 −19 lektor/quickstart-templates/project/@project_name@.lektorproject.in
  83. +1 −1 lektor/quickstart-templates/project/models/blog.ini.in
  84. +4 −1 lektor/quickstart-templates/project/templates/blog.html.in
  85. +15 −0 lektor/quickstart-templates/project/templates/macros/pagination.html.in
  86. +24 −5 lektor/reporter.py
  87. +61 −22 lektor/sourceobj.py
  88. +34 −34 lektor/types/flow.py
  89. +3 −3 lektor/types/formats.py
  90. +120 −21 lektor/utils.py
  91. +46 −26 lektor/watcher.py
  92. +2 −1 setup.py
  93. +11 −11 tests/test_db.py
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
recursive-include lektor/quickstart-templates *
recursive-include lektor/translations *
recursive-include lektor/admin *
recursive-exclude lektor/admin/node_modules *
41 changes: 3 additions & 38 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,4 @@
# Lektor
# Lektor Archive

Lektor is a static website generator. It builds out an entire project
from static files into many individual HTML pages and has a built-in
admin UI and minimal desktop app.

<img src="https://raw.githubusercontent.com/mitsuhiko/lektor/master/screenshots/admin.png" width="100%">

To see how it works look at the ``example`` folder which contains a
very basic project to get started.

**This is work in progress**

## How do I use this?

This is experimental stuff. If you really want to use it you better have
a Mac because that's right now the only thing that's really supported.

Downloadable releases are on github: [go to releases](https://github.com/mitsuhiko/lektor/releases)

If you want to use the command line version make sure to install it
as Python package into a virtualenv and to build the js files before:

$ pip install --editable .
$ make build-js

So how do you use it? Just launch the app and open a project like the
example project. If you installe the GUI and you want to get access to the
command line executables you can go to Lektor -> Install Shell Command.

Afterwards you can use the `lektor` executable from the command line.

To build projects:

lektor build

To open up the admin ui and dev server:

lektor server --browse
This repository is archived. The current version of it with
pruned history is [lektor/lektor](https://github.com/lektor/lektor).
20 changes: 20 additions & 0 deletions example/Example.lektorproject
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[site]
name = Example

# [alternatives.en]
# name = English
# primary = yes
#
# [alternatives.de]
# name = German
# url_prefix = /de/

# [servers.production]
# enabled = yes
# name = Staging
# target = rsync://myserver.com/path/to/website
#
# [servers.staging]
# enabled = yes
# name = Staging
# target = rsync://myserver.com/path/to/website
10 changes: 0 additions & 10 deletions example/Website.lektorproject

This file was deleted.

Loading