Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixes bug with commenting on merge requestsclosing-mr-bug-fix | Jacob Schatz | 2016-01-13 | 1 | -0/+4 |
| | |||||
* | removes commented out code. | Jacob Schatz | 2015-12-30 | 1 | -2/+0 |
| | |||||
* | adds ajax to bottom discussion buttons. Now submits issue and closes via ajax. | Jacob Schatz | 2015-12-29 | 1 | -14/+2 |
| | |||||
* | base implementation of emoji picker [ci skip] | Valery Sizov | 2015-12-22 | 1 | -1/+1 |
| | |||||
* | Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master' | Robert Speicher | 2015-12-11 | 1 | -8/+16 |
|\ | | | | | | | | | | | | | | | Fix delete notes on merge request diff Fixes #3971 See merge request !2061 | ||||
| * | Remove note from MR discussion when deleting it in the changes tab | Douglas Barbosa Alexandre | 2015-12-10 | 1 | -8/+16 |
| | | |||||
* | | Fix award-emojis alert flash message | Grzegorz Bizon | 2015-12-11 | 1 | -1/+1 |
|/ | | | | | | | | | This adds a new feature to `Flash` that allows to pin it after a specified selector. This removes a fixed position from such award-emoji alert, and makes it responsive by design of selector that this alert is pinned to. Closes #3996 | ||||
* | Ensure new notes are highlighted properly on a merge request diff | Douglas Barbosa Alexandre | 2015-12-09 | 1 | -3/+7 |
| | |||||
* | Ensure notes are replaced on a merge request diff when they're updated | Douglas Barbosa Alexandre | 2015-12-09 | 1 | -1/+1 |
| | |||||
* | Fix random failing test - delete attachmentfix-random-test | Dmitriy Zaporozhets | 2015-12-07 | 1 | -2/+2 |
| | | | | | | | Make sure we wait for AJAX request to finish before end test and cleanup database Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Remove space before exclamation mark in award alert | Grzegorz Bizon | 2015-12-05 | 1 | -1/+1 |
| | | | | [ci skip] | ||||
* | Combine new javascript Flash methods into one | Grzegorz Bizon | 2015-12-03 | 1 | -2/+1 |
| | |||||
* | Pin flash message to top if award note is invalid | Grzegorz Bizon | 2015-12-03 | 1 | -1/+3 |
| | |||||
* | Show flash message instead of alert when note is invalid | Grzegorz Bizon | 2015-12-03 | 1 | -1/+2 |
| | |||||
* | Notify user when award-emoji comment is invalid | Grzegorz Bizon | 2015-12-03 | 1 | -0/+4 |
| | |||||
* | Scroll to awards after adding emoji-award comment | Grzegorz Bizon | 2015-12-03 | 1 | -0/+1 |
| | | | | | This makes it more intuitive, as user can see that something actually happened after adding emoji-only comment in long discussions. | ||||
* | Emoji: fix image of emoji when it is submitted via comment | Valery Sizov | 2015-11-19 | 1 | -1/+1 |
| | |||||
* | replace emoji references from class name to data [ci skip] | Valery Sizov | 2015-11-19 | 1 | -1/+1 |
| | |||||
* | award emoji | Valery Sizov | 2015-11-19 | 1 | -5/+4 |
| | |||||
* | Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820 | Robert Speicher | 2015-11-16 | 1 | -6/+7 |
| | | | | | This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a. | ||||
* | Avoid render edit_form in each notes. | Jason Lee | 2015-11-12 | 1 | -7/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use RJS to render edit note feature. Before: ``` Rendered projects/notes/_note.html.haml (27.9ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.7ms) Rendered projects/_md_preview.html.haml (3.9ms) Rendered projects/notes/_edit_form.html.haml (6.9ms) Rendered projects/notes/_note.html.haml (17.7ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.6ms) Rendered projects/_md_preview.html.haml (3.4ms) Rendered projects/notes/_edit_form.html.haml (7.0ms) ``` After: ``` Rendered projects/notes/_note.html.haml (13.8ms) Rendered projects/notes/_note.html.haml (7.1ms) Rendered projects/notes/_note.html.haml (9.5ms) Rendered projects/notes/_note.html.haml (8.5ms) ``` This change reduce at least 6ms * N ('N' - number of notes). | ||||
* | Remove "quick submit" behavior specific to the Notes JS | Robert Speicher | 2015-10-07 | 1 | -7/+0 |
| | |||||
* | Ensure notes are highlighted properly when they're updated | Robert Speicher | 2015-09-30 | 1 | -7/+9 |
| | |||||
* | Simplify syntax highlighting of new notes | Robert Speicher | 2015-09-10 | 1 | -2/+3 |
| | |||||
* | Add syntax highlight scheme to notes rendered client-siders-highlight-new-notes | Robert Speicher | 2015-09-04 | 1 | -0/+1 |
| | |||||
* | Fix live notes refresh in relative URL deployments | Stan Hu | 2015-07-26 | 1 | -1/+0 |
| | |||||
* | Fix file upload dialog for comment editing | Daniel Gerhardt | 2015-07-17 | 1 | -1/+1 |
| | | | | | | | | | | This fixes the file upload dialog which currently works for new comments but not for comment editing. The cause for this is a missing DOM class which causes traversal to the dropzone to fail. This is fixed by adding the expected `gfm-form` class to the edit form. It has to be added dynamically since adding it to the form template would break the form's layout and comment saving. | ||||
* | Support commenting on a diff in side-by-side view | Stan Hu | 2015-06-16 | 1 | -10/+35 |
| | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9283 | ||||
* | Make submit hotkey available to all notes forms. | Nicolas | 2015-06-09 | 1 | -5/+3 |
| | | | | Addresses #2221. | ||||
* | Javascripts don't need to require jquery or bootstrap explicitly | Robert Speicher | 2015-05-28 | 1 | -2/+0 |
| | |||||
* | Workaround that doesn't add unwanted newline. | Douwe Maan | 2015-05-21 | 1 | -4/+5 |
| | |||||
* | Work around a Chrome 43 bug preventing note editingrs-issue-1568 | Robert Speicher | 2015-05-20 | 1 | -0/+7 |
| | |||||
* | More JS dependency requirements | Robert Speicher | 2015-05-06 | 1 | -0/+1 |
| | |||||
* | Make notes JS require its dependencies | Robert Speicher | 2015-05-06 | 1 | -3/+11 |
| | |||||
* | Update task list behavior for Notes | Robert Speicher | 2015-05-06 | 1 | -0/+17 |
| | |||||
* | Merge branch 'clear-note-form-on-succcess' into 'master' | Dmitriy Zaporozhets | 2015-03-29 | 1 | -1/+8 |
|\ | | | | | | | | | | | | | | | Prevent note form from being cleared when submitting failed. When you try to submit a comment while you're not connected to the internet or while your connection is having trouble, the AJAX request would fail and the note would be deleted :cry: See merge request !468 | ||||
| * | Prevent note form from being cleared when submitting failed.clear-note-form-on-succcess | Douwe Maan | 2015-03-27 | 1 | -1/+8 |
| | | |||||
* | | Prevent holding Control-Enter or Command-Enter from posting comment multiple ↵ | Douwe Maan | 2015-03-27 | 1 | -0/+1 |
|/ | | | | times. | ||||
* | Remove upvotes js logic since it does not work as expected anyway | Dmitriy Zaporozhets | 2015-03-20 | 1 | -1/+1 |
| | |||||
* | Remove note attachment file selector. | Douwe Maan | 2015-02-17 | 1 | -13/+0 |
| | |||||
* | Merge branch 'md-preview-class' into 'master' | Dmitriy Zaporozhets | 2015-02-17 | 1 | -4/+4 |
|\ | | | | | | | | | | | | | | | Make sure Markdown previews always use the same styling as the eventual destination. Font size, image width and code-block styling weren't accurate between the markdown preview and the issue/wiki/note body. See merge request !1514 | ||||
| * | Make sure Markdown previews always use the same styling as the eventual ↵ | Douwe Maan | 2015-02-17 | 1 | -4/+4 |
| | | | | | | | | destination. | ||||
* | | Properly clear notes bindings to prevent double comments on Ctrl-Enter. | Douwe Maan | 2015-02-16 | 1 | -1/+1 |
|/ | |||||
* | Actually submit comment on command-enter. | Douwe Maan | 2015-02-11 | 1 | -1/+2 |
| | | | | Resolves #1869. | ||||
* | Autosave and autorestore unsaved comments. | Douwe Maan | 2015-02-07 | 1 | -2/+15 |
| | | | | Closes #1738. | ||||
* | Submit comment on command-enter. | Douwe Maan | 2015-02-05 | 1 | -1/+1 |
| | | | | Fixes #1869. | ||||
* | Replace highlight.js with rouge-fork rugments | Stefan Tatschner | 2015-01-15 | 1 | -7/+0 |
| | | | | | | | | | | I decided to create a fork of rouge as rouge lacks a HTML formatter with the required options such as wrapping a line with <span> tags. Furthermore I was not really convinced about the clarity of rouge's source code. Rugments 1.0.0beta3 for now only includes some basic linting and a new HTML formatter. Everything else should behave the same. | ||||
* | Clone comment form on edit. Fixes bug with disappearing textarea or cancel ↵ | Dmitriy Zaporozhets | 2015-01-14 | 1 | -3/+6 |
| | | | | of edit | ||||
* | Huge set of fixes for comments logic | Dmitriy Zaporozhets | 2015-01-14 | 1 | -2/+9 |
| | |||||
* | Fix image drag-n-drop to diff comments | Dmitriy Zaporozhets | 2015-01-14 | 1 | -0/+2 |
| |