summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Aggressively merge views, feedback:Lin Jen-Shin2016-08-241-4/+0
* Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1930-75/+1186
|\
| * Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-1920-22/+953
| |\
| | * Fix jumping between discussions on changes tabDouwe Maan2016-08-181-0/+1
| | * 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-189-31/+133
| | |\
| | * \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-187-18/+314
| | |\ \
| | * | | Function should return a boolean.Connor Shea2016-08-171-1/+1
| | * | | Forgot another one.Connor Shea2016-08-171-0/+2
| | * | | Fix more incomplete if/else statements.Connor Shea2016-08-172-0/+8
| | * | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1736-83/+2147
| | |\ \ \
| | * | | | Remove non-standard VueJS files from vendor.Connor Shea2016-08-171-0/+2
| | * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-172-6/+8
| | |\ \ \ \
| | * | | | | 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-1616-51/+219
| | |\ \ \ \ \
| | * | | | | | 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
| | * | | | | | Resolve feedback.Connor Shea2016-08-151-6/+5
| | * | | | | | Single quotes for consistency, cache 'this' selector.Connor Shea2016-08-151-3/+4
| | * | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-1235-238/+433
| | |\ \ \ \ \ \
| | * | | | | | | Don’t show “Resolve discussion” for non-author/membersDouwe Maan2016-08-124-6/+27
| | * | | | | | | 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-091-7/+3
| | * | | | | | | Implement Jump behavior for Changes tabDouwe Maan2016-08-045-28/+128
| | * | | | | | | 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-0411-85/+105
| | * | | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-0316-328/+105
| | |\ \ \ \ \ \ \
| | * | | | | | | | Moved the discussions count to be on the right of the tabsPhil Hughes2016-08-011-1/+1
| | * | | | | | | | 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-0111-69/+104
| | * | | | | | | | File renamePhil Hughes2016-07-291-0/+0
| | * | | | | | | | Added tests for hidden jump to buttonPhil Hughes2016-07-293-10/+20
| | * | | | | | | | Hides jump to next button if only one discussion visiblePhil Hughes2016-07-292-1/+8
| | * | | | | | | | Added JS spec tests for CommentsStorePhil Hughes2016-07-294-8/+29
| | * | | | | | | | Correctly cycles the unresolved discussionsPhil Hughes2016-07-295-7/+21
| | * | | | | | | | Fixed failing testsPhil Hughes2016-07-297-18/+13
| | * | | | | | | | Moved most of the data handling into discussion & notes modelsPhil Hughes2016-07-2912-134/+141
| | * | | | | | | | Use default amount of padding before and after “N/M resolved” widgetDouwe Maan2016-07-281-1/+0
| | * | | | | | | | Don’t depend on unique class.Douwe Maan2016-07-282-5/+5
| | * | | | | | | | Show existing discussion when adding new comment on line with a hidden resolv...Douwe Maan2016-07-282-7/+17
| | * | | | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-07-283-1/+41
| | |\ \ \ \ \ \ \ \
View Lorry Controller Status