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

904 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
533693ab41 Fix dark color bg for wiki 2013-03-04 21:11:03 +02:00
Dmitriy Zaporozhets
ef646928e4 better presenting for group description 2013-03-01 16:26:26 +02:00
Dmitriy Zaporozhets
22d6ce9873 Merge pull request #3082 from devote/patch-1 
Distorted lines in `diff`
 2013-02-28 23:46:07 -08:00
Dmitriy Zaporozhets
e1f77b9be0 Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker 
Conflicts:
	Gemfile.lock
 2013-02-28 17:02:20 +02:00
Andrew8xx8
ab98db73a3 Issues tracker settings enableds/disableds without page reloading now 2013-02-28 16:11:14 +04:00
Dmitriy Zaporozhets
54d95f5897 Restyle flash message. Not it does not overflow head panel 2013-02-28 11:06:52 +02:00
Sato Hiroyuki
2a687dd562 Show gravatar icon on tooltip. 2013-02-28 14:56:27 +09:00
Sato Hiroyuki
14c2a37da2 A tip is made slanting. 2013-02-28 11:44:52 +09:00
Dmitriy Zaporozhets
863d297ede reduce fonts size for wiki render 2013-02-27 21:10:23 +02:00
Sato Hiroyuki
d8a40d8c93 Move graph module from lib or vendor directory to app directory. 
Because not autoloading lib directory at development mode.
 2013-02-26 20:31:39 +09:00
Dmitrii Pakhtinov
e975ed836d Distorted lines in diff 
Distorted lines in `diff` when viewing files `windows-style-line-separator: \r\n`
 2013-02-25 12:21:38 +04:00
Dmitry Medvinsky
b0fb68c191 Add transition on search box 
It's kind of cool trend to use animated-expanding search box nowadays.
E.g. see Github.
 2013-02-22 20:50:17 +04:00
Dmitriy Zaporozhets
585259b837 Fix merge state detection 2013-02-21 09:25:07 +02:00
Dmitriy Zaporozhets
155703c613 Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine 
Conflicts:
	app/models/issue.rb
	app/models/merge_request.rb
 2013-02-19 11:01:19 +02:00
Andrew8xx8
6e333d5075 Javascript widget fixed 2013-02-19 12:57:09 +04:00
Dmitriy Zaporozhets
a29db26cc9 Refactor and restyle team page for project 2013-02-18 21:10:49 +02:00
Dmitriy Zaporozhets
97de6f851b Fix not-working team memebership permissions change 2013-02-18 16:40:11 +02:00
Dmitriy Zaporozhets
1efeb1b562 redesign mars theme a bit. Better border color for search-input for dark theme 2013-02-17 12:16:19 +02:00
Dmitriy Zaporozhets
32a5548c41 Fix link color for dark theme 2013-02-17 12:05:26 +02:00
Dmitriy Zaporozhets
42ffbea8e0 Fix logo alignment for default theme 2013-02-16 21:37:06 +02:00
Dmitriy Zaporozhets
18a496142b Reduce size of nav panel. Fixed nav background for IE. Refactored mars theme 2013-02-16 21:24:51 +02:00
Dmitriy Zaporozhets
622dae76cc style network graph form a bit 2013-02-12 19:22:40 +02:00
Dmitriy Zaporozhets
8bf8c70c4b Import repo feature 2013-02-11 23:00:12 +02:00
Dmitriy Zaporozhets
8e0b58d7e7 render note with attachment for event 2013-02-11 15:47:01 +02:00
Dmitriy Zaporozhets
66121d6caa Improve devise views 2013-02-07 13:20:33 +02:00
Dmitriy Zaporozhets
130f60d55b a bit of restyling. Replace some images with icons. Simplify note form 2013-01-31 11:22:06 +02:00
Dmitriy Zaporozhets
b096ee3275 a bit of split up for gitlab-bootstrap 2013-01-30 17:01:58 +02:00
Dmitriy Zaporozhets
b742f47e89 remove old alert messages 2013-01-30 16:53:18 +02:00
Dmitriy Zaporozhets
e2fb18a3ec replace right with pull-right 2013-01-30 16:40:43 +02:00
Dmitriy Zaporozhets
7ba4f2dcfa few styling for buttons 2013-01-29 22:57:15 +02:00
Dmitriy Zaporozhets
fb617c61b9 refactor buttons pt2 2013-01-29 22:29:21 +02:00
Dmitriy Zaporozhets
033aa1a885 refactor buttons pt1 2013-01-29 22:18:19 +02:00
Dmitriy Zaporozhets
e0b5e26035 Merge pull request #2153 from koenpunt/commit-diff-views 
Added swipe view for image diff
 2013-01-27 11:41:23 -08:00
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
ce0ec05c63 Pager.js to coffee 2013-01-27 18:47:19 +02: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
eb99feb4a7 simple refactoring 2013-01-24 22:31:48 +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
Dmitriy Zaporozhets
ee43e9248c Add warning if user own projet but not in team. Also show loading when merge MR 2013-01-21 15:05:18 +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
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