summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix notification_service argument error of declined invitation emailsPaco Guzman2016-08-191-2/+0
* Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-1953-126/+1461
|\
| * Fix expansion of discussions in diffdiff-line-comment-vuejsDouwe Maan2016-08-183-5/+3
| * Improve performance of MR show pageDouwe Maan2016-08-189-22/+33
| * Fix jumping between discussions on changes tabDouwe Maan2016-08-181-0/+1
| * Fix MR note discussion IDDouwe Maan2016-08-181-1/+3
| * Remove right margin on Jump button iconDouwe Maan2016-08-181-2/+6
| * Fix bug causing “Jump to discussion” button not to showDouwe Maan2016-08-182-11/+7
| * Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-1823-88/+247
| |\
| * \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1833-152/+628
| |\ \
| * | | Fix class method definitionDouwe Maan2016-08-171-1/+1
| * | | Function should return a boolean.Connor Shea2016-08-171-1/+1
| * | | Forgot another one.Connor Shea2016-08-171-0/+2
| * | | Fix a lingering conflict.Connor Shea2016-08-171-5/+1
| * | | Fix more incomplete if/else statements.Connor Shea2016-08-172-0/+8
| * | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1787-137/+3225
| |\ \ \
| * | | | Store discussion_id on Note for faster discussion lookup.Douwe Maan2016-08-177-44/+73
| * | | | Remove non-standard VueJS files from vendor.Connor Shea2016-08-171-0/+2
| * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-176-14/+37
| |\ \ \ \
| * | | | | Add return statements for if statements that were missing them.Connor Shea2016-08-171-0/+4
| * | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1691-295/+1032
| |\ \ \ \ \
| * | | | | | Add comment for v-cloak selector. [ci skip]Connor Shea2016-08-161-1/+2
| * | | | | | Fix Resolve All button.Connor Shea2016-08-161-5/+1
| * | | | | | Improve CSS for line comment resolution button.Connor Shea2016-08-161-5/+2
| * | | | | | Address review feedbackDouwe Maan2016-08-165-5/+7
| * | | | | | Resolve feedback.Connor Shea2016-08-152-9/+6
| * | | | | | Single quotes for consistency, cache 'this' selector.Connor Shea2016-08-151-3/+4
| * | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-12144-948/+1694
| |\ \ \ \ \ \
| * | | | | | | Add specs for NotesController and DiscussionsControllerDouwe Maan2016-08-123-2/+6
| * | | | | | | Add specs for Discussion and MergeRequest modelsDouwe Maan2016-08-121-3/+5
| * | | | | | | Don’t show “Resolve discussion” for non-author/membersDouwe Maan2016-08-125-14/+35
| * | | | | | | Add specs for new Note and DiffNote methods.Douwe Maan2016-08-121-0/+3
| * | | | | | | Fix a bug and a test.Connor Shea2016-08-101-4/+6
| * | | | | | | Set color of resolve icon with CSS.Connor Shea2016-08-101-2/+6
| * | | | | | | If the next discussion is closed, toggle it open.Connor Shea2016-08-091-0/+6
| * | | | | | | Replace CSS border'd check icon with real icon.Connor Shea2016-08-093-9/+5
| * | | | | | | Implement Jump behavior for Changes tabDouwe Maan2016-08-046-31/+131
| * | | | | | | Actually don't send resolved notifications when deleting a noteDouwe Maan2016-08-042-4/+2
| * | | | | | | Fixed issue with expand diff not initializing resolve buttonsPhil Hughes2016-08-041-4/+5
| * | | | | | | Jumps between discussions on the changes tabPhil Hughes2016-08-042-25/+34
| * | | | | | | Comment & resolve button no longer looks for can-resolve attributePhil Hughes2016-08-0413-87/+107
| * | | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-03110-767/+940
| |\ \ \ \ \ \ \
| * | | | | | | | Moved the discussions count to be on the right of the tabsPhil Hughes2016-08-012-12/+11
| * | | | | | | | Checks if DiffNotesApp is definedPhil Hughes2016-08-013-7/+7
| * | | | | | | | Moved update headline HTML into discussion modelPhil Hughes2016-08-013-42/+45
| * | | | | | | | Moved method to compile components from window into diffnotesappPhil Hughes2016-08-014-18/+25
| * | | | | | | | Updated method name to be more descriptivePhil Hughes2016-08-012-5/+4
| * | | | | | | | Unminified versions of vue & vue-resourcePhil Hughes2016-08-011-2/+5
| * | | | | | | | Updated issues with jump tp buttonPhil Hughes2016-08-0115-93/+130
| * | | | | | | | Spacing update of discussions resolved boxPhil Hughes2016-07-291-1/+1
View Lorry Controller Status