summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Wait until listeners are set before triggering a 'click' eventbugfix/jschatz/sidebar-issues/minimize-on-diffAlfredo Sumaran2016-02-241-3/+7
|
* Remove unused methodsAlfredo Sumaran2016-02-241-16/+0
|
* Move script inside of MergeRequestTabs classAlfredo Sumaran2016-02-242-12/+10
|
* Merge branch 'master' into minimize-on-diffAlfredo Sumaran2016-02-24163-1870/+3812
|\
| * Merge branch 'andywgrant/gitlab-ce-master' into 'master' Dmitriy Zaporozhets2016-02-242-6/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "issue" to Close/Reopen buttons for clarity _Originally opened by @andywgrant at !2884_ --- Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13549 See merge request !2929
| | * Add "issue" to Close/Reopen buttons for clarityandywgrant/gitlab-ce-masterAndy Grant2016-02-222-6/+6
| | |
| * | Merge branch 'user-bio-improve' into 'master' Jacob Schatz2016-02-242-18/+29
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the formatting for the user page bio Resolves #13406. Problems, per the Issue above: - The bio has an extra period appended by the HAML view. - The bio isn't given its own line, not differentiated from username and account creation date. - The bio is allowed to span almost the full width of the container, would probably look better if it were only allowed a max width of something like 750px. This commit: - Separates the User page bio from the username and account creation date. - Separates the pseudo-selector adding a Middle Dot out from the `profile-link-holder` class and into a `middle-dot-divider` class. Before: ![Screen_Shot_2016-02-15_at_3.55.28_PM](/uploads/fbe410c3f436740121c5f4686e0f44d0/Screen_Shot_2016-02-15_at_3.55.28_PM.png) With this Merge Request: ![Screen_Shot_2016-02-15_at_3.55.25_PM](/uploads/b4b16376a395608f57d8f76ab47e241f/Screen_Shot_2016-02-15_at_3.55.25_PM.png) See merge request !2827
| | * | Improve the formatting for the user page bioconnorshea/gitlab-ce-user-bio-improveconnorshea2016-02-232-18/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Separates the User page bio from the username and account creation date. - Separates the pseudo-selector adding a Middle Dot out from the `profile-link-holder` class and into a `middle-dot-divider` class. Resolves #13406. See merge request !2827.
| * | | Merge branch 'highlighted-note' into 'master' Jacob Schatz2016-02-247-9/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed padding & background color for highlighted notes Closes #12453 ![Screen_Shot_2016-02-23_at_11.18.59](/uploads/19150d884fd1175fe0df5f6daee64206/Screen_Shot_2016-02-23_at_11.18.59.png) See merge request !2937
| | * | | changed variable name to -hoverhighlighted-notePhil Hughes2016-02-237-8/+8
| | | | |
| | * | | Changed padding & background color for highlighted notesPhil Hughes2016-02-232-2/+2
| | | | | | | | | | | | | | | | | | | | Closes #12453
| * | | | Merge branch 'gray-content-block-btn-alignment' into 'master' Jacob Schatz2016-02-241-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly aligned buttons vertical in gray-content-block Closes #12790 ![Screen_Shot_2016-02-23_at_15.09.19](/uploads/e5c6d97d8c1712273c87a0d592430390/Screen_Shot_2016-02-23_at_15.09.19.png) See merge request !2941
| | * | | | Correctly aligned buttons vertical in gray-content-blockgray-content-block-btn-alignmentPhil Hughes2016-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Closes #12790
| * | | | | Merge branch 'activity-tabs-single-select' into 'master' Jacob Schatz2016-02-241-13/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treats activity tabs as single select Fixes #8092 ![activity-tabs](/uploads/1fb4d9233492252cfd93c74579e97514/activity-tabs.gif) See merge request !2940
| | * | | | | changed bind to on for activity link click eventactivity-tabs-single-selectPhil Hughes2016-02-241-1/+1
| | | | | | |
| | * | | | | Treats activity tabs as single selectPhil Hughes2016-02-241-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #8092
| * | | | | | Merge branch 'bugfix/jschatz1/missing-project-button' into 'master' Rémy Coutable2016-02-243-9/+10
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix group projects styles Makes new project button visible when no projects are available. Fixes #13193 # BEFORE ![Screen_Shot_2016-02-04_at_1.08.27_PM](/uploads/36be9d5892506e7d1abcf4eb2a622e12/Screen_Shot_2016-02-04_at_1.08.27_PM.png) # AFTER (w/projects) ![Screen_Shot_2016-02-04_at_1.07.48_PM](/uploads/fa257a1965017ff1274572dc66fccf90/Screen_Shot_2016-02-04_at_1.07.48_PM.png) # AFTER (no projects) ![Screen_Shot_2016-02-04_at_1.07.28_PM](/uploads/326f6fdac24b56e8408efd0d11dc2805/Screen_Shot_2016-02-04_at_1.07.28_PM.png) cc @creamzy @skyruler See merge request !2714
| | * | | | | Initialize navigation shortcuts on project's files pagebugfix/jschatz1/missing-project-buttonAlfredo Sumaran2016-02-231-0/+1
| | | | | | |
| | * | | | | Re-use existing top area elementsAlfredo Sumaran2016-02-231-16/+0
| | | | | | |
| | * | | | | Fix group projects stylesJacob Schatz2016-02-233-9/+25
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Makes new project button visible when no projects are available. Fixes #13193
| * | | | | Merge branch 'issue_13301_emoji-menu' into 'master' Robert Speicher2016-02-244-12/+28
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Load award emoji picker with ajax request Fixes #13301. See merge request !2888
| | * | | | Update award_emoji testAnnabel Dunstone2016-02-231-1/+2
| | | | | |
| | * | | | Create EmojisControllerAnnabel Dunstone2016-02-224-5/+6
| | | | | |
| | * | | | Add timeout for ajax call in award emoji steps; update focus in award pickerAnnabel Dunstone2016-02-191-1/+2
| | | | | |
| | * | | | Load award emoji picker with ajax requestAnnabel Dunstone2016-02-184-11/+24
| | | | | |
| * | | | | Merge branch 'issue_13510' into 'master' Jacob Schatz2016-02-232-0/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds "e" shortcut to issuable pages which redirects to the Edit page Closes #13510 See merge request !2945
| | * | | | | Add "e" shortcut to help modalAlfredo Sumaran2016-02-231-0/+8
| | | | | | |
| | * | | | | Add "e" shortcut to edit issuableissue_13510Alfredo Sumaran2016-02-231-0/+8
| | | | | | |
| * | | | | | Merge branch 'hudecof/show-crowd-login-form-when-signin-disabled' into 'master' Robert Speicher2016-02-231-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show Crowd login even when sign-in is disabled Fixes #13176. See merge request !2749
| | * | | | | | Show Crowd login even when sign-in is disabledPeter Hudec2016-02-231-1/+1
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'fix-todos' into 'master' Robert Speicher2016-02-232-2/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Does not raise an error when Todo is already marked as done Closes #13681 See merge request !2926
| | * | | | | Does not raise an error when Todo is already marked as doneDouglas Barbosa Alexandre2016-02-232-2/+2
| | | | | | |
| * | | | | | Merge branch 'dz-small-ui-fixes' into 'master' Jacob Schatz2016-02-2319-88/+90
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set of UI fixes * Improve wiki pages * Improve profile pages cc @skyruler See merge request !2758
| | * | | | | | Update tests to match new wiki headerDmitriy Zaporozhets2016-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Set of small improvements to wiki frontendDmitriy Zaporozhets2016-02-0710-54/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Set of small UI fixes to project and profile pagesDmitriy Zaporozhets2016-02-079-34/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Merge branch 'files-view-row-click' into 'master' Jacob Schatz2016-02-233-8/+7
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with file view rows not clickable on project main view Fixed an issue where it would only load the first 25 commit data on project main view. Stopped the file view sending 1 too many requests. Fixes #3916 See merge request !2933
| | * | | | | | Correctly checks if tree view is on screenPhil Hughes2016-02-232-2/+2
| | | | | | | |
| | * | | | | | Fixes issue with file view rows not clickable on project main viewfiles-view-row-clickPhil Hughes2016-02-233-8/+7
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed an issue where it would only load the first 25 commit data on project main view Stopped the file view sending 1 too many requests Fixes #3916
| * | | | | | Merge branch 'empty-repo-instructions-fix' into 'master' Jacob Schatz2016-02-231-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users don't get instructions to push to other users empty projects Fixes #12518 ![Screen_Shot_2016-02-22_at_17.38.18](/uploads/42a3c32af1326f15a7b40fd7153a89fb/Screen_Shot_2016-02-22_at_17.38.18.png) See merge request !2923
| | * | | | | Users don't get instructions to push to other users empty projectsPhil Hughes2016-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12518
| * | | | | | Merge branch 'milestone-drag-empty-list' into 'master' Jacob Schatz2016-02-231-9/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues can be dragged & dropped into empty milestone lists This is also possible with MRs. Also fixed an issue where MRs weren't sortable Fixes #13668 ![milestone](/uploads/aada0f48ce8b1407cce920eef3f4d5f3/milestone.gif) See merge request !2935
| | * | | | | | Issues can be dragged & dropped into empty milestone listsPhil Hughes2016-02-231-9/+21
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is also possible with MRs. Also fixed an issue where MRs weren't sortable Fixes #13668
| * | | | | | Merge branch 'dashboard-misaligned-buttons' into 'master' Jacob Schatz2016-02-231-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed mis-aligned buttons on dashboard/issues Before: ![](/uploads/35e413f2a5273bcdb1cc9ab20fa8d923/Screen_Shot_2016-02-22_at_10.15.39_PM.png) After: ![Screen_Shot_2016-02-23_at_08.45.12](/uploads/4fbba0650ea6005b1cd600b5038f91d1/Screen_Shot_2016-02-23_at_08.45.12.png) See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2921#note_3868715 See merge request !2932
| | * | | | | | Fixed mis-aligned buttons on dashboard/issuesdashboard-misaligned-buttonsPhil Hughes2016-02-231-0/+1
| | |/ / / / /
| * | | | | | Merge branch 'issue_11874' into 'master' Jacob Schatz2016-02-236-56/+127
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes dropdown appearance and makes it look accordingly to current design Fixes #11874 See merge request !2920
| | * | | | | Do not use calc and fix background spinner for high density displaysissue_11874Alfredo Sumaran2016-02-221-3/+5
| | | | | | |
| | * | | | | Use or create variablesAlfredo Sumaran2016-02-223-8/+9
| | | | | | |
| | * | | | | Simpler way to place arrowAlfredo Sumaran2016-02-221-3/+2
| | | | | | |
| | * | | | | Delete unused CSS ruleAlfredo Sumaran2016-02-221-7/+0
| | | | | | |