Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Diff for new files should be all green. #287

Merged
merged 693 commits into from
@braddunbar

When saving a new file, the diff should be all green (only added text). The diff looks weird when it shows the sample text.

before

All green is much better. \o/

after

Michael Aufr... and others added some commits
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
@domenkozar domenkozar Rewrite route regex to better handle directory names with dots 94034ba
Michael Aufreiter Updated 2012-06-20-internals.md 6130d75
Michael Aufreiter Smarter Jekyll or not determination.
Only files scoped within _posts and ending with a markdown file extension are considered Jekyll files.
af4a3c1
Michael Aufreiter Only show 'New File' link for authenticated users. fc9f312
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages 896a1c5
Michael Aufreiter Fixed the preceding newlines problem.
Closes #141.
b858019
Michael Aufreiter Updated Github.js. 903883e
Michael Aufreiter Merge pull request #137 from iElectric/patch-1
Rewrite route regex to better handle directory names with dots
59f2a57
Michael Aufreiter Fixed regex. 04109fa
Michael Aufreiter Merge branch 'refs/heads/master' into gh-pages c2a4b02
Michael Aufreiter Expressive error messaging, if there are issues with the Github API. 08b4498
Michael Aufreiter Show login screen when unauthenticated. e36831b
Michael Aufreiter Cleanup. a916da3
Michael Aufreiter Updated CodeMirror. eca847d
Michael Aufreiter Added support for GitHub Flavored Markdown. 57ad2ad
Michael Aufreiter State current version and link to README. 0783e01
Michael Aufreiter Updated README.md 2c080ec
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages 89f58ae
Michael Aufreiter Be smart about not existing metadata. 3ec12f4
Michael Aufreiter Added syntax highlighting for most common files. 484dedc
Michael Aufreiter Increase contrast. Fixes #119
@samanpwbb maybe you wanna further adjust. I'm on the master branch for the moment, just doing fixes.
e5a0a6a
Michael Aufreiter Added support for organizations. bf32ed5
Michael Aufreiter Added support for listing repositories of an org.
Or user.
cebc4b7
Michael Aufreiter Minor fixes. 8fbeede
Michael Aufreiter Consider default branch if no branch is provided. 9139b1b
Michael Aufreiter Fixed routing. 870a5bf
Michael Aufreiter Updated Github.js. Solves an encoding issue. 477e753
Michael Aufreiter Use dedicated route for profiles (user / organization). 2f5be11
Michael Aufreiter UI for organizations and user profiles. 63830a7
Michael Aufreiter Consider username in breadcrumbs. 8c5e26d
Michael Aufreiter Sort by updated timestamp. aed1442
Michael Aufreiter Error handling for empty repositories.
Closes #121
71ba9f3
Michael Aufreiter Added loading indicators.
Closes #154.
bf9a0ba
Michael Aufreiter Don't show parent link for root path. 7e90f1c
@samanpwbb samanpwbb fixed bad url in readme 3c7b048
@samanpwbb samanpwbb fixed bad url in readme caed9d6
@samanpwbb samanpwbb vertically centered text properly when browsing files. f46f6fb
Michael Aufreiter Fix routes.
Now routes conform to the GitHub URL scheme.
abb50e6
Michael Aufreiter Merge branch 'master' of github.com:prose/prose 0606846
@samanpwbb samanpwbb vertically centered text properly. b7071c2
@samanpwbb samanpwbb Merge branch 'master' of https://github.com/prose/prose f3d7853
@samanpwbb samanpwbb fitting organization icons to grid. ea80c99
Michael Aufreiter Allow manipulation of full filepath.
Fixes #129.
71945af
Michael Aufreiter Improved user profiles. c053226
Michael Aufreiter Spacing. 184d3e5
Michael Aufreiter Style loading indicator. 19066fd
Michael Aufreiter Tighten it up. 8532c07
Michael Aufreiter Tweaking. 6351e24
Michael Aufreiter Added loading spinner for landing page. a0ab796
Michael Aufreiter Fixed authentication issue. cdc5acd
Michael Aufreiter Improved profile. d605ac1
Michael Aufreiter Merge branch 'gh-pages' of github.com:prose/prose into gh-pages
Conflicts:
	_includes/routers/application.js
	_includes/vendor/github.js
32e45e0
Michael Aufreiter Complete merge. 75b170c
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
Michael Aufreiter Fixed an error with creating new files.
Closes #206.
08f64f1
Michael Aufreiter Update _config.yml 167fc87
Michael Aufreiter Implemented send patch workflow.
To be refined and better tested.
0fe47a6
@dhcole dhcole Updated _posts/help/2012-06-20-getting-started.md 759557e
@michael michael Code cleanup. 8819aec
@michael michael Fixed Github.js caching issue. c66a10e
@michael michael Merge remote-tracking branch 'origin/v0.4.0' into gh-pages ac77888
@michael michael Fixed a regression. 861f448
@michael michael Version bump. 1507ec6
@michael michael Updated Change Log. ca22921
@michael michael Fixed some flaws. 82940b1
@michael michael Call to action. "Contribute". 56e5e9f
@michael michael Wording. aefdc2a
@michael michael Hide metadata toggle if not authenticated. 823559a
@michael michael Properly encode URI component. 138cc38
Michael Aufreiter Updated _posts/help/2012-08-01-eventually-consistent.md ec62224
@michael michael Cells for the help section. a8ba5b6
Michael Aufreiter Updated _posts/help/2012-08-01-eventually-consistent.md dc05222
@michael michael Eventually consistent. 4941644
@michael michael Merge branch 'gh-pages' of github.com:prose/prose into gh-pages
Conflicts:
	_posts/help/2012-08-01-eventually-consistent.md
a95bf45
@vectorsize vectorsize Updated _posts/help/2012-08-01-eventually-consistent.md 7c0bf95
Michael Aufreiter Bump version. d72e5ba
@zauner zauner fixes typo a909a7d
Michael Aufreiter Merge pull request #214 from zauner/prose-patch
fixes typo
5cde1e1
Michael Aufreiter Merge pull request #213 from vectorsize/prose-patch
Updated _posts/help/2012-08-01-eventually-consistent.md
29324cc
@cjnash cjnash Updated _posts/help/2012-06-20-handbook.md c5f50ce
Michael Aufreiter Merge pull request #221 from cjnash/prose-patch
Updated _posts/help/2012-06-20-handbook.md
9d609df
@robinkraft robinkraft No more bonks - updated _posts/help/2012-08-01-eventually-consistent.md 8236ae8
Michael Aufreiter Cover "Edit in Prose" functionality. bb3d12a
Michael Aufreiter Merge pull request #222 from robinkraft/prose-patch
No more bonks - updated _posts/help/2012-08-01-eventually-consistent.md
48d9dc0
@jothelander jothelander Updated _posts/help/2012-08-01-eventually-consistent.md 69208c6
@DieBruder DieBruder Updated _posts/help/2012-06-20-prose-for-writers.md 174d4ab
Michael Aufreiter Merge pull request #228 from jothelander/prose-patch
Updated _posts/help/2012-08-01-eventually-consistent.md
58efb85
tashaschroeder Updated _posts/help/2012-08-01-eventually-consistent.md c7fe3ae
Michael Aufreiter Merge pull request #233 from tashaschroeder/prose-patch
Updated _posts/help/2012-08-01-eventually-consistent.md
e52957f
@dantranimal dantranimal Updated _posts/help/2012-06-20-internals.md 97da582
Michael Aufreiter Merge pull request #234 from soy714/prose-patch
Updated _posts/help/2012-06-20-internals.md
2b72ddd
@patcon patcon Removed org limitation from internals help doc.
Can now access org repos through prose.io interface without manual url entry.
12c1023
Michael Aufreiter Merge pull request #235 from myplanetdigital/gh-pages
Can now access org repos through prose.io interface without manual url entry.
eba4612
Michael Aufreiter Merge pull request #231 from DieBruder/prose-patch
Updated _posts/help/2012-06-20-prose-for-writers.md
c7ce1ff
@superdeluxesam superdeluxesam Updated _layouts/help.html f49bc49
Michael Aufreiter Merge pull request #242 from superdeluxesam/prose-patch
Updated _layouts/help.html
c5e7427
@aslakhellesoy aslakhellesoy Fix jekyll compilation, broken in bb3d12a84989e4cc55b72c91db1338267ff…
…b8fc7
86826d2
Michael Aufreiter Merge pull request #243 from cucumber/fix-jekyll-compilation
Fix jekyll compilation
4e71223
@basil3whitehouse basil3whitehouse Updated _posts/help/2012-06-20-getting-started.md ab009ac
Michael Aufreiter Merge pull request #249 from basil3whitehouse/prose-patch
Updated _posts/help/2012-06-20-getting-started.md
827f3c7
NN `readme.md` @ master: corrected github profiles links f6f2fae
Michael Aufreiter Merge pull request #274 from noformnocontent/patch-2
`readme.md` @ master: corrected github profiles links
61be013
@braddunbar braddunbar Diff for new files should be all green. d4dacf1
@braddunbar

Ping! Any opinions on this one?

@dhcole dhcole referenced this pull request from a commit
@dhcole dhcole Merge #287 86c5e83
@dhcole dhcole merged commit d4dacf1 into prose:gh-pages
@dhcole
Owner

Thanks @braddunbar! Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 6 additions and 6 deletions.
  1. +6 −6 _includes/views/post.js
12 _includes/views/post.js
@@ -42,12 +42,12 @@ views.Post = Backbone.View.extend({
if (this.metadataEditor) this.model.raw_metadata = this.metadataEditor.getValue();
if (!this.$('.button.save').hasClass('saving')) {
this.$('.button.save').html(this.model.writeable ? "SAVE" : "SEND PATCH");
- this.$('.button.save').removeClass('inactive error');
+ this.$('.button.save').removeClass('inactive error');
}
},
showDiff: function() {
- var text1 = this.prevContent;
+ var text1 = this.model.persisted ? this.prevContent : '';
var text2 = this.serialize();
var d = this.dmp.diff_main(text1, text2);
this.dmp.diff_cleanupSemantic(d);
@@ -57,13 +57,13 @@ views.Post = Backbone.View.extend({
_toggleCommit: function() {
if (!this.$('.document-menu').hasClass('commit')) {
- this.$('.commit-message').val("Updated "+$('input.filepath').val());
+ this.$('.commit-message').val("Updated "+$('input.filepath').val());
}
this.hideMeta();
this.$('.button.save').html(this.$('.document-menu').hasClass('commit') ? (this.model.writeable ? "SAVE" : "SEND PATCH") : "COMMIT");
this.$('.button.save').toggleClass('confirm');
- this.$('.document-menu').toggleClass('commit');
+ this.$('.document-menu').toggleClass('commit');
this.$('.button.cancel-save').toggle();
this.$('.document-menu-content .options').hide();
this.showDiff();
@@ -192,7 +192,7 @@ views.Post = Backbone.View.extend({
updateFilename: function(filepath, cb) {
var that = this;
-
+
if (!_.validPathname(filepath)) return cb('error');
app.state.path = this.model.path; // ?
app.state.file = _.extractFilename(filepath)[1];
@@ -241,7 +241,7 @@ views.Post = Backbone.View.extend({
patchFile(app.state.user, app.state.repo, app.state.branch, filepath, filecontent, message, function(err) {
if (err) {
- _.delay(function() {
+ _.delay(function() {
that.$('.button.save').html("SEND PATCH");
that.$('.button.save').removeClass('error');
that.$('.button.save').addClass('inactive');
Something went wrong with that request. Please try again.