Commit graph

75 commits

Author SHA1 Message Date
Andrew8xx8 ff94f29be5 States events fixed 2013-02-18 16:49:56 +04:00
Andrew8xx8 1644117a1a Issue uses StateMachine now 2013-02-18 14:43:50 +04:00
Dmitriy Zaporozhets e2fb18a3ec replace right with pull-right 2013-01-30 16:40:43 +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 e25656d09b Improve wiki typography 2013-01-10 18:09:12 +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 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 03369a9165 Use one helper for linking to team member. More clear title for Issue and MR 2012-12-13 06:14:05 +03:00
Riyad Preukschas 4ed8278870 Fix a bunch of smaller glitches. 2012-12-03 22:51:57 +01:00
Riyad Preukschas 494ae87840 Refactor discussion reply 2012-12-03 22:51:56 +01:00
Riyad Preukschas fa4c38f32b Fix issues close and reopen button text and styles 2012-10-16 19:17:48 +02:00
Robert Speicher ba72c6f683 Escape text passed directly to gfm 2012-09-19 20:21:12 -04:00
Riyad Preukschas b8113334a8 Highlight voting notes for issues and merge requests 2012-09-15 11:54:46 +02:00
Riyad Preukschas 61eb650db0 Rename 'notes/notes' partial to 'notes/notes_with_form' 2012-09-14 21:41:56 +02:00
Riyad Preukschas 0bfcc574b6 Extract displaying votes into partials 2012-09-11 16:48:11 +02:00
Riyad Preukschas a5164ea2ed Show votes as a bar 2012-09-08 16:44:56 +02:00
Riyad Preukschas 5ca31aa252 Make issue buttons look more consistent with MRs 2012-09-08 16:07:51 +02:00
Riyad Preukschas 1271b4ce66 Update display of merge requests and issues to also show downvotes 2012-09-08 16:07:44 +02:00
Robert Speicher 7754189187 Fully embrace Ruby 1.9 hash syntax
Didn't bother with files in db/, config/, or features/
2012-08-10 18:25:15 -04:00
Riyad Preukschas eb06dd79f8 Update views for GFM 2012-08-02 02:54:57 +02:00
Riyad Preukschas 0aee7c94d0 Update links to milestones 2012-07-25 21:11:58 +02:00
randx 6a58deb536 UI changes:
* .page_title  class added. Used for better page headers
* improved help page
* added back links for help pages
* show app version & revision on help page

Backend changes:
* Gitab::Version && Gitlab::Revision constants
2012-07-01 00:35:24 +03:00
Dmitriy Zaporozhets 1b1e77c728 Issue Labels: Edit, show, index + filter 2012-06-27 21:20:35 +03:00
randx 88c625e3f7 Issues can be unassigned now 2012-06-26 21:47:25 +03:00
randx 0321a3c9b4 MR: merged badge. Removed colors from MR list 2012-06-26 19:08:44 +03:00
Andrey Vakarev 3bd06d55e0 Remove trailing whitespaces and trailing lines 2012-06-04 01:37:27 +03:00
Dmitriy Zaporozhets ddc7568fec Milestone show, Team index: Better UI 2012-05-24 09:23:52 +03:00
Dmitriy Zaporozhets f1795a4911 Issues form improved, Show milestone for Issue show 2012-04-17 00:22:59 +03:00
Dmitriy Zaporozhets 740e54c3fc Merge pull request #667 from keikubo/master
The indents errors of pre blocks in haml
2012-04-11 13:34:15 -07:00
Dmitriy Zaporozhets e7add858cf bug fixes & bootstrap buttons 2012-04-11 23:32:45 +03:00
Kei Kubo 42f04bf70c bug fix: broken indents fixed in markdown rendered statements 2012-04-11 19:36:52 +00:00
randx 69ef81404c UI improved, .main_box css class for show pages 2012-03-28 10:46:51 +03:00
Dmitriy Zaporozhets 46906ca9db Issues, Merge Request show page polished. Fixed +n overflow 2012-03-28 00:31:14 +03:00
Dmitriy Zaporozhets 39ea486e1f Fixed specs. Some css fixes 2012-03-25 19:44:29 +03:00
Dmitriy Zaporozhets 8652cd8989 Preparing 591 for merge. Restyled issues & merge requests. Fixed issue edit. 2012-03-25 19:05:24 +03:00
Steven Verbeek 9cbd1aef20 Fixed row messed up. Started on overall look. 2012-03-17 03:31:38 -03:00
Steven Verbeek aeed7da6d4 Fixed HR 2012-03-17 02:48:22 -03:00
Steven Verbeek 1c2c860c22 Fixed css issues with issues :) 2012-03-17 02:46:47 -03:00
Steven Verbeek 1b96985025 Re-added back to issues list, but moved it above title. Added css to move issue meta data around. 2012-03-17 02:22:12 -03:00
Steven Verbeek 7712d81f9b Moved OPEN and removed back link (you can easily click on issues to get to the same spot) 2012-03-17 02:17:04 -03:00
Steven Verbeek 3263f2e1ab Fixed markdown. 2012-03-17 02:13:36 -03:00
Steven Verbeek 4dc1331676 Markdown for issue description, added issue title 2012-03-17 02:09:16 -03:00
Steven Verbeek 94fd9a6e47 Added issue description. 2012-03-17 00:24:40 -03:00
Ariejan de Vroom cbc56a96ac Updated upvotes view for issue and merge request show 2012-03-15 13:03:56 +02:00
Ariejan de Vroom 27e3699814 Links +upvote buttons directly to the notes section 2012-03-15 00:56:42 +02:00
Ariejan de Vroom 2d00f2dfe4 Added 'x notes' and +1 counters to issues and merge requests. Refs #549 2012-03-15 00:51:03 +02:00
Ariejan de Vroom 8d8b82127f Count +1 votes in issue notes. 2012-03-14 15:31:31 +02:00
Ben Evans 2b5c61bdec Title for a link fixed 2012-02-25 11:03:44 +00:00