Commit graph

148 commits

Author SHA1 Message Date
Riyad Preukschas db2c15369c Merge branch 'master' into discussions
Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb
2012-12-23 01:03:57 +01:00
Dmitriy Zaporozhets a7aee9d1ee Pretty compare mode 2012-12-19 20:14:05 +03:00
Koen Punt 9916e8d6dc Updated test to match with switched commits
Added compare switch
2012-12-20 14:39:39 +01:00
Dmitriy Zaporozhets 8826077471 Refactor css lists. Use well-list class 2012-12-18 06:14:05 +03:00
Dmitriy Zaporozhets f2db188dbe Processing with note events. reformated dashboard for more events to handle 2012-12-14 21:39:55 +02:00
Dmitriy Zaporozhets a8fbda945e bit reordering and cleanup unused styles 2012-12-13 21:44:55 +02:00
Dmitriy Zaporozhets bca7bddd3d Add ace editor to snippets 2012-12-12 19:42:08 +02:00
Dmitriy Zaporozhets 105f5ba3c9 Reduce header font a bit. Moved to mixin header font styles 2012-12-12 12:30:19 +02:00
Dmitriy Zaporozhets ca936d2784 Improve CI integration for merge requests 2012-12-11 06:14:05 +03:00
Dmitriy Zaporozhets 55f776f095 Tiny nav 2012-12-06 16:54:53 +02:00
Dmitriy Zaporozhets 4c3cdfa4ff Make profile dropbown a bit bigger 2012-12-05 17:08:24 +02:00
Riyad Preukschas b47173da6a Revamped note form options. 2012-12-03 22:51:57 +01:00
Riyad Preukschas 4ed8278870 Fix a bunch of smaller glitches. 2012-12-03 22:51:57 +01:00
Riyad Preukschas 6fc10fa256 Unify forms for discussions and main target.
Allows previews and uploads in all forms.
Also fixes #1730
2012-12-03 22:51:56 +01:00
Riyad Preukschas fbd345ea20 Make attachments more obvious 2012-12-03 22:51:56 +01:00
Riyad Preukschas 140652e9b0 Fix common form and note preview 2012-12-03 22:51:56 +01:00
Riyad Preukschas d9b15fc17d Crop and rename the add diff note image 2012-12-03 22:51:56 +01:00
Riyad Preukschas 494ae87840 Refactor discussion reply 2012-12-03 22:51:56 +01:00
Riyad Preukschas 06ea122840 Refactor diff notes creation 2012-12-03 22:51:56 +01:00
Riyad Preukschas 39834ec640 Move diff notes into the actual diff content column 2012-12-03 22:51:56 +01:00
Riyad Preukschas 5c2f6d7f05 Update notes views to support discussions 2012-12-03 22:51:55 +01:00
Dmitriy Zaporozhets ba74fa1413 Remove some bugs. Add warnings for renaming group. Add ability to cahnge group owner. 2012-12-03 21:14:05 +03:00
Dmitriy Zaporozhets f2a76228f2 Remove unsued css styles. Fixed Milestone preselected date. 2012-12-01 09:14:05 +03:00
Dmitriy Zaporozhets 0530e5baae Add description to project features on edit project page 2012-12-02 19:28:23 +02:00
Dmitriy Zaporozhets eb3e07a509 Use project owner if no namespace. Restyled team page 2012-11-30 18:26:17 +02:00
Koen Punt 0f31392712 Mixins are now all with dashes instead of underscores
(there really should be some convention for all gitlab css)
2012-11-29 12:18:44 +01:00
Koen Punt d7e9eda24d renamed blue_link var to primary_color 2012-11-29 12:18:44 +01:00
Koen Punt 81175073a0 removed overqualified mixins round-borders-* 2012-11-29 12:18:44 +01:00
Koen Punt 238c214ac9 Forgot to rename var 2012-11-29 12:18:44 +01:00
Koen Punt b825582eb1 replaced redundant -*-border-radius box-shadows and others with corresponding mixins 2012-11-29 12:18:44 +01:00
Koen Punt 84de1b71d1 Added some uniformity, all css properties and values are separated by a colon and a space : 2012-11-29 12:18:44 +01:00
Dmitriy Zaporozhets 9e8aadb0f0 Merge pull request #2026 from koenpunt/extended-image-diff
Added bg for transparent images
2012-11-21 12:56:06 -08:00
Robert Speicher 30a66c065a Improve user feedback on the Profile > Design page
- Header changes immediately without a page reload
- Lets the user know that we actually saved their setting when changed
2012-11-21 15:01:40 -05:00
Koen Punt 1de0ea28b9 added bg for transparent images
added width and height below images in diff
2012-11-21 18:27:21 +01:00
Dmitriy Zaporozhets 4c6c24856c Themes refactored 2012-11-21 18:19:03 +02:00
Dmitriy Zaporozhets 0046409970 I prefer icons on header 2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets 6bf656970d Use fieldset. Improved profile 2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets c1c1a1eeee Restored old h6 of bootstrap. Fixed buttons line-height 2012-11-21 09:14:15 +02:00
Dmitriy Zaporozhets 942c410119 Implemented bootstrap 2.2.1.1. Restyled header panel 2012-11-20 23:05:15 +02:00
Dmitriy Zaporozhets ebcbe0c87b Add status badge for MR 2012-11-20 20:34:05 +03:00
Dmitriy Zaporozhets 6878f55620 Bigger file name for commits diff 2012-11-19 14:01:40 +02:00
Dmitriy Zaporozhets 86b181398c Merge pull request #2011 from koenpunt/extended-image-diff
Optimized commit diff views, now showing file size and file mode changes
2012-11-19 04:01:49 -08:00
Koen Punt 3ac1f9459a Optimized commit diff views, now showing file size and file mode changes
Replaced commit status images (diff_file_*.png) with fontawesome icons
2012-11-18 17:41:41 +01:00
Riyad Preukschas 98e938bdb0 Fix editor form, styles and JS 2012-11-17 15:43:13 +01:00
Riyad Preukschas 6c1b44859d Fix Haml indenting file content 2012-11-17 01:00:26 +01:00
Dmitriy Zaporozhets 3c7806c3f2 Improve lists. Remove unneccessary padding 2012-11-11 00:08:42 +02:00
Dmitriy Zaporozhets 283a9c7b7d Fix margin-right for some avatars 2012-11-10 23:45:13 +02:00
Dmitriy Zaporozhets 949233aa1f Changed default icon for gravatar. Moved filter out of layout 2012-11-06 13:47:43 +02:00
Dmitriy Zaporozhets f555578414 Added EventFilter class. Compeleted first version of dashbaord filtering 2012-11-05 20:12:26 +02:00
randx ecdf778e80 Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/gitlabhq into piffio-public_submission_milestones_for_mr
Conflicts:
	app/views/merge_requests/_form.html.haml
2012-10-29 21:37:46 +02:00