summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rs-dev-issue-2466' into 'master'Douwe Maan2015-09-071-0/+2
|\ | | | | | | | | | | | | | | | | | | Remove style attribute from textarea during ZenMode activation Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466 Closes https://github.com/gitlabhq/gitlabhq/issues/8963 See merge request !1248
| * Remove style attribute from textarea during ZenMode activationrs-dev-issue-2466Robert Speicher2015-09-041-0/+2
| | | | | | | | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466
* | Add syntax highlight scheme to notes rendered client-siders-highlight-new-notesRobert Speicher2015-09-042-1/+5
|/
* Fix tab toggle on activityDmitriy Zaporozhets2015-09-031-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Redesign activity feed on dashboard and project pagesDmitriy Zaporozhets2015-09-031-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Prevent anchors from being hidden by header upon a new page load.Stan Hu2015-08-291-5/+7
| | | | | | | | | | | | | Browsers change the scroll position after the page is loaded, and the current 1 ms delay wasn't long enough for the browser to jump to the anchor. Even then, it appears another 100ms delay is necessary to adjust the scroll properly: http://stackoverflow.com/questions/19057731/scrolltop-on-page-reload-doesnt-work-possible-script-conflict Add a little more of an offset to see a few lines before the anchor. Closes #1614 Closes #1024
* Merge branch 'rs-remove-user-color-scheme-class' into 'master'Douwe Maan2015-08-271-0/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | Apply syntax highlighting to fenced code blocks client-side Instead of applying the syntax highlighting scheme class to these blocks server-side, we use Javascript and Gon to apply the user's color scheme (or the default) client-side. This will make it easier to cache these blocks in the future because they're no longer state-dependent. See merge request !1203
| * Remove user_color_scheme_classRobert Speicher2015-08-251-0/+9
| | | | | | | | | | | | | | | | | | Instead of rendering this value server-side, we use Javascript and Gon to apply the user's color scheme (or the default) to any syntax highlighted code blocks. This will make it easier to cache these blocks in the future because they're no longer state-dependent.
* | Refactor project list renderingDmitriy Zaporozhets2015-08-261-4/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'separate-activity' into 'master'Dmitriy Zaporozhets2015-08-252-1/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | Separate activity page Move activity to separate page. Part of #2225 ![Screenshot_2015-08-25_15.07.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2126b22ed7b98a2f748c96ad60bc8b2e/Screenshot_2015-08-25_15.07.23.png) See merge request !1198
| * Make some visual improvements to dashboard page after we moved activityDmitriy Zaporozhets2015-08-251-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Dashboard activity as separate pageDmitriy Zaporozhets2015-08-251-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Improve abuse reports managementDmitriy Zaporozhets2015-08-251-0/+6
|/ | | | | | | | * Link to user profile instead of user admin page * One button for remove user and report * Remove user and report with page reloading Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'fix-email-autocomplete' into 'master'Douwe Maan2015-08-211-0/+2
|\ | | | | | | | | | | | | | | | | | | Fix bug preventing invite by e-mail This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320 See merge request !1181
| * Fix bug preventing invite by e-mailStan Hu2015-08-211-0/+2
| | | | | | | | | | | | This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320
* | Merge branch 'commit-image-branch' into 'master'Dmitriy Zaporozhets2015-08-211-4/+5
|\ \ | |/ |/| | | | | | | | | | | | | | | Fixed JS issue with diff image loading Fixes #1323 Whilst I couldn't reproduce the error locally, I did manage to get the same JS error message that was in the live env. See merge request !463
| * Fixed JS issue with diff image loadingPhil Hughes2015-03-261-4/+5
| |
* | Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-171-5/+0
|\ \ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Bring clone bar backStan Hu2015-08-121-5/+0
| | | | | | | | | | | | See discussion in !1080
| * | Refactor merge request widgetDmitriy Zaporozhets2015-08-111-4/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-5/+3
|/ / | | | | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* | Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-1/+1
| | | | | | | | | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-111-2/+4
| | | | | | | | | | This reverts commit 4773f38e28c91dbbb6e5e385e0c403877298bfed, reversing changes made to 0d5d80b735eb18ae79eb2bfe26c08896d53db414.
* | Add dropzone upload progressNikita Verkhovin2015-08-101-1/+8
| |
* | Refactor merge request widgetDmitriy Zaporozhets2015-08-071-4/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-051-1/+1
|\ \
| * \ Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-047-18/+25
| |\ \ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'ci-skipped-status' into 'master' Kamil Trzciński2015-08-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for CI skipped status This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216 See merge request !1073
| * | | | Added support for CI skipped statusci-skipped-statusKamil Trzcinski2015-08-041-1/+1
| | |/ / | |/| |
* | | | Don't hide the clone holder for an empty projectproject-buttonsRobert Speicher2015-08-041-3/+3
| | | |
* | | | Tweak project page buttons.Douwe Maan2015-07-311-5/+10
|/ / /
* | | Fix live notes refresh in relative URL deploymentsStan Hu2015-07-261-1/+0
| | |
* | | Merge branch 'fix-reload-with-full-diff-url' into 'master'Stan Hu2015-07-251-8/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the "Reload with full diff" URL button On the first load, the merge request tabs would be requested in JSON format to render the HTML. This would cause the "Reload with full diff" button to create a link to `diff.json`. Instead, generate the path in HTML mode. Closes #2041 See merge request !1019
| * | | Fix the "Reload with full diff" URL buttonStan Hu2015-07-231-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On the first load, the merge request tabs would be requested in JSON format to render the HTML. This would cause the "Reload with full diff" button to create a link to diff.json. Closes #2041
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-07-241-0/+4
|\ \ \ \
| * | | | Gitlab Issue 707: Indent unfolded code 1 characterngentile2015-07-221-0/+4
| |/ / /
* | | | Fix and style the "Changes suppressed" link.rs-changes-suppressed-linkRobert Speicher2015-07-231-3/+4
|/ / /
* | | Fix full screen mode for snippet commentsDaniel Gerhardt2015-07-211-1/+4
| | | | | | | | | | | | | | | | | | ZenMode is now initialized for snippet pages. Fixes #2036.
* | | Show the first tab automatically on MergeRequests#newrs-issue-2013Robert Speicher2015-07-181-3/+9
| | | | | | | | | | | | Closes #2013
* | | Merge branch 'fix-note-edit-upload-link' into 'master'Stan Hu2015-07-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix file upload dialog for comment editing This fixes the file upload dialog which currently works for new comments but not for comment editing. The cause for this is a missing DOM class which causes traversal to the dropzone to fail. This is fixed by adding the expected `gfm-form` class to the edit form. It has to be added dynamically since adding it to the form template would break the form's layout and comment saving. The following screenshot illustrates the issue: ![gitlab-dropzone-upload-dialog-bug](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3a9885c8ba7c07338148ec9e605e5771/gitlab-dropzone-upload-dialog-bug.png) See merge request !956
| * | | Fix file upload dialog for comment editingDaniel Gerhardt2015-07-171-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the file upload dialog which currently works for new comments but not for comment editing. The cause for this is a missing DOM class which causes traversal to the dropzone to fail. This is fixed by adding the expected `gfm-form` class to the edit form. It has to be added dynamically since adding it to the form template would break the form's layout and comment saving.
* | | Fix bug where clicking on the link icon on a file would result in ↵Stan Hu2015-07-171-1/+1
|/ / | | | | | | | | | | "L#undefined" in the URL Closes #2002
* | Add nice scroll for sidebarDmitriy Zaporozhets2015-07-141-0/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Allow user to specify content he wants to see on project pageproject-default-viewDmitriy Zaporozhets2015-07-132-2/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Do not add the same icon multiple times to dropzonesDaniel Gerhardt2015-07-101-3/+3
| | | | | | | | | | | | Some DOM queries were to broad which caused paperclip icons and spinners to be added multiple times to a dropzone in case of multiple dropzones on a page.
* | Cleanup and some test fixes after refactoring project home pageDmitriy Zaporozhets2015-07-081-8/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add shortcut for project activity pageDmitriy Zaporozhets2015-07-082-0/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Refactor star and fork buttonsDmitriy Zaporozhets2015-07-081-5/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Move project activity to separate tab. Add more features to project home pageDmitriy Zaporozhets2015-07-071-1/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status