Alexander Machehin
|
4b9d0616d6
|
Merge branch '3.2-master' into 194-issue_page
Conflicts:
app/views/issues/_create_sidebar.html.haml
|
2012-03-07 01:19:34 +06:00 |
Pavel Chipiga
|
7308c4a0d2
|
Merge branch '3.2-master' into 255-search
Refactor avatars. Fix user bugs. Remove ssh_key delete migration
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/user.rb
|
2012-03-06 20:59:29 +02:00 |
|
Alexander Machehin
|
8ae7ebee2b
|
Merge branch '3.2-master' into 194-issue_page
|
2012-03-06 22:51:13 +06:00 |
|
Alexander Machehin
|
1791160b09
|
[refs #194] fix manage issue executor
|
2012-03-06 22:31:07 +06:00 |
konstantin.grabar
|
9b68752ffd
|
[refs #257] Change avatar helper and logic. Add paperclip avatar to users
|
2012-03-03 22:05:02 +04:00 |
|
Alexander Machehin
|
66a08662c2
|
[refs #194] new styles; some changes
|
2012-02-28 15:23:27 +06:00 |
|
Alexander Machehin
|
27c85d32df
|
[refs #194] create page; index pagination; some bugs
|
2012-02-27 22:10:12 +06:00 |