George Vinogradov 549f0a55e8 [issue #64] Merge branch 'master' into 64-project_wiki ... Conflicts: Gemfile.lock app/models/project.rb app/models/user.rb app/views/projects/_form.html.haml config/locales/ru.yml db/schema.rb		2012-01-27 18:27:23 +04:00
..
ext	Redo deploy to work multistage on same host. Add ui and pingwinsoft stages, Refactor deploy. Refactor XML RPC stub. Apply nginx config generation script. Fix scripts. Cleanup code and config. Refs #2261	2011-12-06 16:45:20 +02:00
git/diff	the aWeSOME commit view (with REALLY AWESOME view for git diffs)	2011-04-01 07:44:21 +04:00
grack	[issue #64] Added git access to Wiki.	2012-01-20 19:01:59 +04:00
modules/models	[refs #12] Fix platform admin relations. Locales correction. Add validationa and rsync stubs.	2011-12-12 18:10:39 +04:00
recipes	Refactor and fix bluepill capistrano recipe. Refs #1	2011-12-14 23:06:31 +02:00
tasks	Emergency fix for imports	2012-01-23 18:52:42 +04:00
build_server.rb	Fix bugs. Change included_repos format. Refs #65	2011-12-21 20:59:19 +02:00
gollum.rb	[issue #64] Some changes in views and routes.	2012-01-18 02:28:59 +04:00
grack.rb	Integrate grack into rails stack. Implement basic http auth for grack. Allow only downcase for uname and unixname. Refactor and code cleanup. Refs #2243	2011-11-15 23:58:27 +02:00
modules.rb	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
product_builder.rb	Send blank string when no product tar attached. Refs #2261	2011-11-30 13:58:16 +02:00
stub_xml_rpc.rb	Rename bs_id label and key. Stub XML RPC to raise exception and fix spec. Write specs for build_lists filters. Refs #2	2011-12-08 20:51:25 +02:00