Websites
/
lektor-website
mirror of https://github.com/lektor/lektor-website.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
579 Commits 3 Branches 0 Tags 74 MiB
Commit Graph

579 Commits

Author SHA1 Message Date
Elias Zeitfogel eb60d390d4 Merge remote-tracking branch 'origin/feature/install-windows' into feature/install-windows 
# Conflicts:
#	assets/install.ps1
 2016-02-10 22:51:50 +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 e89d92950b Merge remote-tracking branch 'refs/remotes/origin/master' into feature/install-windows 2016-02-10 17:57:56 +01:00
Elias Zeitfogel 0caf39384e Added improvements from https://github.com/lektor/lektor-website/pull/70 2016-02-10 17:55:41 +01:00
Elias Zeitfogel 41edf6fa72 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/install-nix 2016-02-10 17:39:19 +01:00
Elias Zeitfogel 20325d89e2 Merge pull request #69 from jgomo3/master 
Minor typo fixed
 2016-02-10 09:23:36 +01:00
Armin Ronacher 95c40c77f3 Merge pull request #70 from doobeh/win-installer 
Win Installer > Delete Existing Installation [Yn]
 2016-02-09 13:55:00 -08: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
Jesús Gómez 5d5238ed54 Minor typo fixed 2016-02-07 22:54:39 -04:30
Elias Zeitfogel b9f7854f7c Merge pull request #68 from ajdavis/update-plugin-howto 
Update the "Adding Field Type" howto.
 2016-02-07 22:46:50 +01:00
A. Jesse Jiryu Davis 00b85759d9 Update the "Adding Field Type" howto. 
Closes #48.
 2016-02-07 07:00:14 -05:00
Elias Zeitfogel 4f08dc14d2 Merge pull request #67 from ajdavis/patch-7 
typo in "filter"
 2016-02-03 22:51:38 +01:00
Elias Zeitfogel 5f1933add9 Merge pull request #66 from ajdavis/patch-6 
Typo in "plugins/howto"
 2016-02-03 22:51:16 +01:00
A. Jesse Jiryu Davis 0a3ea7e567 typo in "filter" 2016-02-03 16:07:50 -05:00
A. Jesse Jiryu Davis 08a3b46ac3 Typo in "plugins/howto" 2016-02-03 15:58:33 -05:00
Elias Zeitfogel 428b27c957 Merge pull request #64 from ajdavis/patch-4 
Fix link from query to expression page.
 2016-02-02 09:28:23 +01:00
Elias Zeitfogel 85cd3e8bcf Merge pull request #65 from ajdavis/patch-5 
typo in "deployment/ftp"
 2016-02-02 09:27:14 +01:00
A. Jesse Jiryu Davis 7b4eec600c typo in "deployment/ftp" 2016-02-01 21:49:41 -05:00
A. Jesse Jiryu Davis 0dc883806e Fix link from query to expression page. 2016-02-01 06:34:41 -05:00
Armin Ronacher 481e85d4f4 Merge pull request #63 from ajdavis/get-siblings 
New get_siblings() method
 2016-02-01 01:32:51 -08:00
A. Jesse Jiryu Davis 0dc29c6bae Document new get_siblings() method. 
get_prev_sibling and get_next_sibling removed in https://github.com/lektor/lektor/pull/118
 2016-01-31 06:35:51 -05:00
A. Jesse Jiryu Davis ff03293abc Use new get_siblings() method. 
get_prev_sibling and get_next_sibling removed in https://github.com/lektor/lektor/pull/118
 2016-01-31 06:35:19 -05:00
Armin Ronacher d78db16dde Update contents.lr 2016-01-25 11:51:50 -08:00
Armin Ronacher 60f6f98287 Merge pull request #61 from ajdavis/included-excluded-assets 
included_assets and excluded_assets
 2016-01-25 11:46:25 -08:00
Armin Ronacher 7d5b521b5c Merge pull request #62 from ajdavis/patch-3 
Add Netlify publisher plugin.
 2016-01-25 11:46:09 -08:00
A. Jesse Jiryu Davis 2c8ad13d20 Add Netlify publisher plugin. 2016-01-25 05:01:01 -08:00
A. Jesse Jiryu Davis e538a8beb2 included_assets and excluded_assets 
Documents https://github.com/lektor/lektor/pull/129
 2016-01-24 08:58:18 -08:00
Armin Ronacher b081fd1383 Merge pull request #52 from item4/datetime 
datetime type and datetimeformat filter
 2016-01-24 08:54:48 -08:00
Armin Ronacher 1af1825d79 Merge pull request #59 from ajdavis/document-process-image 
Document process_image().
 2016-01-24 08:54:36 -08:00
A. Jesse Jiryu Davis c80637d044 Document process_image(). 2016-01-21 22:54:28 -08:00
Armin Ronacher 586e9c3154 Merge pull request #57 from adamwolf/patch-1 
Missing {% block body %} in example blog template?
 2016-01-19 15:57:56 -08:00
Armin Ronacher fa1cb9b207 Merge pull request #58 from lektor/feature/documentation 
Typo fixes
 2016-01-19 15:57:48 -08:00
Elias Zeitfogel 6a447d2240 Typo fixes 2016-01-19 23:44:09 +01:00
Adam Wolf a94057404f Missing {% block body %} in example blog template? 2016-01-18 14:01:30 -06:00
Armin Ronacher f1e9578f6e Merge pull request #55 from ajdavis/patch-1 
typo
 2016-01-17 01:17:14 +01:00
Armin Ronacher a9eca66d18 Merge pull request #56 from ajdavis/patch-2 
Add Surge publisher plugin.
 2016-01-17 01:17:06 +01:00
A. Jesse Jiryu Davis 4cdc6a1b6d Add Surge publisher plugin. 2016-01-16 17:56:23 -05:00
A. Jesse Jiryu Davis 7e60464d29 typo 2016-01-16 09:45:07 -05:00
Armin Ronacher 98bc3a88cb Merge pull request #54 from fschulze/correct-monthly-blog-archive-template 
Use the correct template for monthly archive.
 2016-01-14 11:07:46 +01:00
Florian Schulze e02db78f88 Use the correct template for monthly archive. 2016-01-14 09:29:15 +01:00
Armin Ronacher 2debe1a963 Added IRC logs and stuff. 2016-01-13 18:19:22 +01:00
Armin Ronacher 42651a8555 Fixed link to gitter. 2016-01-13 18:15:33 +01:00
Armin Ronacher fcb5297994 Added lektor/lektor to make it clear. 2016-01-13 18:07:30 +01:00
Armin Ronacher c310ecb341 Added IRC 2016-01-13 18:04:31 +01:00
Armin Ronacher b44b6e4510 Merge pull request #53 from doobeh/patch-1 
s/more/most/
 2016-01-13 18:03:43 +01:00