Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed issue with search autocomplete not allow arrow key navigation | Phil Hughes | 2016-06-03 | 2 | -11/+19 |
* | Merge branch 'rubocop/enable-empty-lines-around-access-modifier-cop' into 'ma... | Robert Speicher | 2016-06-03 | 1 | -0/+1 |
|\ | |||||
| * | Enable Style/EmptyLinesAroundAccessModifier rubocop coprubocop/enable-empty-lines-around-access-modifier-cop | Grzegorz Bizon | 2016-06-03 | 1 | -0/+1 |
* | | Merge branch 'awardables' into 'master' | Jacob Schatz | 2016-06-03 | 31 | -286/+451 |
|\ \ | |||||
| * | | :police_car: | Z.J. van de Weg | 2016-06-03 | 1 | -6/+6 |
| * | | Merge branch 'master' into awardablesawardables | Z.J. van de Weg | 2016-06-03 | 119 | -294/+624 |
| |\ \ | |||||
| * | | | Move awardables too when issue is moved | Z.J. van de Weg | 2016-06-01 | 1 | -0/+9 |
| * | | | Incorportate feedback | Z.J. van de Weg | 2016-06-01 | 7 | -38/+16 |
| * | | | Merge branch 'master' into awardables | ZJ van de Weg | 2016-05-30 | 167 | -789/+1185 |
| |\ \ \ | |||||
| * | | | | Remove accidentally duplicated line. | Fatih Acet | 2016-05-25 | 1 | -1/+0 |
| * | | | | Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardables | Fatih Acet | 2016-05-25 | 151 | -1128/+2207 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into awardables | ZJ van de Weg | 2016-05-25 | 151 | -1128/+2207 |
| | |\ \ \ \ | |||||
| * | | | | | | " :arrow_right: '. | Fatih Acet | 2016-05-25 | 1 | -41/+44 |
| |/ / / / / | |||||
| * | | | | | Handle posting emoji only vote +1 and -1 comments. | Fatih Acet | 2016-05-24 | 1 | -24/+30 |
| * | | | | | Get award menu url from gl object. | Fatih Acet | 2016-05-24 | 3 | -1/+7 |
| * | | | | | Fix award tooltip after voting.awardables-merge | Fatih Acet | 2016-05-24 | 1 | -16/+36 |
| * | | | | | Handle thumbsup and thumbsdown mutuality. | Fatih Acet | 2016-05-24 | 1 | -0/+8 |
| * | | | | | Fix variable name because of a wrong resolved merge conflict. | Fatih Acet | 2016-05-23 | 1 | -2/+2 |
| * | | | | | Merge branch 'awardables-merge' of gitlab.com:gitlab-org/gitlab-ce into award... | Fatih Acet | 2016-05-23 | 3 | -131/+150 |
| |\ \ \ \ \ | |||||
| | * | | | | | minor js fixes | ZJ van de Weg | 2016-05-20 | 4 | -132/+151 |
| * | | | | | | Fix displaying emoji only comments. | Fatih Acet | 2016-05-23 | 2 | -24/+46 |
| * | | | | | | Fix emoji counter issue. | Fatih Acet | 2016-05-23 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Fix backend merge mistakes | ZJ van de Weg | 2016-05-19 | 3 | -4/+2 |
| * | | | | | Add Gitlab namespace AwardEmoji. | Fatih Acet | 2016-05-19 | 1 | -1/+1 |
| * | | | | | Adds the emoji menu to the body and then re-positions it depending on which b... | Phil Hughes | 2016-05-19 | 4 | -24/+47 |
| * | | | | | Added tests for issues | Phil Hughes | 2016-05-19 | 1 | -3/+3 |
| * | | | | | Tooltip placement on award buttons | Phil Hughes | 2016-05-19 | 3 | -2/+3 |
| * | | | | | Hides award bar when editing a note | Phil Hughes | 2016-05-19 | 1 | -1/+2 |
| * | | | | | Changed design of inline award picker to be similar to designs | Phil Hughes | 2016-05-19 | 4 | -33/+14 |
| * | | | | | Removed console log | Phil Hughes | 2016-05-19 | 1 | -1/+0 |
| * | | | | | Hides the row in notes body when empty of emojis | Phil Hughes | 2016-05-19 | 1 | -0/+5 |
| * | | | | | Removes buttons in notes body | Phil Hughes | 2016-05-19 | 1 | -26/+30 |
| * | | | | | Shows the bar on notes if a new award is added | Phil Hughes | 2016-05-19 | 3 | -17/+31 |
| * | | | | | Uses the same emoji-menu and just moves it around depending where it should b... | Phil Hughes | 2016-05-19 | 7 | -178/+155 |
| * | | | | | Refactored JS slightly to make things easier | Phil Hughes | 2016-05-19 | 2 | -113/+122 |
| * | | | | | Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardables | Fatih Acet | 2016-05-18 | 7 | -28/+18 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix latests concerns | ZJ van de Weg | 2016-05-18 | 7 | -28/+18 |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables | Fatih Acet | 2016-05-18 | 12 | -4/+172 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables | Fatih Acet | 2016-05-18 | 120 | -578/+1004 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Fix tests and wrong choices during merge | Zeger-Jan van de Weg | 2016-05-12 | 3 | -2/+10 |
| * | | | | | | | revert front end changes | Zeger-Jan van de Weg | 2016-05-11 | 6 | -236/+147 |
| * | | | | | | | Incorporate feedback | Zeger-Jan van de Weg | 2016-05-11 | 8 | -45/+17 |
| * | | | | | | | Merge branch 'master' into awardables | Zeger-Jan van de Weg | 2016-05-11 | 14 | -56/+48 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge awards-handler.coffee from another branch | Zeger-Jan van de Weg | 2016-05-11 | 1 | -49/+48 |
| * | | | | | | | | Merge branch 'master' into awardables | Zeger-Jan van de Weg | 2016-05-11 | 425 | -3880/+4382 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add tests on Awardables and Award Emoji | Zeger-Jan van de Weg | 2016-05-10 | 5 | -21/+16 |
| * | | | | | | | | | move frontend logic from previous MR to new MR | Arinde Eniola | 2016-05-06 | 8 | -102/+192 |
| * | | | | | | | | | Create table for award emoji | Zeger-Jan van de Weg | 2016-05-06 | 24 | -124/+233 |
* | | | | | | | | | | Merge branch 'dz-rename-registry-tab' into 'master' | Dmitriy Zaporozhets | 2016-06-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Shorter name for Container Registry tabdz-rename-registry-tab | Dmitriy Zaporozhets | 2016-06-02 | 1 | -1/+1 |