Commit Graph

323 Commits

Author SHA1 Message Date
David Baumgold
aa47a4057b Merge pull request #136 from lektor/niijv-patch-1
Fix typo and change wording
2016-12-19 10:16:37 -05:00
Elias Zeitfogel
a9e58e4022 Update contents.lr 2016-12-19 16:10:15 +01:00
David Baumgold
f5dd02511c Merge pull request #135 from elJorno/patch-2
Fixed a mistake in code snippet
2016-12-17 08:41:59 -05:00
David Baumgold
2b4c9c8a0a Merge pull request #134 from elJorno/patch-3
Fixed a small typo
2016-12-17 08:41:39 -05:00
elJorno
a6ec88851d Fixed a small typo 2016-12-16 19:44:55 +01:00
elJorno
9abc4475d5 Fixed a mistake in code snippet
Fixed a mistake in the Fully Automatic Navigation example
2016-12-16 19:29:13 +01:00
David Baumgold
a572dbd954 Merge pull request #133 from elJorno/patch-1
Update contents.lr
2016-12-15 09:57:15 -05:00
elJorno
5827521025 Update contents.lr
Fixed a small typo
2016-12-15 15:53:33 +01:00
David Baumgold
875f594b6b Merge pull request #131 from lektor/update-webpack-support
Update lektor-webpack-support
2016-12-02 09:42:06 -05:00
David Baumgold
8a820b6cf5 Update lektor-webpack-support 2016-12-02 09:38:09 -05:00
David Baumgold
a92cc8caf6 Merge pull request #122 from ajdavis/rm-emptysquare
Remove emptysqua.re from showcase
2016-11-20 17:59:51 -05:00
David Baumgold
63e553f0f3 Merge pull request #125 from kwellman/yargies
Add yargies.com to showcase
2016-11-20 10:56:13 -05:00
Kenji Wellman
d04389edfa Add yargies.com to showcase 2016-11-10 15:28:00 -05:00
A. Jesse Jiryu Davis
51c00b93ca Remove emptysqua.re from showcase 2016-10-18 22:26:40 -04:00
David Baumgold
1d32e8aba8 Merge pull request #119 from wsvincent/master
Fix grammatical typos and iframe embed not working
2016-09-29 19:58:12 -04:00
William Vincent
3093309f7a iFrame embed not work, switch to link
Difficult to embed an iFrame in Markdown without various hacks. Propose
to just change to link for now.
2016-09-20 10:27:23 -04:00
William Vincent
ae9025399d Fix grammatical typos
A few small things...
2016-09-17 15:55:35 -04:00
Armin Ronacher
80168c8914 Merge pull request #114 from singingwolfboy/update-npm-deps
Updated NPM dependencies
2016-08-04 12:59:56 -07:00
Armin Ronacher
e9e28deb6f Merge pull request #115 from go-bears/master
#105 added rules of engagement
2016-08-04 12:59:43 -07:00
go-bears
70ad6069cb added Rules of Engagment text, adapted from Pallets project 2016-07-24 12:51:29 -07:00
go-bears
df3c0fd9f3 Merge pull request #1 from lektor/master
updating fork
2016-07-24 12:22:14 -07:00
Armin Ronacher
0f37f76bbe Mention dropbox 2016-07-23 21:41:25 +02: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
e9b6210dd6 Merge pull request #107 from anrie/master
Clarify docs on flowblocks templates
2016-07-22 15:47:30 -04:00
andreas
688a1e3830 Clarify docs on flow blocks templates 2016-07-22 21:38:33 +02:00
David Baumgold
c9419a2d0f Merge pull request #102 from aepsil0n/typo
Fix typo "net" → "next"
2016-07-22 12:04:03 -04:00
David Baumgold
88582f3029 Merge pull request #112 from singingwolfboy/close-li-tags
Close <li> tags
2016-07-22 12:03:10 -04:00
David Baumgold
10296444df Close <li> tags
Because valid HTML is better than invalid HTML
2016-07-22 11:47:12 -04:00
David Baumgold
1120f277c1 Merge pull request #110 from singingwolfboy/favicon
Add favicon
2016-07-22 11:26:21 -04:00
David Baumgold
0ecf8c4575 Add favicon 2016-07-22 11:22:23 -04:00
David Baumgold
f8dd2c30f6 Merge pull request #109 from singingwolfboy/fix-quickstart-video-iframe
Add quotations marks around HTML attribute
2016-07-22 11:11:31 -04:00
David Baumgold
39a2d9029b Add quotations marks around HTML attribute
So that mistune can parse it correctly. Fixes #106
2016-07-22 11:06:50 -04:00
Armin Ronacher
b6bb8ca700 Merge pull request #95 from humrochagf/patch-1
Add lektor-creative-commons plugin to plugin list
2016-07-08 14:01:02 +05:00
Armin Ronacher
c8eb4ac2b5 Merge pull request #103 from pjvandehaar/patch-1
Reduce awkwardness
2016-07-08 14:00:23 +05:00
Armin Ronacher
905b0fc121 Merge pull request #104 from go-bears/master
updated installation doc
2016-07-07 09:44:12 +05:00
go-bears
35f95d887a updated installation
added code to install python dependencies for Ubuntu
2016-07-01 16:29:23 -07:00
Peter VandeHaar
30e048628e Reduce awkwardness 2016-07-01 16:26:54 -04:00
Eduard Bopp
e3d829d312 Fix typo "net" → "next" 2016-06-28 11:51:19 +02:00
David Baumgold
a3e2125925 Merge pull request #99 from singingwolfboy/doc-travis-deploy
Update docs for Travis CI deploy
2016-06-02 21:36:39 -07:00
David Baumgold
8d8b490c39 Update lektor-atom to 0.2 2016-06-02 21:31:37 -07:00
David Baumgold
e0b64fc350 Update Travis deployment docs 2016-06-02 21:31:23 -07:00
David Baumgold
30d2ace8ee Merge pull request #93 from singingwolfboy/showcase-davidbaumgold.com
Showcase davidbaumgold.com
2016-06-02 16:56:44 -07:00
David Baumgold
be9d1464ce Python 3 compatibility 2016-06-02 16:49:48 -07:00
David Baumgold
3ce12545ec Add davidbaumgold.com to showcase 2016-06-02 16:49:44 -07:00
Armin Ronacher
adcb550c43 Merge pull request #98 from singingwolfboy/no-fail-ci
Don't fail a PR if it isn't deployed
2016-06-03 01:42:34 +02:00
David Baumgold
10010ced77 Use Travis deployment
Docs: https://docs.travis-ci.com/user/deployment/
2016-06-02 16:37:44 -07:00
David Baumgold
4d3482a698 Don't fail a PR if it isn't deployed 2016-06-02 16:23:53 -07:00
Elias Zeitfogel
c15c79f9be Merge pull request #96 from Priestch/master
typo fix in pad api documentation
2016-06-02 22:22:19 +02:00
Elias Zeitfogel
a799e0d08f Merge pull request #97 from joelgarzatx/fix-download-button
Fix URL for download button
2016-06-02 22:13:50 +02:00
Joel Garza
12db51573a Fix URL for download button
On the website when rate limiting is applied and link for latest version of lektor.app
cannot be retrieved, the fallback URL was Download/ and it should be Downloads/
2016-06-02 12:55:36 -07:00