summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' Grzegorz Bizon2015-12-074-7/+33
|\
| * Remove space before exclamation mark in award alertGrzegorz Bizon2015-12-051-1/+1
| * Combine new javascript Flash methods into oneGrzegorz Bizon2015-12-032-7/+3
| * Pin flash message to top if award note is invalidGrzegorz Bizon2015-12-031-1/+3
| * Add new features to javascript flash messageGrzegorz Bizon2015-12-032-6/+23
| * Show flash message instead of alert when note is invalidGrzegorz Bizon2015-12-031-1/+2
| * Notify user when award-emoji comment is invalidGrzegorz Bizon2015-12-031-0/+4
| * Scroll to awards after adding emoji-award commentGrzegorz Bizon2015-12-032-1/+7
* | Merge branch 'style-warning-about-mentioning-many-people-in-a-comment' into '...Douwe Maan2015-12-071-5/+2
|\ \
| * \ Merge branch 'master' into style-warning-about-mentioning-many-people-in-a-co...style-warning-about-mentioning-many-people-in-a-commentDouglas Barbosa Alexandre2015-12-0415-153/+213
| |\ \
| * | | Fix specsDouglas Barbosa Alexandre2015-12-031-1/+0
| * | | Merge branch 'master' into style-warning-about-mentioning-many-people-in-a-co...Douglas Barbosa Alexandre2015-12-0319-147/+106
| |\ \ \
| * | | | Improve style of the warning when mentioning many people in a commentDouglas Barbosa Alexandre2015-12-031-5/+3
* | | | | Notify user if they cannot create projectsAndrew Tomaka2015-12-052-1/+7
| |_|/ / |/| | |
* | | | Ensure "Remove Source Branch" button is not shown when branch is being delete...Rubén Dávila2015-12-041-3/+6
* | | | Merge remote-tracking branch 'origin/ui/issuable-form'Dmitriy Zaporozhets2015-12-044-31/+41
|\ \ \ \
| * | | | Fix specsui/issuable-formDouwe Maan2015-12-033-22/+11
| * | | | Merge branch 'master' into ui/issuable-formDouwe Maan2015-12-0319-142/+99
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Redesign multiple select2 optionsDouwe Maan2015-12-021-10/+31
| | |/ / | |/| |
* | | | Merge branch 'ui/sidebar' into 'master' Dmitriy Zaporozhets2015-12-044-100/+121
|\ \ \ \
| * \ \ \ Merge branch 'master' into ui/sidebarui/sidebarDouwe Maan2015-12-0319-142/+97
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Revert unrelated changesDouwe Maan2015-12-021-0/+3
| * | | | Fade in/out Back icon when sidebar is toggledDouwe Maan2015-12-021-1/+5
| * | | | Fix logo height in signed-out header barDouwe Maan2015-12-021-3/+5
| * | | | Restore sidebar tooltips and fix logo tooltip locationDouwe Maan2015-12-023-99/+113
| | |/ / | |/| |
* | | | Merge branch 'ui/form-consistency' into 'master' Dmitriy Zaporozhets2015-12-041-4/+0
|\ \ \ \
| * \ \ \ Merge branch 'master' into ui/form-consistencyDouwe Maan2015-12-0319-142/+99
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Remove unnecesary wrapper elementsDouwe Maan2015-12-021-4/+0
| | |/ / | |/| |
* | | | Merge branch 'ui/login-page' into 'master' Dmitriy Zaporozhets2015-12-042-4/+7
|\ \ \ \
| * | | | Fix background and padding of login and error pagesui/login-pageDouwe Maan2015-12-032-4/+7
| | |/ / | |/| |
* | | | Merge branch 'ui/wiki' into 'master' Dmitriy Zaporozhets2015-12-031-0/+5
|\ \ \ \
| * \ \ \ Merge branch 'master' into ui/wikiDouwe Maan2015-12-0319-142/+99
| |\ \ \ \ | | |/ / /
| * | | | Use new style for wikiDouwe Maan2015-12-021-0/+5
| | |/ / | |/| |
* | | | Merge branch 'ui/new-project' into 'master' Dmitriy Zaporozhets2015-12-031-0/+8
|\ \ \ \
| * \ \ \ Merge branch 'master' into ui/new-projectui/new-projectDouwe Maan2015-12-0319-142/+99
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Unify new project namespace select and path inputDouwe Maan2015-12-021-0/+8
| | |/ / | |/| |
* | | | Merge branch 'ui/issuable-filter' into 'master' Dmitriy Zaporozhets2015-12-033-10/+24
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into ui/issuable-filterDouwe Maan2015-12-0319-142/+99
| |\ \ \ | | | |/ | | |/|
| * | | Make style of select2 box more consistent with controlsDouwe Maan2015-12-021-0/+11
| * | | Remove "none" username for "Unassigned" and "Any User" select optionsDouwe Maan2015-12-022-9/+12
| * | | Use select2 for bulk issue edit statusDouwe Maan2015-12-021-1/+1
| | |/ | |/|
* | | Merge branch 'ui/issuable-list-item' into 'master' Dmitriy Zaporozhets2015-12-031-4/+0
|\ \ \
| * \ \ Merge branch 'master' into ui/issuable-list-itemui/issuable-list-itemDouwe Maan2015-12-0319-142/+99
| |\ \ \ | | | |/ | | |/|
| * | | Link MR list item branch name to branchDouwe Maan2015-12-021-4/+0
| | |/ | |/|
* | | Merge branch 'ui/project-home-panel' into 'master' Dmitriy Zaporozhets2015-12-032-1/+6
|\ \ \
| * \ \ Merge branch 'master' into ui/project-home-panelui/project-home-panelDouwe Maan2015-12-0319-135/+99
| |\ \ \ | | | |/ | | |/|
| * | | Remove duplicate styles.Douwe Maan2015-12-021-7/+0
| * | | Use default cursor for project visibility label.Douwe Maan2015-12-021-1/+1
| * | | Move project visibility status to the leftDouwe Maan2015-12-021-0/+5
| | |/ | |/|
* | | Merge branch 'master' into ui/emojiui/emojiDouwe Maan2015-12-0319-142/+99
|\ \ \ | | |/ | |/|
View Lorry Controller Status