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
9b68752ffd
[refs #257 ] Change avatar helper and logic. Add paperclip avatar to users
2012-03-03 22:05:02 +04:00
5b25ea221b
[refs #195 ] Add default value to is_rpm field for projects
2012-02-29 22:27:57 +04:00
c5d8041296
[refs #195 ] Add global fixes to projects and collaborators logic
2012-02-29 18:45:04 +04:00
2ec2548390
[refs #195 ] Add base design and functional to project members page
2012-02-29 01:01:25 +04:00
e004822bd3
Remove/replace old assets to avoid production bugs. Fix deploy settings.
2012-02-28 01:16:14 +02:00
2a108981d5
[update #20 ] To server sends id instead of uname. Added some specs
2011-12-14 19:54:04 +04:00
1b3e473b94
[ closed #20 ] Changed adding collaborators to project
...
Changed collaborators page of project:
* Added form to input group and/or project nickname.
* In tables show only projects/groups that already added to project
2011-12-14 19:52:47 +04:00
9cc820080b
Groups base functional.
2011-12-05 16:32:18 +04:00
140eaf6265
[refs #2249 ] Remove old roles managment system
2011-11-21 21:43:37 +04:00
e50959e205
[refs #2249 ] Add full rules, helpers and filters of CanCan
2011-11-19 15:41:11 +04:00
05bb9ce0c7
[refs #2249 ] CanCan rules update. Add admin role to relations. Change collaboratots edit logic and code
2011-11-18 22:26:22 +04:00
06aed1193d
Templates for collaborators
2011-10-31 18:09:55 +04:00
Pavel Chipiga
konstantin.grabar
George Vinogradov