jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
424 Commits 98 Branches 0 Tags 0 B
Ruby 71.4%
HTML 19.4%
CSS 4.8%
JavaScript 3.8%
PHP 0.3%
Other 0.3%
Go to file
xianbo 806fae7b19 Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 
Conflicts:
	app/controllers/account_controller.rb
	app/controllers/my_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/users_controller.rb
	app/helpers/projects_helper.rb
	app/helpers/users_helper.rb
	app/models/project.rb
	app/models/user.rb
	app/models/user_extensions.rb
	app/views/account/register.html.erb
	app/views/bids/_bid_show.html.erb
	app/views/bids/_history.html.erb
	app/views/bids/_project_list.html.erb
	app/views/bids/show.html.erb
	app/views/files/index.html.erb
	app/views/layouts/base_bids.html.erb
	app/views/layouts/base_users.html.erb
	app/views/my/account.html.erb
	app/views/users/watch_bids.html.erb
	config/locales/en.yml
	config/locales/zh.yml
	config/routes.rb
	db/schema.rb
	lib/redmine.rb
	public/stylesheets/application.css
 		2013-09-23 20:18:03 +08:00
app Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 2013-09-23 20:18:03 +08:00
config Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 2013-09-23 20:18:03 +08:00
db Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 2013-09-23 20:18:03 +08:00
doc first commit 2013-08-01 10:33:49 +08:00
extra first commit 2013-08-01 10:33:49 +08:00
files 添加了提交作业 2013-09-13 21:52:24 +08:00
lib 增加了附件删除功能 2013-09-18 22:56:01 +08:00
plugins first commit 2013-08-01 10:33:49 +08:00
public Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 2013-09-23 20:18:03 +08:00
script first commit 2013-08-01 10:33:49 +08:00
statistics/trustie2/trustie move 2013.8.29 2013-08-30 09:34:21 +08:00
.gitignore Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 2013-09-23 20:18:03 +08:00
.hgignore first commit 2013-08-01 10:33:49 +08:00
Client.html 添加app\controllers\shares_controller.rb及相关文件用来作为api演示的小例子，Client.html放在根目录下作为演示客户端 2013-08-01 20:26:19 +08:00
Gemfile new version 2013-09-12 10:41:15 +08:00
Gemfile.lock 修正 注册 2013-08-17 10:34:19 +08:00
README.rdoc first commit 2013-08-01 10:33:49 +08:00
Rakefile first commit 2013-08-01 10:33:49 +08:00
config.ru 新改 2013-08-15 18:50:44 +08:00

README.rdoc 

= Redmine

Redmine is a flexible project management web application written using Ruby on Rails framework.

More details can be found in the doc directory or on the official website http://www.redmine.org