jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,701 Commits 98 Branches 0 Tags 0 B
Commit Graph

67 Commits

Author SHA1 Message Date
nwb 28543e3288 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-18 09:21:21 +08:00
nwb 8eac756ac7 1.项目首页的描述更改，不再限制项目描述字数 
2.竞赛首页的描述更改，不再限制竞赛描述字数
 2014-07-18 09:21:09 +08:00
yanxd 164ec645ee boards created frequently, css file file EOF. 2014-07-18 09:20:16 +08:00
nwb b34a8d6166 项目搜索优化 2014-07-16 17:25:47 +08:00
nwb 13a3725b06 BUG修改 2014-07-16 09:28:12 +08:00
sw 59a5541e45 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-11 14:52:15 +08:00
nwb 6688ba61dd 1.用户申请加入项目向管理员发送邮件 
2.资源文件添加文件密级设置
 2014-07-11 09:07:09 +08:00
sw 7bcb1cbe2e 修复个人主页中作业、项目介绍不正确的BUG 2014-07-10 16:57:04 +08:00
nwb eb15edd5ff 1.添加文档 
2.邮件中缺陷序号计算机制优化
2.项目、课程动态优化
 2014-07-05 13:31:32 +08:00
sw 740f6a19ec 项目名称唯一 2014-07-03 15:50:36 +08:00
nwb 7425178419 Merge branch 'CourseModify' into szzh 
Conflicts:
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_homework.html.erb
	app/views/projects/_course.html.erb
	db/schema.rb
	lib/redmine/activity/fetcher.rb
 2014-06-26 08:53:16 +08:00
sw efb6c1fd19 1.修改、新增作业增加提交项目选项(可以为空) 
2.homework_attach与project增加关联关系
 2014-06-18 10:07:19 +08:00
nwb 54505340eb 1.修正新建课程错误 
2.优化课程角色权限判断
 2014-06-09 10:26:45 +08:00
nwb c43bf84e42 课程所包含的子功能模块(enabled_modules)相关逻辑修改 2014-06-04 11:32:32 +08:00
xianbo e52886cf46 Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop 
Conflicts:
	app/views/softapplications/show.html.erb
	db/schema.rb
 2014-05-23 09:49:36 +08:00
yanxd f44b930037 233 2014-05-22 15:33:38 +08:00
nwb dd4ef11b3d 添加项目管理员审核已申请用户界面及逻辑 2014-05-22 11:58:43 +08:00
nwb 104ee13ac7 1.添加用户申请加入项目contrl、model及相关逻辑 
2.项目界面添加申请加入按钮
 2014-05-21 16:45:11 +08:00
wanglinchun 9fb9d2dbdf 初步增加了新建参赛作品中参赛作品所属的托管项目列表 2014-05-19 17:39:51 +08:00
nwb 284e6ba20a 1.添加部分默认数据 
2.修改项目资源视图
 2014-05-13 15:49:14 +08:00
nwb 7ccbc5e88a 课时限制为只能输入正整数 2014-05-09 17:13:23 +08:00
nwb 753746f833 1.项目添加资源分类 
2.修改文件上传功能，添加新参数
3.修改文件上传界面
 2014-05-09 15:45:21 +08:00
wanglinchun 9ac0cbe6a3 Merge branch 'competition' into develop 
Conflicts:
	Gemfile
	app/controllers/tags_controller.rb
	app/views/layouts/_base_header.html.erb
	config/routes.rb
	db/schema.rb
 2014-04-18 16:03:52 +08:00
yanxd 7a31b3f4ea 去掉项目描述长度验证 2014-04-09 16:31:27 +08:00
yanxd 383d62a353 修改错误处理文字显示 2014-04-09 11:15:34 +08:00
wanglinchun 120e84cfc7 新竞赛代码移植 2014-04-03 17:26:56 +08:00
yanxd c38a8e4f6a socialForge#324 2014-03-28 18:12:48 +08:00
yanxd 6877ff7e8d 解决设置跳转404.bug 2014-03-20 14:17:48 +08:00
yanxd 0ed2e19268 项目列表 2014-01-24 10:55:25 +08:00
yanxd 099fffab51 Merge branch 'bigchange' into develop 2014-01-17 08:23:15 +08:00
baiyu 13fdbde1cf 个人分数 2014-01-16 10:34:39 +08:00
yanxd f91d94fd4c fetch stores/index instance_object 2014-01-13 16:24:13 +08:00
yanxd 1d962b98d3 model project leave message 2013-12-29 19:35:52 +08:00
yanxd 99686ec269 留言不能是空字符 2013-12-21 10:15:41 +08:00
nieguanghui c6f657ed8c 重构排序代码 2013-12-17 16:59:07 +08:00
huangjingquan 6dc692bb6a 修改了主页、论坛显示 2013-11-27 16:40:47 +08:00
baiyu 1944cb5bcf 1、修改了个人主页里关注列表的项目和课程的显示错误 
2、修改了竞赛里里竞赛参与者的项目和课程的显示错误
 2013-11-22 10:37:58 +08:00
yanxd 0381179536 自动添加讨论区当项目课程创建的时候，学生是否能回复需要在全线报表里配置. 2013-11-20 17:02:47 +08:00
yanxd 98ccc97b27 add hidden repository function 2013-11-12 10:27:36 +08:00
nieguanghui dd6563cf8c 优化用户搜索 2013-11-08 11:01:28 +08:00
fanqiang 9996386fe4 增加课程留言与项目反馈功能，修改了点击课程作业时tab页显示问题 2013-11-07 11:02:32 +08:00
xianbo 10a14d5e82 add the link to thieris homepage 2013-11-06 10:36:58 +08:00
xianbo e9856b3524 modify the style of the projects witch show 2013-10-28 20:09:15 +08:00
xianbo 2589d429b0 add the project what one watch 2013-10-24 08:24:56 +08:00
yanxd 5d0b5812b3 share completed with fq, xianbo 2013-10-21 08:57:55 +08:00
nieguanghui 17a4f14f2a 修复课程和项目搜索bug 2013-10-15 16:29:35 +08:00
xianbo 0238001721 modify destroy project and user can't destroy biding_project 2013-10-14 20:57:31 +08:00
xianbo 677bc4060b fix bug about delete project 2013-10-09 22:31:57 +08:00
fanqiang 9fbccfbb6d 改了一些问题 
创建课程问题
添加了需求的FORK功能
 2013-09-28 23:08:24 +08:00
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