Commit Graph

455 Commits

Author SHA1 Message Date
Armin Ronacher
6190bb6061 Merge pull request #85 from a2csuga/master
Fix manual deployment command for S3
2016-03-28 10:48:15 +02:00
Armin Ronacher
d06b288ca9 Merge pull request #84 from ChillarAnand/patch-1
Add lektor-tags plugin to list.
2016-03-28 10:47:58 +02:00
Atsushi Suga
f04d14dee2 Fix manual deployment command for S3
Slash and asterisk (/*) must be required to specify source path
otherwise uploading cache directory itself.
2016-03-25 00:50:41 +09:00
Anand Pandikunta
a68fe53c73 Add lektor-tags plugin to list. 2016-03-23 08:19:47 +05:30
Armin Ronacher
78784cd34f Added missing version info for datetime. This fixes #82 2016-03-17 17:29:26 +01: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
Armin Ronacher
702e262934 Merge pull request #71 from lektor/feature/install-nix
Adding improvements from windows install on unix install (https://github.com/lektor/lektor-website/pull/70)
2016-03-17 17:27:21 +01:00
Armin Ronacher
4ed3604b21 Merge pull request #81 from jacobpewitt/patch-1
Fixed a typo in the example
2016-03-17 17:26:45 +01:00
Armin Ronacher
fe443c1b55 Merge pull request #83 from nickfun/readme-update
note version required in readme
2016-03-17 17:26:36 +01:00
Armin Ronacher
5edfa756ae Added blogpost for RGSOC 2016-03-17 17:26:18 +01:00
Nick F
60aba3f1d3 note version required in readme 2016-03-10 10:59:51 -08:00
Armin Ronacher
85ea49759c Fixed date for blog post 2016-03-10 13:14:33 +01:00
Armin Ronacher
7585bd082e Added road to lektor 2 2016-03-10 13:14:07 +01:00
Armin Ronacher
c2850b17ba Added documentation for cropping 2016-03-10 12:27:44 +01:00
Armin Ronacher
46194503c6 Added get-alts 2016-03-10 12:23:37 +01:00
Elias Zeitfogel
44fc07e7e7 Merge pull request #79 from marksteve/master
Add PyCon PH 2016 to showcase
2016-03-05 03:15:35 +01:00
Mark Steve Samson
5d3fbbbcb6 Add PyCon PH 2016 to showcase 2016-03-05 09:41:40 +08:00
Jacob Pewitt
dc43b9a912 Fixed a typo in the example
It said type = text instead of type = html
2016-03-04 16:45:38 -05:00
Elias Zeitfogel
ab12d0a9d4 Merge pull request #80 from vassudanagunta/master
fix typos
2016-03-04 17:00:03 +01:00
Vas Sudanagunta
252fb8ba9d fix typos 2016-03-04 00:20:43 -05:00
Elias Zeitfogel
d5ccf07318 Merge pull request #75 from vassudanagunta/master
Clearer and more succinct explanation of slugs.
2016-03-03 21:05:41 +01:00
Elias Zeitfogel
575dcc06ad Merge pull request #76 from mmaybeno/clarify_ftps
Change sftp example to ftps example
2016-03-03 20:30:13 +01:00
Matt Maybeno
f5aa2b69ea Change sftp example to ftps example
Changing the example to use ftps reflects the explanation in the
documentation as well as what is actually used in publisher.py.

Related to https://github.com/lektor/lektor/issues/50
2016-02-24 08:40:55 -08:00
Vas Sudanagunta
3b301f8fcb Clearer and more succinct explanation of slugs. 2016-02-17 00:07:17 -08:00
Elias Zeitfogel
9f8b6bb448 Merge pull request #73 from gunbei/fix-typos-misspellings-duplicate-words
Fix typos, misspellings, duplicate words
2016-02-12 09:39:16 +01:00
Gunbei
a28217c251 Fix typos, misspellings, duplicate words 2016-02-12 00:08:53 +01:00
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