7d74b0af13
Merge branch 'master' into 96-upgrade_rails
...
Conflicts:
Gemfile
Gemfile.lock
app/models/group.rb
app/views/layouts/application.html.haml
db/schema.rb
public/stylesheets/git/style.css
2012-02-14 02:14:03 +02:00
7223b7deb9
Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96
2012-02-09 01:46:25 +02:00
a83d64eaab
[refs #150 ] Fix collaborators cancan authorize
2012-02-06 19:04:56 +04:00
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +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
6a364b73a6
[refs #12 ] Fix platform admin relations. Locales correction. Add validationa and rsync stubs.
2011-12-12 18:10:39 +04:00
0f827f2644
[refs #2249 ] Fix collaborators controller. Fix projects specs.
2011-12-07 13:47:43 +04:00
fcc17da1ad
[refs #2249 ] Add products specs. Fix some things in other specs
2011-12-06 19:24:33 +04:00
9cc820080b
Groups base functional.
2011-12-05 16:32:18 +04:00
796ff75857
Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249
2011-11-24 23:48:58 +02:00
0573acb650
[refs #2249 ] Add more Collaborators and Projects controllers specs
2011-11-24 23:22:37 +04:00
140eaf6265
[refs #2249 ] Remove old roles managment system
2011-11-21 21:43:37 +04:00
5e7ded2e93
[refs #2249 ] Remove custom ACL from project
2011-11-19 16:11:44 +04:00
44191926f7
[refs #2249 ] Some CanCan fixes. Add ru exception message
2011-11-19 15:49:14 +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
827936a06c
Remove custom ACL calls. Add CanCan and some rules. Add bitmask_attribute
2011-11-16 00:05:08 +04:00
dfc507ff59
Fixed some bugs in ACL checks.
2011-11-01 01:55:56 +04:00
932251a190
Added ACL to controllers
2011-10-31 22:14:25 +04:00
b9ee6e365b
Added collaborators management.
2011-10-31 02:59:03 +04:00
Pavel Chipiga
konstantin.grabar
George Vinogradov