jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/app/views
History
yanxd 70abac4c1e Merge branch 'competition' into develop 
Conflicts:
	app/controllers/application_controller.rb
	config/locales/en.yml
	config/locales/zh.yml
	db/schema.rb
 		2014-06-13 10:59:43 +08:00
..
account register Mod 2014-06-04 14:20:26 +08:00
activities modify shoew of project 2013-11-07 17:04:37 +08:00
admin admin个人主页项目功能修正 2014-05-26 16:25:53 +08:00
applied_project 233 2014-05-22 15:33:38 +08:00
apply_project_masters 添加申请版主功能，目前已经可以写入数据库 2014-04-06 16:34:23 +08:00
attachments 上传文件表单支持添加文件标签 2014-05-28 14:43:20 +08:00
auth_sources modify 2013-08-22 22:30:24 +08:00
auto_completes 新建问题-主题-autocomplete-选中跳转 2014-05-07 20:30:42 +08:00
avatar 修正了上传头像布局 2013-08-13 11:31:27 +08:00
bids 1.作业参与人员可以对作业进行修改，但不能进行删除 2014-06-12 15:25:59 +08:00
boards board show 2014-04-19 09:42:48 +08:00
calendars first commit 2013-08-01 10:33:49 +08:00
common 作业提交的部分问题 2013-12-19 15:59:10 +08:00
contestnotifications contestnotification_edit function 2014-06-13 09:38:51 +08:00
contests 增加了竞赛通知按钮 2014-05-29 20:02:00 +08:00
context_menus 1.add special reward 2013-10-24 20:36:57 +08:00
courses access control：关闭课程in view 2014-05-06 09:26:48 +08:00
custom_fields first commit 2013-08-01 10:33:49 +08:00
documents document show html. separate attachment. 2014-06-11 09:25:27 +08:00
enumerations first commit 2013-08-01 10:33:49 +08:00
files 老师的邮件中增加取消邮件通知链接 2014-06-03 16:58:32 +08:00
forums 竞赛、课程主页贴吧动态及贴吧内帖子列表添加最后回复人 2014-05-21 18:52:15 +08:00
gantts first commit 2013-08-01 10:33:49 +08:00
git_usage modify register bug 2013-09-23 16:42:19 +08:00
groups first commit 2013-08-01 10:33:49 +08:00
homework_attach 修复占位列表界面显示的作业描述样式不正确的问题 2014-06-12 16:43:02 +08:00
issue_categories solve some little problem 2013-09-13 22:25:40 +08:00
issue_relations first commit 2013-08-01 10:33:49 +08:00
issue_statuses modify 2013-08-22 22:30:24 +08:00
issues 修改缺陷状态留言处引用的链接被遮住问题 2014-05-30 16:27:05 +08:00
journals 修改用户主页中与我相关部分的功能，现在可以查找在问题中的引用以及对指派给我的问题中的所有反馈 2013-08-11 10:36:55 +08:00
layouts Merge branch 'competition' into develop 2014-06-13 10:59:43 +08:00
list first commit 2013-08-01 10:33:49 +08:00
mailer 老师的邮件中增加取消邮件通知链接 2014-06-03 16:58:32 +08:00
members 233 2014-05-22 15:33:38 +08:00
memos 坑 2014-06-10 17:33:40 +08:00
messages 被关注+2分、取消关注-2分 2014-06-11 17:41:47 +08:00
my 把所有user_extensions的逻辑移到了user中，业务代码还没有修改,下一步是user_score和projectxxx,先测测效果 2014-06-03 16:41:12 +08:00
news dfg 2014-06-05 14:58:24 +08:00
newsold modify 2013-08-22 22:30:24 +08:00
no_uses 添加申请版主功能，目前已经可以写入数据库 2014-04-06 16:34:23 +08:00
open_source_projects 修复osp显示帖子页面，footer漂移的问题 2014-05-30 11:29:05 +08:00
praise_tread 1、删除了“企业”里的“课程” 2013-10-08 22:15:50 +08:00
previews first commit 2013-08-01 10:33:49 +08:00
projects 1.老师创建作业增加功能：是否启用互评，以及该功能的修改。对不启用互评的作业，学生不可下载作业，不可互相打分，但可以留言；老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样 2014-06-05 14:00:18 +08:00
queries first commit 2013-08-01 10:33:49 +08:00
relative_memos 修改帖子显示用户名与链接问题 2014-05-20 16:33:50 +08:00
reports first commit 2013-08-01 10:33:49 +08:00
repositories fix 2014-05-15 17:10:02 +08:00
roles 0603 2014-06-03 18:24:55 +08:00
school -。- 2014-05-09 17:08:42 +08:00
search first commit 2013-08-01 10:33:49 +08:00
settings new version 2013-09-12 10:41:15 +08:00
shares share previews 2013-10-25 15:46:14 +08:00
softapplications 竞赛子站国际化完成 2014-05-26 19:51:20 +08:00
stores store table用div重构 2014-03-14 17:29:45 +08:00
tags tag_name从ProjectInfo取用户抛错的问题 2014-06-03 11:19:20 +08:00
test bootstrap test 2014-05-26 11:27:10 +08:00
timelog modify 2013-08-22 22:30:24 +08:00
trackers modify 2013-08-22 22:30:24 +08:00
users Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-09 17:38:01 +08:00
versions 修改了项目里面各个子页面的样式 2013-11-08 20:09:21 +08:00
watchers new version 2013-09-12 10:41:15 +08:00
welcome Merge branch 'competition' into develop 2014-06-13 10:59:43 +08:00
wiki first commit 2013-08-01 10:33:49 +08:00
wikis first commit 2013-08-01 10:33:49 +08:00
words 1.修改作业列表显示效果 2014-05-17 11:15:27 +08:00
workflows first commit 2013-08-01 10:33:49 +08:00
zipdown test zip down 2014-04-16 14:44:26 +08:00