Allow three consecutive hyphens in body, fixes #245. #262

Merged
merged 646 commits into from Mar 25, 2013

Conversation

Projects
None yet
7 participants
Contributor

benbalter commented Nov 17, 2012

Parsing the YAML front matter from a post body broke if the post itself contained three consequtive hyphens (e.g., a heading).

Make the regex less greedy to look for the first set of closing hyphens (rather than the last set).

Michael Aufreiter and others added some commits Jun 19, 2012

Michael Aufreiter Minors. ffa1958
@samanpwbb samanpwbb cleaned up header styles. b4de4f3
@samanpwbb samanpwbb resolving conflict. 6d8da90
@samanpwbb samanpwbb fixed layout issue in header. fef0467
@samanpwbb samanpwbb retooled header styles. 0fa334a
@samanpwbb samanpwbb more work on header. ff3439e
Michael Aufreiter Fixed error related to creating new files. 6f70a5f
@samanpwbb samanpwbb better position for the loader gif. 0ee1d1d
@samanpwbb samanpwbb Merge branch 'gh-pages' of https://github.com/prose/prose into gh-pages e5264f9
@samanpwbb samanpwbb reworked styles in preview, including new link styles and overall dar…
…ker text.
c4d94c1
Michael Aufreiter Include repo count. 6e7bf36
Michael Aufreiter Updated 2012-06-15-dear-github.md 7479279
@samanpwbb samanpwbb styled owner block. b826bf8
@samanpwbb samanpwbb Merge branch 'gh-pages' of https://github.com/prose/prose into gh-pages 4a0e25e
@samanpwbb samanpwbb everything works in firefox now. ac56ead
@samanpwbb samanpwbb Merge pull request #108 from prose/firefox-fixes
everything works in firefox now.
7d9aa5c
@samanpwbb samanpwbb fixed header problems. 072cad2
@samanpwbb samanpwbb Merge branch 'gh-pages' of https://github.com/prose/prose into gh-pages 94e2722
Michael Aufreiter Pluralization. 42a4307
Michael Aufreiter Removed transitions for cheatsheet/edit/preview. Better for power use…
…rs, less side-effects.
7fdeb1b
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages
Conflicts:
	_includes/styles/style.css
fcb96e1
Michael Aufreiter Updated 2012-06-14-handbook.md f0206e1
Michael Aufreiter Hide save button when not logged in. 1d64a1d
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages 22cec1b
@samanpwbb samanpwbb fixed position of logout button. ac76a2d
@samanpwbb samanpwbb Merge branch 'gh-pages' of https://github.com/prose/prose into gh-pages 9ec7956
@samanpwbb samanpwbb fixed login header button. 43239ef
Michael Aufreiter Updated 2012-06-14-handbook.md 1d1256b
@samanpwbb samanpwbb fixed problem with post preview code blocks. 0162c69
Michael Aufreiter Updated 2012-06-14-internals.md 88b3d23
@samanpwbb samanpwbb Merge branch 'gh-pages' of https://github.com/prose/prose into gh-pages 6c7d94b
Michael Aufreiter Updated 2012-06-14-internals.md 1225995
Michael Aufreiter Updated 2012-06-14-handbook.md cabec22
Michael Aufreiter Fixing metadata troublez. a228fa6
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages a187bb2
@samanpwbb samanpwbb optimized images + made new sprite. 4132d1f
Michael Aufreiter Deleted _posts/help/2012-06-17-your-filename.md e1c35bf
Michael Aufreiter Added brand-new screenshots. 2131f2c
Michael Aufreiter Fix metadata troublez. Closes #107. 2de2966
Michael Aufreiter Updated 2012-06-14-about.md a61f32e
Michael Aufreiter Better screenshots. a43b936
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages bc64074
Michael Aufreiter Screenshot for Github App Settings. a360709
Michael Aufreiter Updated 2012-06-15-getting-started.md 4927974
Michael Aufreiter Prose Bootstrap. de69fda
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages 7277003
Michael Aufreiter Updated 2012-06-15-getting-started.md 49179c4
Michael Aufreiter Help thumbnails. b754eaf
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages d346782
Michael Aufreiter Updated 2012-06-14-handbook.md adb4547
Michael Aufreiter Updated 2012-06-14-internals.md dd57a4c
Michael Aufreiter Deleted _posts/help/2012-06-20-getting-started.md 9157ac7
Michael Aufreiter Updated 2012-06-20-getting-started.md 7c459ac
Michael Aufreiter Polish. 4982bbe
Michael Aufreiter Updated 2012-06-20-handbook.md 5804a8c
@samanpwbb samanpwbb fixed favicon. 0a2112f
@samanpwbb samanpwbb Merge branch 'gh-pages' of https://github.com/prose/prose into gh-pages 7365158
Michael Aufreiter Updated 2012-06-20-handbook.md 7647d91
Michael Aufreiter Updated 2012-06-20-blogpost.md 4a25111
Michael Aufreiter Updated 2012-06-20-internals.md 598a237
Michael Aufreiter Updated 2012-06-20-blogpost.md 62b66ad
Michael Aufreiter Updated App settings dialogue. da086fb
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages 4acf402
Michael Aufreiter Updated 2012-06-20-internals.md d17fcee
Michael Aufreiter Updated 2012-06-20-internals.md 398abbd
Michael Aufreiter Updated 2012-06-20-blogpost.md 34a78a0
Michael Aufreiter Wording. 1af883a
Michael Aufreiter Teas0r. 3deeaa6
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages cb221b4
@samanpwbb samanpwbb added border to about section articles. 24a2142
Michael Aufreiter Baseurl troubles. f521a29
Michael Aufreiter Initialize both CM instances on a div and overcome tipsiness, when sh…
…owing hiding them.
e2e844d
Michael Aufreiter Update gh-pages d45c5c2
Michael Aufreiter No longer be picky with the filename. 85cfa1f
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages 26f3bd5
Michael Aufreiter Error handling for file deletion. 217a947
Michael Aufreiter Smart caching of Github.Repository instance, to prevent non-fast-forw…
…ard update issue.
5c0709d
Michael Aufreiter Deleted _posts/help/2012-06-20-dear-github.md 831826d
Michael Aufreiter Fixed a small bug. 543b321
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages b0bc100
Michael Aufreiter Allow file deletion within the root directory. Closes #116. 56496a9
Michael Aufreiter Use chunked path for more pleasant navigation.
Closes #96.
ae6069a
Michael Aufreiter Better error handling.
Closes #113.
8265cb5
Michael Aufreiter Use proper commit message for newly created files. adc6d63
Michael Aufreiter Updated logo. 7aa2403
Michael Aufreiter Cleanup. 0d7b3e0
Michael Aufreiter New Post -> New File e05625c
Michael Aufreiter Fixed minor UI flaw with paths when creating a new file. 3145438
Michael Aufreiter Wording on the startpage. e1aabcb
Michael Aufreiter Updated Github.js. ecdbbc7
Michael Aufreiter Error handling for files that don't exist. e99af05
Michael Aufreiter Added links to the source code and Twitter. 948c191
Michael Aufreiter Logo Versions. 16cbba8
Michael Aufreiter Back to minimum clutter. 8bb40af
@samanpwbb samanpwbb fixed loader gif cutoff. e2a11d8
Michael Aufreiter Wording. 26590ba
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages 30c7854
Michael Aufreiter Update gh-pages 660ee0a
@sillygwailo sillygwailo Capitalization of GitHub. Also, to/too. cd07888
@samanpwbb samanpwbb Merge pull request #130 from sillygwailo/gh-pages
Capitalization of GitHub. Also, to/too.
b8e238d

Michael Aufreiter and others added some commits Jul 6, 2012

Michael Aufreiter Updated README.md c434140
Michael Aufreiter Added screenshots. 7c584a2
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages f509935
Michael Aufreiter Updated _posts/help/2012-06-20-prose-for-writers.md 84449d2
Michael Aufreiter Updated _posts/help/2012-06-20-prose-for-writers.md e9e5b8a
Michael Aufreiter Updated _posts/help/2012-06-20-prose-for-writers.md c47587f
Michael Aufreiter Added screenshot explaining how subfolders work. 5e1299f
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages 27958b6
Michael Aufreiter Updated _posts/help/2012-06-20-prose-for-writers.md 47c90e1
Michael Aufreiter Updated _posts/help/2012-06-20-prose-for-writers.md 6797b05
Michael Aufreiter Updated _posts/help/2012-06-20-prose-for-writers.md 1f1aa49
Michael Aufreiter Updated _posts/help/2012-06-20-prose-for-writers.md 6f43679
Michael Aufreiter Prose for writers (thumbnail) 3a8e412
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages 93db114
Michael Aufreiter Updated _posts/help/2012-06-20-prose-for-writers.md 0bdc7f9
Michael Aufreiter Updated _posts/help/2012-06-20-prose-for-writers.md 77755e8
Michael Aufreiter Update gh-pages a848958
@samanpwbb samanpwbb Fixed Firefox layout problem 25cb88d
@samanpwbb samanpwbb replaced loader gif with a version with a transparent background. 09b2117
@lxbarth lxbarth Link to prose.io handbook instead of /prose/help. f169c16
@NSinopoli NSinopoli Minor typo adjustment. c8fdb69
Michael Aufreiter Merge pull request #178 from NSinopoli/patch-1
Minor typo adjustment.
3c4a28d
Michael Aufreiter Error handling.
Fixes #176.
e7377d5
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages f2535a0
Michael Aufreiter Some mockups. 35680f9
Michael Aufreiter Added Google diff-match-patch. 6d7f77c
Michael Aufreiter Implemented save/review/commit workflow.
Also shows the diff of a file.
76d9490
Michael Aufreiter Smarter metadata parsing. 889dd23
Michael Aufreiter Show document controls only when needed.
Also, default to preview mode when not authenticated. Closes #186.
23a514f
Michael Aufreiter Full refresh on logout solves edge cases. ab64946
Michael Aufreiter Fixes an issue with code wordwrap.
Closes #188.
dcf45bf
Michael Aufreiter Merge branch 'gh-pages'
Conflicts:
	_includes/templates/post._
023371a
Michael Aufreiter Updated handbook. 2fcc3d5
Michael Aufreiter Updated handbook. 501e2df
Michael Aufreiter Metadata parsing modifications. e2727d0
Michael Aufreiter Updated _posts/help/2012-06-20-prose-for-writers.md d3c4e36
Michael Aufreiter Insert new silly code to get rid of old silly code that caused silly …
…behavior.
10d181d
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages ba9191e
Michael Aufreiter Merge branch 'gh-pages' 4c4bfa3
Michael Aufreiter Update gh-pages a6e6550
Michael Aufreiter Implemented search b93bd2d
Michael Aufreiter Use keyup event intead of keypress. af340e4
Michael Aufreiter Remove paragraph characters from changeset display. 5532c9c
Michael Aufreiter Implemented less obtrusive and clearer branch switching. 31085f5
Michael Aufreiter Better styles for the commit dialogue. b2c4496
Michael Aufreiter Case-insensitive search. ea3c5fc
Michael Aufreiter Move new file button to the posts menu. 131fbd8
Michael Aufreiter Improved search bar. 4850dc5
Michael Aufreiter Updated Github.js. Dropped jQuery dependency and adds support for gists. dfc5780
Michael Aufreiter Updated Github.js. 35c9d2b
Michael Aufreiter For folders, use name provided by the model. 57d56a0
Michael Aufreiter Search implementation. Final touches. be9de34
Michael Aufreiter Better UI for navigating to the parent folder. f1a5d96
Michael Aufreiter Get the diff-wrapper out of the .surface scope to avoid side-effects. 5efe376
Michael Aufreiter Add a class indicating that a repo is private. edd32bc
Michael Aufreiter Version bump. 805c7aa
Michael Aufreiter Updated CodeMirror. 6eca789
Michael Aufreiter Get rid of all YAML parsing bits. ad3a8b1
Michael Aufreiter Bring in line-numbers and style bumping. 8321d51
Michael Aufreiter Code is king. fa8779d
Michael Aufreiter Much improved editing UX.
We use individual scroller per CodeMirror instance now in editing mode, which fixes numerous issues.

Closes #172 Closes #177 Closes #166 Closes #184
7dd7489
Michael Aufreiter Smaller UI fixes. f1ac29b
Michael Aufreiter Fixed regression. f4712c1
Michael Aufreiter Move breadcrumbs and branch selection to the filebrowser. c5dc7ec
Michael Aufreiter Added browse-files back button. 627ca00
Michael Aufreiter Minor tweaks. 8996916
@samanpwbb samanpwbb cleaned up file browser toolbar + added new icons to sprite. 414e7e1
@samanpwbb samanpwbb fixed conflict. 2eca65f
@samanpwbb samanpwbb styled file browser toolbar. 345ac7d
@samanpwbb samanpwbb added new cancel icon to commit menu. 41f0888
@samanpwbb samanpwbb adding dropdown icon. c288a23
Michael Aufreiter Path navigation plus branch switcher in file browser. 4015a02
Michael Aufreiter Merge branch 'v0.3.0' of github.com:prose/prose into v0.3.0 e81313f
@samanpwbb samanpwbb styled codemirror editor background colors. 56c9247
@samanpwbb samanpwbb Merge branch 'v0.3.0' of https://github.com/prose/prose into v0.3.0 882a7c8
Michael Aufreiter Restyled search-bar with less clutter. 36d7314
Michael Aufreiter Merge branch 'v0.3.0' of github.com:prose/prose into v0.3.0 0b19b61
Michael Aufreiter Tweaking diff display. cc5d10a
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into v0.3.0 9a1ae0a
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages e3a2f4e
Michael Aufreiter Bring back the right config file. 06e73c0
Michael Aufreiter Updated README.md 9f7904b
Michael Aufreiter Updated _includes/views/post.js 7e17187
Michael Aufreiter Fixed commit message behavior. 61fb731
Michael Aufreiter Merge branch 'v0.3.0' into gh-pages e8fb5e8
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages 345d877
Michael Aufreiter Ah well, make it work with the green-ish background too. 921c268
Michael Aufreiter Merge branch 'master' into gh-pages c7f70e6
@samanpwbb samanpwbb Update _includes/styles/style.css ce33681
Michael Aufreiter Updated GitHub.js to fix a bunch of mad errors. e3b5f97
Michael Aufreiter Include gist scope. As we'll need that soon. 4ab0101
Michael Aufreiter Merge branch 'master' into gh-pages d927638
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages 942084e
Michael Aufreiter Edge-case business. 2f9c261
Michael Aufreiter Apply local env to _config.yml. a210dcb
@benbalter benbalter Allow three consecutive hyphens in body, fixes #245.
Parsing the YAML front matter from a post body broke if the post itself contained three consequtive hyphens (e.g., a heading).

Make the regex less greedy to look for the first set of closing hyphens (rather than the last set).
c063a71
@benbalter benbalter Force initial three hyphens to be the first three characters of the f…
…ile.

This make the regex more robust, and prevents accidental parsing of non YAML triple hyphen pairs.
06da1a3

@dhcole dhcole added a commit that referenced this pull request Mar 25, 2013

@dhcole dhcole Merge #262 943b3d4

@dhcole dhcole merged commit 06da1a3 into prose:gh-pages Mar 25, 2013

@dhcole dhcole added a commit that referenced this pull request Mar 25, 2013

@dhcole dhcole Fix regression in #262 2d4a634
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment