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
|
dd20da1bff
|
Fix pager loading on every page in application
|
2013-01-10 17:38:37 +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 |
|
Alex Denisov
|
d7bc121474
|
replace javascript:void with preventDefault
|
2013-01-09 21:02:41 +00:00 |
|
Alex Denisov
|
5133fe8efb
|
dashboard js -> coffee
|
2013-01-09 19:30:20 +00:00 |
|
Alex Denisov
|
3cc0458312
|
Reloading of events via ajax instead of page reloading.
|
2013-01-09 19:30:20 +00:00 |
|
AlexDenisov
|
0d9f73fa1e
|
JavaScript removed from dashboard#index template.
|
2013-01-09 19:30:20 +00:00 |
|
Alex Denisov
|
97d17cf835
|
Event filters stores at cookies.
|
2013-01-09 19:30:20 +00:00 |
|
Dmitriy Zaporozhets
|
f9528bfb86
|
a bit of restyling for issues and merge request lists
|
2013-01-08 08:14:05 +03:00 |
|
Dmitriy Zaporozhets
|
8d8c161a7f
|
Speedup dashboard via loading events with ajax
|
2013-01-07 14:36:01 +02:00 |
|
Dmitriy Zaporozhets
|
6c777ff823
|
Improve milestone show page
|
2013-01-07 14:08:03 +02:00 |
|
Dmitriy Zaporozhets
|
891bc414b1
|
Fix merge_request js -> ci_path
|
2013-01-05 23:26:14 +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 |
|
Riyad Preukschas
|
7335f366dc
|
Fix comment and reply buttons
|
2013-01-02 20:49:27 +01: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
|
efc4cae1b7
|
Add License
|
2012-12-24 14:33:16 +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
|
a567d596f8
|
Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
Fix and refactoring gfm_autocomplete
|
2012-12-21 02:47:55 -08:00 |
|
Valeriy Sizov
|
77d632890b
|
refactoring gfm_autocomplete
|
2012-12-20 20:52:12 +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 |
|
Dmitriy Zaporozhets
|
40c6d87175
|
Merge pull request #2315 from koenpunt/gh-issue-513
Added compare switch
|
2012-12-20 06:15:39 -08:00 |
|
Koen Punt
|
b2e31692a5
|
Added icon
|
2012-12-20 14:58:07 +01:00 |
|
Koen Punt
|
9916e8d6dc
|
Updated test to match with switched commits
Added compare switch
|
2012-12-20 14:39:39 +01:00 |
|
Dmitriy Zaporozhets
|
2f7effe804
|
Refactor issues, Remove ajax
|
2012-12-19 06:14:05 +03:00 |
|
Dmitriy Zaporozhets
|
8826077471
|
Refactor css lists. Use well-list class
|
2012-12-18 06:14:05 +03:00 |
|
Dmitriy Zaporozhets
|
85d5f606f6
|
Labels autocomplete
|
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 |
|
Johannes Schleifenbaum
|
d3b3810928
|
fix dark code preview background when displaying long lines
|
2012-12-15 11:44:30 +01:00 |
|