Commit graph

3844 commits

Author SHA1 Message Date
gitlabhq 44c8162e78 Merge branch 'dev' 2011-11-02 22:18:02 +02:00
gitlabhq 020e1a8eee dashboard 2011-11-02 22:14:03 +02:00
gitlabhq 83c1194d52 Merge branch 'dev' into user_dashboard 2011-11-02 20:59:06 +02:00
gitlabhq 5fb1b9ffe3 view refactoring 2011-11-02 11:21:17 -04:00
gitlabhq a6fa80529a body class 2011-11-02 00:19:29 +02:00
gitlabhq e9b22a2def Merge branch 'dev' into user_dashboard
Conflicts:
	app/views/layouts/_head_panel.html.erb
2011-11-01 22:56:58 +02:00
gitlabhq 5e12f10c14 fixes 2011-11-01 22:51:20 +02:00
gitlabhq 82d16ccfd1 commits + tree in progress 2011-11-01 22:11:24 +02:00
gitlabhq babd0557cb Merge branch 'dev' into new_layout
Conflicts:
	app/assets/stylesheets/projects.css.scss
2011-11-01 20:29:46 +02:00
gitlabhq e8d10b3217 issues fix layout 2011-11-01 13:17:36 +02:00
gitlabhq 84397ce88c commits page 2011-11-01 12:48:26 +02:00
gitlabhq 0903932320 updated 2011-11-01 11:22:16 +02:00
gitlabhq d405292388 project page fixed 2011-11-01 11:00:59 +02:00
gitlabhq 485c5199b7 user dashboard 2011-10-31 22:57:16 +02:00
Nihad Abbasov 267bd6068c Merge branch 'issue-101' into dev 2011-10-31 23:37:09 +04:00
Nihad Abbasov 11b70c97e3 fix issue notification properly 2011-10-31 23:21:28 +04:00
Nihad Abbasov 3e95a6d73b make commit messages multiline 2011-10-31 17:34:22 +04:00
Nihad Abbasov 43c1039957 don't send notification to issue creator 2011-10-31 16:49:38 +04:00
Nihad Abbasov 3f24f54061 install letter_opener 2011-10-31 16:20:41 +04:00
gitlabhq 9bf39477de commit 2011-10-31 13:30:53 +03:00
gitlabhq fb33ccd87f Merge branch 'dev' into new_layout 2011-10-31 13:11:46 +03:00
gitlabhq 3becd06423 icons & css 2011-10-31 13:11:22 +03:00
Nihad Abbasov ded7d08d70 Merge branch 'refs/heads/markdown_notes' into dev 2011-10-31 13:49:33 +04:00
Nihad Abbasov 31280cd4cb fix markdown truncation on dashboard 2011-10-31 13:47:10 +04:00
Nihad Abbasov 406076731e Merge branch 'refs/heads/markdown_notes' into dev 2011-10-30 19:49:09 +04:00
Nihad Abbasov 1f3323f908 use helper to markdown text 2011-10-30 17:41:57 +04:00
gitlabhq 0dc5364aec reset pwd 2011-10-28 18:29:52 +03:00
gitlabhq 5d879a0643 signin page 2011-10-28 18:25:00 +03:00
gitlabhq 487ae906a9 project layout 2011-10-28 15:07:58 +03:00
gitlabhq 1ffb4b98c0 new design/layout started. projects page 2011-10-28 14:41:39 +03:00
gitlabhq ae47d69281 Merge branch 'dev' 2011-10-28 12:33:07 +03:00
gitlabhq 3fa770dd10 Merge branch 'new_issue' into dev 2011-10-28 12:26:25 +03:00
gitlabhq a017181339 new issue format 2011-10-28 12:22:09 +03:00
VSizov fb40d27d1e remove spaces 2011-10-28 11:34:30 +03:00
Nihad Abbasov 6c7706eb17 process notes w/ rdiscount 2011-10-28 00:57:10 +05:00
Nihad Abbasov e92669fb2d install rdiscount 2011-10-28 00:37:17 +05:00
Nihad Abbasov 89fa800e28 Merge branch 'refs/heads/snippets_expiration' into dev
Conflicts:
	db/schema.rb
2011-10-28 00:28:37 +05:00
Nihad Abbasov b6cdd1c819 test expired snippets 2011-10-28 00:25:50 +05:00
Nihad Abbasov 01f72bfa83 Revert "install timecop for testing"
This reverts commit 0aa5682f8e3d2f50443fa8ac457daf5c9784dfd8.
2011-10-27 23:35:16 +05:00
gitlabhq 56d9761844 moving out of body 2011-10-27 18:46:30 +03:00
gitlabhq 2258db66c2 issue can be edit from show page 2011-10-27 18:18:50 +03:00
gitlabhq f4e7ad7a4b fixed limit 2011-10-27 17:41:10 +03:00
gitlabhq 9611a27e0c note as text 2011-10-27 17:33:20 +03:00
gitlabhq 5fe736ab28 little fix 2011-10-27 17:08:40 +03:00
gitlabhq e41bc4dd50 #173 2011-10-27 16:50:35 +03:00
DZ 84457708d8 Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev 2011-10-27 16:47:39 +03:00
gitlabhq d64f23e294 code cleaning 2011-10-27 16:44:29 +03:00
Nihad Abbasov bd219fcc54 Merge branch 'refs/heads/assets-refactoring' into dev 2011-10-27 16:22:55 +05:00
Nihad Abbasov 2db09ada72 extend assets path with jquery-ui images, so rails can find them 2011-10-27 16:14:46 +05:00
Nihad Abbasov 00613d0d50 Merge branch 'refs/heads/assets-refactoring' into dev 2011-10-27 14:51:05 +05:00