Commit Graph
1518 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 0242124525 Fix 404 on jquery ui images
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 14:48:32 +03:00
Jacob Vosmaer 0b914e7ceb Refresh notes when the page becomes visible 2014-04-29 17:21:58 +02:00
Jacob Vosmaer e52f50c22f Do not refresh notes on hidden tabs 2014-04-29 17:21:58 +02:00
Dmitriy Zaporozhets c51ac0484f Merge pull request #5962 from skv-headless/editing-preview
editing preview
2014-04-29 10:00:29 +03:00
Jacob Vosmaer 7ec5ff4dba Pass last_fetched_at for notes to javascript 2014-04-28 12:21:49 +02:00
Dmitriy Zaporozhets 728bdfc504 Merge pull request #6843 from evanlucas/bug/6546
Fix syntax highlighting
2014-04-24 09:38:44 +03:00
Dmitriy Zaporozhets 1feaa336ed Merge pull request #6848 from hszcg/master
Fix diff height
2014-04-24 09:22:31 +03:00
Chenguang Zhang 7dd0860e5a Remove fixed height for diff table 2014-04-23 23:02:25 +08:00
Dmitriy Zaporozhets 2f726a11e6 Merge pull request #6775 from cirosantilli/glob-include-sass-dirs
Include SASS in subdirectories with glob.
2014-04-23 10:01:38 +03:00
Evan Lucas 4134b38a84 Fix syntax highlighting
Don't break highlighting on multi-line spans (multi-line comments for
example)
2014-04-22 17:06:16 -05:00
Jeroen van Baarsen 891b67c800 Removed missing sass selectors 2014-04-15 20:50:16 +02:00
skv-headless d859d08094 Editing preview 2014-04-15 19:02:02 +04:00
Ciro Santilli 6b068dccbb Include SASS in subdirectories with glob. 2014-04-14 23:49:16 +02:00
Thomas MoschnyandMarin Jankovski 5b123dbf7f Fix avatars in the network graph for relative-url setups. 2014-04-10 10:05:40 +02:00
Dmitriy Zaporozhets 7793417206 Fix note body align
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-09 21:26:11 +03:00
Dmitriy Zaporozhets fd8a165df7 Reduce note header padding
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-09 21:20:54 +03:00
Dmitriy Zaporozhets 8e7f80eed1 Restyle merge request accept and ci widget
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-06 17:10:37 +03:00
Dmitriy Zaporozhets ae2089a98e Fix autocomplete css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-06 14:10:48 +03:00
Dmitriy Zaporozhets 1a17289bd3 Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb
2014-04-06 13:54:54 +03:00
Dmitriy Zaporozhets 76c4421b26 Merge pull request #6639 from yatish27/ConsistentJSFormat
Consistent format for class objects in javascript
2014-04-03 11:36:44 +03:00
Marin Jankovski 7ab46b969f Do not require modernizr. 2014-04-03 08:49:34 +02:00
Dmitriy Zaporozhets f38eddc69e Replace custom jquery css with native one. Fixes wrong assets path for calendar in production
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 14:57:00 +03:00
Tom de Bruijn ce857b7cc9 Improve alignment of labels in .well-list items 2014-03-28 13:22:43 +01:00
Tom de Bruijn b7225bead8 Clearfix on well-lists. Pages affected:
Pages affected:
- admin/groups#show
- admin/projets#index
- admin/users#index
- dashboard/issues#index (on small screens)
2014-03-28 11:14:23 +01:00
Yatish Mehta fcdb34373f Consistent format for class objects in javascript 2014-03-28 14:01:06 +05:30
George Dewar 83f811fff5 Refactor Parallel Diff feature and add scrollbars
Also now removed lines relating to unused comments feature
2014-03-27 09:15:25 +13:00
Dmitriy Zaporozhets c818712dfa Reduce comments font size for events feed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-26 11:13:06 +02:00
Dmitriy Zaporozhets 92ca779ebc Improve comment header
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-26 10:55:04 +02:00
Dmitriy Zaporozhets 0a05c8dd8d Improve md typography
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-26 10:45:22 +02:00
Dmitriy Zaporozhets fb74d4a948 Merge branch 'request/monospace_gfm_input' into 'master'
Use monospace fonts for GFM inputs

This is an MR for [this feedback suggestion](http://feedback.gitlab.com/forums/176466-general/suggestions/5593468-use-monospace-font-in-wiki-edit-content-textarea).

I'm not sure exactly where the best place for the fix is, but I opted for the typography.scss file.  Basically, all ``textarea.js-gfm-input`` elements are styled with ``font-family: $monospace_font;``.

*PS: this being my first MR to gitlab, I apologize if I missed any steps in the process; let me know what's missing and I'll correct it here & in future MRs*
2014-03-26 08:32:06 +00:00
Dmitriy Zaporozhets 7f67e066dc More compact event feed and projects list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 20:10:08 +02:00
Dmitriy Zaporozhets e421772f89 Revert "Clearfix on well-lists. Pages affected:"
Because it adds extra spaces at each project row on dashboard

This reverts commit 2767abd90d.
2014-03-25 19:53:30 +02:00
Dmitriy Zaporozhets a5d7d125e4 Merge pull request #6577 from tombruijn/group_projects_clearfix
Clearfix on .well-list
2014-03-25 19:40:23 +02:00
Dmitriy Zaporozhets c21c3e5707 Add bottom margin to highlighed code block in comment/wiki
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 19:32:49 +02:00
Dmitriy Zaporozhets 12778fbe19 Merge pull request #6612 from Datacom/feature/print_styles_pr
Print Styles
2014-03-25 11:07:10 +02:00
George Dewar 842ad4a425 Initial implementation 2014-03-25 15:58:16 +13:00
Dmitriy Zaporozhets 3ef0a625ac Applications js to coffee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-24 16:12:23 +02:00
Marin Jankovski 5e985a7eed Use emoji assets on autocomplete. 2014-03-24 14:22:11 +01:00
Drew Blessing dab09af518 Mobile UI Improvements
Move spinner for mobile
2014-03-23 21:30:37 -05:00
Ali Tavakoli 78261b4aad Set monospace font-family for textarea.js-gfm-input 2014-03-21 14:14:11 -04:00
Tom de Bruijn 2767abd90d Clearfix on well-lists. Pages affected:
Pages affected:
- admin/groups#show
- admin/projets#index
- admin/users#index
- dashboard/issues#index (on small screens)
2014-03-20 13:31:55 +01:00
Dmitriy Zaporozhets c1fd25ce6e Replace turbolink spinner with nprogress
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-19 12:59:23 +02:00
Dmitriy Zaporozhets 2a7da96a0d Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/stylesheets/sections/commits.scss
	app/assets/stylesheets/sections/notes.scss
	app/views/projects/commits/_diffs.html.haml
	features/steps/project/merge_requests.rb
2014-03-13 23:11:16 +02:00
Dmitriy Zaporozhets ae4ae2b225 Move images from vendor to app so they are compiled by rails
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-12 10:19:24 +02:00
Dmitriy Zaporozhets 7157f79caa Refactor js behaviours helpers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-11 15:15:08 +02:00
Dmitriy Zaporozhets 694388dfbc Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-06 15:50:18 +02:00
Dmitriy Zaporozhets 261f212b3b Use rails helper image-url for reference images in css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-06 11:05:00 +02:00
Robert Speicher 1688a29023 Add GFM autocompletion for MergeRequests
Requested
[here](http://feedback.gitlab.com/forums/176466-general/suggestions/5507440-auto-complete-merge-requests-in-gitlab-markdown).
2014-03-05 23:24:03 -05:00
Dmitriy Zaporozhets e6e0ad4e5e Merge branch 'feature/reopen_mr' into 'master'
Feature: reopen closed merge request
2014-03-03 13:18:48 +00:00
Jason Blanchard 3ada1d7ec3 Added option to remove issue assignee on project issue page and issue edit page 2014-03-02 13:10:45 -05:00