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

663 commits

Author SHA1 Message Date
Koen Punt
e33debc214 Updated commit diff view with some minor visual modifications 
Prepared diff view for multiple view modes

Converted commits.js to coffeescript
image info in separate coffeescript file

Added swipe view mode

Added onion skin viewMode
 2013-01-27 18:27:32 +01:00
Dmitriy Zaporozhets
20a4742efd Fixing team tests 2013-01-25 11:36:15 +02:00
Dmitriy Zaporozhets
aa1f1eb680 Merge pull request #2746 from gitlabhq/features/teams 
New feature: Teams
 2013-01-25 00:46:20 -08:00
Dmitriy Zaporozhets
ac8247b46d Improved search. added filters 2013-01-25 10:07:21 +02:00
Andrey Kumanyaev
a5ce8696a6 remove unused autogenerated files 2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
497f7ab5ba save autogenerated files 2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
cca9935970 save generated files 2013-01-24 22:31:24 +02:00
Andrey Kumanyaev
c098ac6430 update stylesheets (for teams block) 2013-01-24 22:31:24 +02:00
Dmitriy Zaporozhets
70690e1971 base implementation 2013-01-22 19:05:01 +02:00
Dmitriy Zaporozhets
2be107d0d9 Help with index 2013-01-22 17:58:09 +02:00
GitLab
232d61d598 Refactor project creation. Added logout link to profile page 2013-01-17 17:35:57 +02:00
Marin Jankovski
296cdd591f Add optional signup. 2013-01-18 11:57:31 +01:00
Dmitriy Zaporozhets
bf753e99e7 Improve link to comment targets on dashboard 2013-01-17 22:54:02 +02:00
Dmitriy Zaporozhets
4bb1664aae Merge pull request #2649 from tjeezy/patch-1 
Eliminate horizontal shifting on diff body heights
 2013-01-17 12:38:58 -08:00
Dmitriy Zaporozhets
2e9c0e2b47 switch to use link_to_member to prevent 500 if user is a project owner but does not have membership and leave comment 2013-01-17 22:35:45 +02:00
TJ Koblentz
f65713dfa6 Eliminate horizontal shifting on diff body heights 2013-01-17 11:35:35 -08:00
Riyad Preukschas
9bc829d397 Fix markdown for note events 2013-01-16 23:03:21 +01:00
Dmitriy Zaporozhets
f598cc7897 change logic on line_code 2013-01-15 11:12:17 +02:00
Riyad Preukschas
bda7fe38d0 Merge branch 'master' into discussions 2013-01-15 00:53:00 +01:00
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
a36926216f line numbers for blame 2013-01-14 20:55:57 +02:00
Dmitriy Zaporozhets
68bfcd0521 Add public filter to admin projects 2013-01-13 17:25:18 +02:00
Riyad Preukschas
fd836f5490 Update empty error messages and warn if not viewing the most recent wiki page 2013-01-11 21:04:21 +01:00
Dmitriy Zaporozhets
e25656d09b Improve wiki typography 2013-01-10 18:09:12 +02:00
Dmitriy Zaporozhets
abc2bdc3aa Remove unused images. More use of font-awesome icons 2013-01-10 08:43:25 +02:00
Dmitriy Zaporozhets
c2982c9a31 sidekiq.log in admin area. Improved admin dashboard 2013-01-10 08:43:25 +02:00
Dmitriy Zaporozhets
f9528bfb86 a bit of restyling for issues and merge request lists 2013-01-08 08:14:05 +03:00
Dmitriy Zaporozhets
6c777ff823 Improve milestone show page 2013-01-07 14:08:03 +02:00
Dmitriy Zaporozhets
eaa8cd28d0 Merge branch 'mergerequest-to-coffee' of https://github.com/koenpunt/gitlabhq into koenpunt-mergerequest-to-coffee 2013-01-05 22:54:48 +02:00
Dmitriy Zaporozhets
1724f45f46 Remove unused styles. Restyled Issues a bit 2013-01-05 14:49:08 +02:00
Dmitriy Zaporozhets
de05a598b3 Update to rails 3.2.10. Use simplercov in spinach too 2013-01-05 13:30:42 +02:00
Dmitriy Zaporozhets
e3d7ce2cc4 Tests are fixed now 2013-01-05 12:12:02 +02:00
Koen Punt
a1566a9c86 Converted merge_requests.js to coffeescript and updated code 2013-01-05 02:53:34 +01:00
Dmitriy Zaporozhets
e16cebac3e Fixed styles, ProjectHook specs etc 2013-01-05 00:35:38 +02:00
Dmitriy Zaporozhets
c6298678f5 use ui-box as for all 2013-01-04 23:35:31 +02:00
Dmitriy Zaporozhets
22ec3fa14c Fix MR css for accept MR block 2012-12-31 18:35:38 +02:00
Dmitriy Zaporozhets
4ba24596d3 Make the logo icon more awesome 2012-12-24 21:18:23 +02:00
Dmitriy Zaporozhets
2937f35f9a Replace Wire font with Yanone. Show only icon as link to dashboard 2012-12-24 14:24:45 +02:00
Dmitriy Zaporozhets
d80d4cd92b Replace font with free one 2012-12-24 12:37:28 +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
cec866a7ce Improve wiki rendering. Fix pygemnt + markdown invalid html 2012-12-22 13:01:15 +02:00
Dmitriy Zaporozhets
86673a66b7 Fix fark background highlight 2012-12-21 23:22:52 +02:00
Dmitriy Zaporozhets
a47032bc29 Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into koenpunt-gh-issue-1509 
Conflicts:
	vendor/assets/javascripts/branch-graph.js
 2012-12-21 13:07:34 +02:00
Dmitriy Zaporozhets
9bc315bb25 Merge pull request #2211 from jojosch/fix-dark-code-preview 
fix dark code preview background when displaying long lines
 2012-12-20 07:46:59 -08: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
9b57bf7811 Remove main. Use application.scss instead 2012-12-19 20:57:41 +02:00
Dmitriy Zaporozhets
965102b3f6 Move mixins and variables under gitlab bootstrap 2012-12-19 19:02:12 +02:00
Dmitriy Zaporozhets
52fbcd45a4 Better organization of styles 2012-12-19 18:34:24 +02:00