socialforge/app/views
huang c29e6f1b14 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/boards/_project_show.html.erb
	app/views/boards/_project_show_detail.html.erb

解决冲突
2015-12-29 11:09:16 +08:00
..
account 添加邮箱验证 2015-11-10 16:03:06 +08:00
activities
activity_notifys 课程讨论区动态与我相关 2015-06-04 15:55:41 +08:00
admin KE引用统一使用import_ke 2015-12-06 15:03:36 +08:00
applied_project 进入他人个人主页,TA的项目列表,对不是成员的项目显示申请项目/取消申请 2015-07-30 16:02:41 +08:00
apply_project_masters
at . 2015-12-15 14:52:24 +08:00
attachments Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 11:09:16 +08:00
auth_sources modify 2013-08-22 22:30:24 +08:00
auto_completes 修正缺陷搜索缺陷编号显示问题 2014-07-28 09:46:19 +08:00
avatar 上传图片功能不可 用 2015-09-29 16:51:22 +08:00
bids 转换为remote js 2015-12-14 17:13:57 +08:00
blog_comments 文件上传button的路径去掉project参数。 2015-12-23 11:13:14 +08:00
blogs 转换为remote js 2015-12-14 17:13:57 +08:00
boards Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 11:09:16 +08:00
calendars 新项目及用户反馈框的修改!! 2015-03-06 14:55:21 +08:00
comments merge 2015-12-14 18:20:32 +08:00
common 查看文件,强制不换行 2015-10-27 17:26:43 +08:00
contestnotifications
contests 修改竞赛搜索结果页面按钮异常 2015-05-22 10:43:50 +08:00
context_menus 1.add special reward 2013-10-24 20:36:57 +08:00
courses 动态的展开更多改成点击展开更多 2015-12-22 15:14:03 +08:00
custom_fields first commit 2013-08-01 10:33:49 +08:00
documents 修改项目文档中附件上传无法保存、附件编辑的时候无法显示的bug 2015-03-18 15:50:00 +08:00
enumerations
exercise 去掉测验结果页面中填空题的标准答案 2015-12-24 11:30:52 +08:00
files 解决组织模块的一些bug 2015-12-18 14:30:25 +08:00
forums 文件上传button的路径去掉project参数。 2015-12-23 11:13:14 +08:00
gantts
groups first commit 2013-08-01 10:33:49 +08:00
homework_attach
homework_common 发布和编辑作业时可设置是否启用匿评 2015-12-25 15:57:30 +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 解决版本库点击新增版本版本信息丢失 2015-12-28 15:09:41 +08:00
journals 1、issue回复添加新的编辑器 2015-09-25 11:45:57 +08:00
kaminari 搜索结果下一页样式不对 2015-12-02 09:23:12 +08:00
layouts Merge branch 'develop' into dev_hjq 2015-12-28 15:32:03 +08:00
list first commit 2013-08-01 10:33:49 +08:00
mailer 邮件按天发送去掉token值 2015-12-23 17:16:35 +08:00
members 编辑课程成员后,更新老师数量和学生数量 2015-11-02 17:19:38 +08:00
memos 论坛编辑的时候上传文件后没有显示 2015-12-23 11:12:34 +08:00
messages 项目/课程帖子发送弹窗样式修改 2015-12-28 17:03:13 +08:00
my LastName 姓 2015-12-23 10:02:54 +08:00
news 课程通知改成动态的模式 2015-12-24 09:57:32 +08:00
newsold
no_uses
open_source_projects 用户主页国际化修改 2015-04-10 13:21:36 +08:00
org_courses 1.在项目和课程在关联和删除关联组织后,翻页能链接到正确的位置 2015-11-18 10:57:17 +08:00
org_document_comments Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq 2015-12-24 11:13:20 +08:00
org_member 成功添加某成员后,在搜索框中输入的该成员关键字就要自动清空 2015-11-23 10:17:20 +08:00
org_projects 1.在项目和课程在关联和删除关联组织后,翻页能链接到正确的位置 2015-11-18 10:57:17 +08:00
org_subfields 组织资源栏目显示转发的帖子 2015-12-23 16:49:05 +08:00
organizations Merge branch 'develop' into dev_hjq 2015-12-28 15:32:03 +08:00
poll 新建问卷页面添加问卷描述提示文字 2015-09-22 09:47:39 +08:00
praise_tread update forum 2015-09-18 17:44:16 +08:00
previews first commit 2013-08-01 10:33:49 +08:00
projects 动态的展开更多改成点击展开更多 2015-12-22 15:14:03 +08:00
queries 优化页面代码 2014-10-28 09:30:43 +08:00
relative_memos 修改帖子显示用户名与链接问题 2014-05-20 16:33:50 +08:00
reports first commit 2013-08-01 10:33:49 +08:00
repositories 版本库显示调整 2015-12-22 10:59:09 +08:00
roles
school 学校信息修改样式更改 2015-10-20 10:22:47 +08:00
search
settings 将域名配置加入到管理员后台 2015-05-22 15:59:37 +08:00
shares share previews 2013-10-25 15:46:14 +08:00
softapplications 修改竞赛评分显示异常 2014-12-29 17:34:07 +08:00
stores admin用户导出缺失文件列表功能 2015-07-02 10:41:08 +08:00
student_work 追加附件必须填写描述 2015-12-25 17:07:27 +08:00
system_log
system_messages 添加功能:管理员界面发送系统消息 2015-09-09 17:05:32 +08:00
tags 鼠标经过资源栏目TAG时,变成手型 2015-12-16 15:36:01 +08:00
test
timelog
trackers
users Merge branch 'develop' into dev_hjq 2015-12-28 15:32:03 +08:00
versions 优化版本代码加提示 2015-08-01 11:35:48 +08:00
watchers 上传图片js 2015-08-29 14:46:30 +08:00
web_footer_companies
welcome 课程添加更新时间 2015-12-14 11:11:09 +08:00
wiki 去掉wiki页面AUTO、PDF导出功能 2015-07-28 15:42:10 +08:00
wikis first commit 2013-08-01 10:33:49 +08:00
words 课程留言bug 2015-12-25 15:47:22 +08:00
workflows
zipdown 下载功能优化, 功能已实现 2015-03-25 10:41:42 +08:00