deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3747 commits 6 branches 43 tags 25 MiB
Commit graph

33 commits

Author SHA1 Message Date
Riyad Preukschas
3022786948 Merge commit 'master' into discussions 
Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
 2013-01-15 00:52:25 +01:00
Dmitriy Zaporozhets
c6298678f5 use ui-box as for all 2013-01-04 23:35:31 +02:00
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
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
Koen Punt
81175073a0 removed overqualified mixins round-borders-* 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
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
6878f55620 Bigger file name for commits diff 2012-11-19 14:01:40 +02: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
646bad43e9 Fix styles 2012-10-27 18:27:51 +02:00
randx
9902f1af6e Reduce line-height for commits diff lines 2012-10-22 23:49:21 +03:00
Riyad Preukschas
77bde9a0e4 Add notes count to commits in lists. 2012-10-10 01:31:36 +02:00
Dmitriy Zaporozhets
a79eb84289 commit show page styled a bit 2012-09-28 16:05:54 +03:00
Dmitriy Zaporozhets
d23022c6f6 Working on dashboard restyle and events refactoring 2012-09-24 12:32:51 +03:00
randx
51558bd57a Refactoring scss & improving some UI elements 2012-08-29 22:29:50 +03:00
randx
1dd938d20c SCSS refactoring & cleanup. First iteration 2012-08-29 21:23:43 +03:00
randx
bc7897180d Better visibility of event commit links & commits ids 2012-07-28 00:27:54 +03:00
randx
18f83016b1 Fixed persmission issue in doc. Added validation of hooks in gitlab:app:status 2012-07-26 16:14:34 +03:00
Dmitriy Zaporozhets
9497b1a76e Compare images 2012-07-05 23:19:37 +03:00
Valeriy Sizov
a09558921b InlineDiff: base implementation 2012-07-02 23:08:07 +03:00
Nathan Anderson
19a9cd7f9d Included good default font for Windows. 2012-06-19 07:56:09 -03:00
Dmitriy Zaporozhets
acdbc1b4c5 Better fonts for code 2012-06-19 13:48:39 +03:00
randx
36e88b960a CSS refactoring 2012-06-13 20:02:30 +03:00
randx
78f4c789b3 Improved Commit diff -> Images. Red border for removed & green for added images 2012-05-30 21:02:30 +03:00
Dmitriy Zaporozhets
c0df0cd70c Commit header improved. finalize PR 667 2012-04-16 01:10:09 +03:00
Arthur Schreiber
ad25dac8b6 Change the design a bit to look more like before. 2012-04-14 12:38:12 +02:00
Arthur Schreiber
d9ba277ee1 Make parent sha links nicer for merge commits. 2012-04-14 12:38:12 +02:00
Arthur Schreiber
c530543c1a Nicer commit headers. 2012-04-14 12:38:12 +02:00