Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Lower MAX_COMMENTABLES significantly and clean up whitespace | Johan Sørensen | 2010-01-29 | 1 | -27/+27 |
| | |||||
* | actually me able to turn off favorite email notification | Johan Sørensen | 2010-01-17 | 1 | -1/+5 |
| | |||||
* | Added a UI for managing whether to receive email when a feed item appears or not | Johan Sørensen | 2010-01-07 | 1 | -0/+34 |
| | | | | Flagging this is a per favorite setting and is opt-in | ||||
* | Allow users to filter the favorite watchlist | Johan Sørensen | 2009-12-15 | 1 | -0/+39 |
| | |||||
* | Make the javascripts powering favorite_button work with several elements on ↵ | Marius Mathiesen | 2009-12-08 | 1 | -10/+18 |
| | | | | | | the page The jQuery extension now calls a function on each element matched by the selector | ||||
* | Do not use Ajax for loading events, deleting now obsolete code | Marius Mathiesen | 2009-12-07 | 1 | -29/+0 |
| | |||||
* | Caching the current activity selection | Marius Mathiesen | 2009-12-03 | 1 | -5/+14 |
| | |||||
* | Include user favorites in Users#show | Marius Mathiesen | 2009-12-03 | 1 | -0/+23 |
| | | | | - Let the user toggle between his own activities and what he's watching on his own page | ||||
* | Favorites: GUI improvements, rename user accessor to events | Marius Mathiesen | 2009-12-03 | 1 | -1/+9 |
| | | | | | - Added waiting indicator when favoriting, added CSS classes - Renamed User#favorite_events -> User#events_in_watchlist | ||||
* | Giving test coverage to link helper | Marius Mathiesen | 2009-12-03 | 1 | -22/+35 |
| | |||||
* | Moving the form replacer into a testable jQuery plugin | Marius Mathiesen | 2009-12-03 | 2 | -33/+39 |
| | |||||
* | Hook into the create/delete actions for watching with some Ajax goodness | Marius Mathiesen | 2009-12-03 | 1 | -0/+34 |
| | | | | | | - Add a custom attr to the a tags - Replace the obtrusive Rails actions with some homebrew - Favorites#{create,destroy} now supplies a Location header intercepted by javascript | ||||
* | Call timeago() after each ajax call | Johan Sørensen | 2009-11-19 | 1 | -2/+3 |
| | | | | So any loaded html will have the proper timestamps set | ||||
* | Added a jQuery plugin for relative dates and use it instead of time_ago_in_words | Johan Sørensen | 2009-11-19 | 2 | -16/+170 |
| | | | | | | | | The plugin uses the clients timezone, and there's a helper named time_ago() that renders the proper markup. Use this helper whenever we'd normally be using time_ago_in_words. Also do a bit of whitespace sanitizing on the affected files | ||||
* | Enable clicking a comment to jump to the inline context. | Marius Mathiesen | 2009-11-16 | 1 | -0/+17 |
| | | | | - Also got back support for side by side rendering of diffs | ||||
* | Render the new comment and diffs when inline commenting on a commit | Marius Mathiesen | 2009-11-16 | 1 | -1/+1 |
| | | | | - Made partials/javascripts reusable between different inline commenting objects | ||||
* | Add an inline form to Commits#show | Marius Mathiesen | 2009-11-16 | 1 | -0/+3 |
| | | | | - moved same markup in merge request version to same partial | ||||
* | Some UX tweaks to the live search function | Marius Mathiesen | 2009-11-16 | 1 | -7/+18 |
| | | | | | - Performing an empty search resets the search form (no search, just display standard contents) - When no matches are found, render a div with class no-results-found (if any) | ||||
* | Escape HMTL tags in the liveSearch renderer | Johan Sørensen | 2009-11-12 | 1 | -8/+14 |
| | |||||
* | Tweak the repo searching a bit | Johan Sørensen | 2009-11-12 | 1 | -3/+10 |
| | | | | | - Only list 5 groups and users, not all of them, by default - Tweak the CSS a bit | ||||
* | Style the search field differently, adding a reset element to the DOM which ↵ | Marius Mathiesen | 2009-11-12 | 2 | -3/+34 |
| | | | | resets the form. | ||||
* | Keeping the line width reasonable | Marius Mathiesen | 2009-11-12 | 1 | -1/+2 |
| | |||||
* | Adding a waiting indication when performing a search, extract live search as ↵ | Marius Mathiesen | 2009-11-12 | 2 | -112/+116 |
| | | | | a reusable module | ||||
* | Test the live search renderer too | Marius Mathiesen | 2009-11-12 | 1 | -2/+2 |
| | |||||
* | Adding a liveSearch plugin, enable it on the repository listing | Marius Mathiesen | 2009-11-12 | 1 | -0/+158 |
| | | | | | | - The json rendering in Repositories#index is now done by the controller - Include a new js-file for live searching - Searching repositories in a project now matches repo description | ||||
* | Disable inline commenting if the diff is a rather large one | Johan Sørensen | 2009-11-10 | 1 | -0/+8 |
| | | | | | | Otherwise we'll trigger script warnings, or just be generally slow. 3500 wasn't chosen as a value, may need further tuning on machines with less "h-uumph". | ||||
* | If creating a merge-request comment, render two partials into a JSON structure | Johan Sørensen | 2009-11-10 | 1 | -1/+3 |
| | | | | | So we can update both the file-diff and the .comments div with the "normal" comment list | ||||
* | The <code> tag will handle escaping of the Comment#context | Johan Sørensen | 2009-11-06 | 1 | -2/+1 |
| | |||||
* | Merge remote branch 'gitorious/master' | Johan Sørensen | 2009-11-06 | 1 | -1/+1 |
|\ | | | | | | | | | | | * gitorious/master: When highlighting comment rows in the diff table, only inlude changed lines Fix stepping of activity lists with larger font sizes. | ||||
| * | When highlighting comment rows in the diff table, only inlude changed lines | Johan Sørensen | 2009-11-05 | 1 | -2/+2 |
| | | |||||
* | | Stop the line number selectable when it encounters a hunk seperator | Johan Sørensen | 2009-11-06 | 1 | -6/+6 |
| | | | | | | | | We don't want to inline comments to span across multiple hunks | ||||
* | | When highlighting comment rows in the diff table, only inlude changed lines | Johan Sørensen | 2009-11-06 | 1 | -2/+2 |
|/ | |||||
* | Make the inline comment list appear when a new comment is posted | Johan Sørensen | 2009-11-05 | 1 | -5/+13 |
| | |||||
* | Make Gitorious.DiffBrowser.CommentHighlighter methods less verbose | Johan Sørensen | 2009-11-04 | 1 | -9/+6 |
| | |||||
* | Moved rendering of the DiffSpinner into MergeRequestController.update() | Johan Sørensen | 2009-11-04 | 1 | -1/+1 |
| | | | | | Otherwise users would be left with a spinner and nothing happens if they select the same range as they're currently viewing | ||||
* | Keep the *-diff-hunks-state cookies around for longer than the session | Johan Sørensen | 2009-11-04 | 1 | -2/+2 |
| | |||||
* | Make sure CommentForm.setInitialCommentBody works with windows line-endings | Johan Sørensen | 2009-11-04 | 1 | -1/+1 |
| | |||||
* | Fix event callback scoping issues in CommentForm, and unbind all registered ↵ | Johan Sørensen | 2009-11-04 | 1 | -11/+17 |
| | | | | events on destroyAll() | ||||
* | xMake the inline diff comment form work in webkit | Johan Sørensen | 2009-11-04 | 1 | -35/+30 |
| | | | | | | | | | By not extracting+inserting the #inline_comment_form html into different places in the DOM, we avoid weird side-effects in webkit (and get a lot cleaner code too). The diff container (".file-diff") must now be passed explicitly to the CommentForm.display() method so that it knows which one to insert the resulting diff with new comment into. | ||||
* | cancel the selectable() in td.code as well | Johan Sørensen | 2009-11-04 | 1 | -1/+1 |
| | |||||
* | When click 'reply' in an inline diff comment, insert the original quoted msg | Johan Sørensen | 2009-11-04 | 1 | -1/+14 |
| | |||||
* | Don't prefix Comment#context with a '<' and render them in a blockquote | Johan Sørensen | 2009-11-04 | 1 | -1/+1 |
| | |||||
* | Re-enable the selectable shas when a new version has been loaded | Marius Mathiesen | 2009-11-04 | 1 | -2/+1 |
| | |||||
* | Add and use a Function.bind() for binding scope to the NotificationCenter ↵ | Johan Sørensen | 2009-11-04 | 4 | -31/+85 |
| | | | | | | | callbacks Instead of passing the receiver around, we're now responsible for binding the callback correctly when we add the observer | ||||
* | Move the comment editing JS into application.js and show a spinner when ↵ | Johan Sørensen | 2009-11-04 | 2 | -28/+34 |
| | | | | loading form | ||||
* | Store affected lines of an inline diff comment correctly | Johan Sørensen | 2009-11-04 | 3 | -37/+66 |
| | | | | | | | | | In order to be able to place the comment correctly in the diff we now store a tuple of [old_linenumber, new_line_number] along with the number of lines the comment spans. We store both the first and the last line number tuple so that we can calculate the placement of things generated outside the DOM tree (such as the InlineTableCallback diff rendering callback). | ||||
* | Selecting line numbers without text now works, line numbers are sorted correctly | Marius Mathiesen | 2009-11-04 | 2 | -3/+16 |
| | | | | | - Fetch line number from parent instead of text - Extended Array.prototype with min() and max() methods, use these to extract first and last line numbers | ||||
* | Make sure we re-render the diff correctly when commenting on single commit | Johan Sørensen | 2009-11-04 | 1 | -2/+1 |
| | |||||
* | Extract the inline-diff comment diff context when the comment is created | Johan Sørensen | 2009-11-04 | 1 | -36/+22 |
| | | | | | | | instead of extracting it on the client side each time the page is loaded, we load it into Comment#context when saving the comment. This both saves us from some heavy DOM traversing and makes the diff context stick when viewing comments from another merge request version | ||||
* | Make "standard" commenting work again on merge requests | Johan Sørensen | 2009-11-04 | 1 | -1/+2 |
| | | | | The comments collection needs to have a preview action defined in the routes | ||||
* | Support for editing comments for the author 10 minutes after creating them | Marius Mathiesen | 2009-11-04 | 1 | -0/+28 |
| | | | | | - A new link is displayed when hovering over an editable comment - Clicking on this loads the edit form, and makes it submit over ajax | ||||
* | Don't use a global variable for the iterator | Johan Sørensen | 2009-11-04 | 1 | -1/+1 |
| | | | | Otherwise we get fatal sideeffects | ||||
* | Fix inline commenting on a single commit | Johan Sørensen | 2009-11-04 | 1 | -13/+18 |
| | | | | | | | | | When a single commit is loaded we need to both update the magic data-merge-request-current-shas attribute as well as parse a single SHA properly with Gitorious.ShaSpec.parseShas() and add a testcase for it Also wrap some ungodly long line lengths. | ||||
* | When selecting a different version: replace both the sha listing and diff ↵ | Marius Mathiesen | 2009-11-04 | 2 | -6/+28 |
| | | | | | | | contents with fresh data from the server - shaListingReceived now accepts a caller/callback combo that will be called - Selecting a version only is different from selecting a version+sha | ||||
* | Always load the diffs when clicking another comment | Marius Mathiesen | 2009-11-04 | 1 | -7/+3 |
| | |||||
* | Insert the correct shas for selection when a new version is selected | Marius Mathiesen | 2009-11-04 | 1 | -0/+1 |
| | |||||
* | Fetch the correct diffs when selecting a comment from another version | Marius Mathiesen | 2009-11-04 | 2 | -3/+3 |
| | | | | Use the information about whether a new version was selected: if so, fetch new diffs | ||||
* | Only load diff within comments once | Marius Mathiesen | 2009-11-04 | 1 | -0/+4 |
| | |||||
* | Mark the current shas as selected when displaying a comment for another sha ↵ | Marius Mathiesen | 2009-11-04 | 2 | -6/+22 |
| | | | | range. | ||||
* | Do not log to the JS console | Marius Mathiesen | 2009-11-04 | 2 | -2/+1 |
| | |||||
* | Displaying a loading indicator when fetching versions and diffs from comments | Marius Mathiesen | 2009-11-04 | 1 | -0/+6 |
| | |||||
* | $.scrollTo did the trick for jumping to non-existing hrefs | Marius Mathiesen | 2009-11-04 | 1 | -0/+1 |
| | |||||
* | Don't reload diff display in replaceShaListing (=two XHRs) | Marius Mathiesen | 2009-11-04 | 1 | -1/+0 |
| | |||||
* | Use the sha spec from the dom instead of relying on the location hash | Marius Mathiesen | 2009-11-04 | 1 | -2/+1 |
| | |||||
* | Make sure diffBrowserCompactCommitSelectable is within scope for the ↵ | Marius Mathiesen | 2009-11-04 | 1 | -2/+2 |
| | | | | MergeRequestController | ||||
* | Reworked some of the scoping issues, clicking a comment in a given version ↵ | Marius Mathiesen | 2009-11-04 | 2 | -12/+17 |
| | | | | and sha range works | ||||
* | Position diff comment form with position:fixed | Johan Sørensen | 2009-11-04 | 1 | -4/+4 |
| | |||||
* | Clicking a comment in the listing should now update the display correctly | Marius Mathiesen | 2009-11-04 | 2 | -21/+51 |
| | | | | | | - first, we ensure the current version is being displayed - then we ensure the current sha range is being displayed - finally, we highlight the comment | ||||
* | Clicking a comment link will ask the controller to update, then goto comment ↵ | Marius Mathiesen | 2009-11-04 | 2 | -4/+29 |
| | | | | | | afterwards Using a closure for this, still need to fetch the correct shas | ||||
* | Use the power of the arguments builtin instead of passing around arrays | Johan Sørensen | 2009-11-04 | 2 | -12/+11 |
| | | | | | | | | | | This gives us a cleaner api, that actually works as expected Use a normal for-loop instead when notifying the observers, so we don't pass on the jQuery.each function as an argument to the callback. Furthermore, update the docs to actually match the code instead of being bollocks | ||||
* | Moving the fetching of sha listings for a version into the controller | Marius Mathiesen | 2009-11-04 | 2 | -12/+42 |
| | |||||
* | Speed up extraction and insertion of the diffs into comments | Johan Sørensen | 2009-11-04 | 1 | -14/+15 |
| | | | | | | * Don't use the DOM to filter out the HTML we don't want, it's slow * Use a simpler, and thus faster, DOM element lookup path * Use a normal for-loop instead of jQuery.each(), where it makes a difference | ||||
* | Put back back the setDiffBrowserHunkStateFromCookie observer and conform to ↵ | Johan Sørensen | 2009-11-04 | 2 | -19/+13 |
| | | | | | | | | observer api addObserver used to take a fourth argument (the initiator of the observer), but the calls to addObserver still passed this along after it was changed. | ||||
* | Handling errors when fetching diffs | Marius Mathiesen | 2009-11-04 | 1 | -29/+7 |
| | |||||
* | Re-enabling the insertion of comments | Marius Mathiesen | 2009-11-04 | 1 | -1/+3 |
| | |||||
* | Adding an anon object when adding observers for DiffBrowserDidReloadDiffs. | Marius Mathiesen | 2009-11-04 | 1 | -6/+11 |
| | | | | - The callback for inserting diffs into comments is commented out, will reenable once I find what causes it to crash | ||||
* | Refactor KeyNavigation into an object that acts less like a singleton | Johan Sørensen | 2009-11-04 | 1 | -41/+46 |
| | | | | | | | | Makes the Gitorious.DiffBrowser.KeyNavigation code easier to read without all the noise When we bind to the keypress event we pass along 'this' as the controller context | ||||
* | Make j/k keyboard shortcut jump between file diff hunks | Johan Sørensen | 2009-11-04 | 1 | -18/+52 |
| | | | | Listen on 'x' to toggle comments | ||||
* | Four spaces indent | Marius Mathiesen | 2009-11-04 | 1 | -457/+457 |
| | |||||
* | More work on the JS merge request constroller | Marius Mathiesen | 2009-11-04 | 1 | -9/+27 |
| | | | | | | - Tag the versions with version and URI for retrieval from javascript - Remove code comments in MergeRequestVersions#show - Include code comments in MergeRequests#show | ||||
* | Refactor the MergeRequestController, prepare for message-drivenness | Marius Mathiesen | 2009-11-04 | 1 | -0/+66 |
| | | | | - Support for RESET=true to test:javascripts (for resetting browsers) | ||||
* | Changed the NotificationCenter a bit | Marius Mathiesen | 2009-11-04 | 1 | -11/+6 |
| | | | | | - Arguments are passed when observers are notified - Observers know only of their receivers, not senders | ||||
* | Add an observer notification whenever we show the CommentForm in the diff ↵ | Johan Sørensen | 2009-11-04 | 1 | -5/+8 |
| | | | | browser | ||||
* | Be able to remove a single observer by sender from the NotificationCenter | Johan Sørensen | 2009-11-04 | 1 | -2/+17 |
| | |||||
* | Instead of NotificationCenter.defaultCenter(), use NotificationCenter | Johan Sørensen | 2009-11-04 | 2 | -29/+16 |
| | | | | | | If a custom notification center is needed, instantiate a new NotificationCenterManager. By getting rid of the defaultCenter() singleton, we save us some dull typing | ||||
* | Notify about the DiffBrowser{Did,Will}ReloadDiffs observer from ↵ | Johan Sørensen | 2009-11-04 | 1 | -5/+14 |
| | | | | | | Gitorious.DiffBrowser Also extract further DiffBrowser related callbacks out into observers | ||||
* | Use the NotificationCenter to notify when the diff browser diffs is reloaded | Johan Sørensen | 2009-11-04 | 2 | -3/+11 |
| | | | | So far, this is only being done when the commentform is posted | ||||
* | Add a NotificationCenter object to de-couple some of the javascript via ↵ | Johan Sørensen | 2009-11-04 | 1 | -0/+72 |
| | | | | | | | | observers While multiple NotificationCenters are supported, the NotificationCenter.defaultCenter() method is provided for a common default shared notification center. | ||||
* | Don't put local variables in the global scope | Johan Sørensen | 2009-11-04 | 1 | -4/+4 |
| | |||||
* | Add a space next to the '-' in the extracted diff | Johan Sørensen | 2009-11-04 | 1 | -1/+1 |
| | | | | Otherwise they will get missaligned | ||||
* | When POSTing a comment on a MR version, the controller renders the relevant ↵ | Marius Mathiesen | 2009-11-04 | 1 | -2/+4 |
| | | | | | | diff, which is displayed via JS - Needed to extract the diff browsing to a separate helper as other helpers include each other | ||||
* | Extract the raw diff that was commented on and insert above comment | Johan Sørensen | 2009-11-04 | 1 | -1/+29 |
| | | | | This makes it easier to quickly scan the diff comments in the comments list | ||||
* | use the jQuery.scrollTo plugin to scroll to diff comments | Johan Sørensen | 2009-11-04 | 2 | -1/+12 |
| | | | | It provides some nice additions and solves some of the edge-cases we had | ||||
* | fix jquery.gitorious_extensions.js to not have mac line-ending | Johan Sørensen | 2009-11-04 | 1 | -1/+119 |
| | | | | Not sure how it happened, but I'm blaming the `pbpaste` util for now.. | ||||
* | Append .js to JS file | Marius Mathiesen | 2009-11-04 | 1 | -0/+0 |
| | | | | - Also use lowercase path for case sensitive OSes | ||||
* | Search in parents for the one we really want, don't just assume position | Johan Sørensen | 2009-11-04 | 1 | -1/+1 |
| | |||||
* | Split up application.js into different files to make it easier to locate things | Johan Sørensen | 2009-11-04 | 6 | -837/+803 |
| | |||||
* | Make sure we don't have keyboard navigation active while we show the diff ↵ | Johan Sørensen | 2009-11-04 | 1 | -8/+8 |
| | | | | commentForm | ||||
* | Add an object for highlighting comments with associated lines so we reuse it | Johan Sørensen | 2009-11-04 | 1 | -12/+32 |
| | |||||
* | Give a visual clue while the comment is being saved | Marius Mathiesen | 2009-11-04 | 1 | -0/+2 |
| |