jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/app/views
History
alan 8c19ec8aa0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/helpers/projects_helper.rb
	app/views/contest_notification/show.html.erb

Signed-off-by: alan <547533434@qq.com>
 		2014-09-15 10:58:14 +08:00
..
account pull competition branch 2014-09-04 09:17:59 +08:00
activities modify shoew of project 2013-11-07 17:04:37 +08:00
admin 修复admin用户列表界面，查询结果显示不正常的问题 2014-08-13 16:10:47 +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 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00
auth_sources modify 2013-08-22 22:30:24 +08:00
auto_completes 修正缺陷搜索缺陷编号显示问题 2014-07-28 09:46:19 +08:00
avatar 添加删除图片功能，修复用户修改资料界面form.quene undefine的js错误（导致加载中不消失的原因） 2014-07-15 16:13:50 +08:00
bids 修改作业显示真实名字不正确的问题 2014-08-22 11:24:25 +08:00
boards 修改competition的view文件，将其中不规范的代码进行修改，并将其中所有的link_to 2014-09-12 16:45:03 +08:00
calendars first commit 2013-08-01 10:33:49 +08:00
common 解决查看文本页面内容未换行Bug 2014-08-22 11:04:32 +08:00
contest_notification 修改competition的view文件，将其中不规范的代码进行修改，并将其中所有的link_to 2014-09-12 16:45:03 +08:00
contestnotifications 修改competition的view文件，将其中不规范的代码进行修改，并将其中所有的link_to 2014-09-12 16:45:03 +08:00
contests Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00
context_menus 1.add special reward 2013-10-24 20:36:57 +08:00
courses label写错纠正，一个写死的主页链接纠正 2014-09-04 09:46:24 +08:00
custom_fields first commit 2013-08-01 10:33:49 +08:00
documents #936 输入文档标题非汉族显示bug修复 2014-08-13 16:45:50 +08:00
enumerations first commit 2013-08-01 10:33:49 +08:00
files label写错纠正，一个写死的主页链接纠正 2014-09-04 09:46:24 +08:00
forums Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00
gantts first commit 2013-08-01 10:33:49 +08:00
git_usage 去除绝对网址 2014-07-05 11:00:01 +08:00
groups first commit 2013-08-01 10:33:49 +08:00
homework_attach 修复按钮回去不正确的问题 2014-08-14 15:54:03 +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 修复缺陷查询不可用的BUG 2014-08-28 17:51:41 +08:00
journals 修复火狐不兼容自动换行的问题 2014-08-28 17:30:08 +08:00
layouts Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00
list first commit 2013-08-01 10:33:49 +08:00
mailer 1.用户申请加入项目向管理员发送邮件 2014-07-11 09:07:09 +08:00
members 项目‘课程 添加成员显示Bug修改 2014-08-16 10:49:27 +08:00
memos 修复火狐不兼容自动换行的问题 2014-08-28 17:30:08 +08:00
messages Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00
my #1059 软件创客” 修改用户资料中的用户单位页面的样式调整 2014-08-22 14:38:16 +08:00
news js失去焦点事件与点击事件冲突问题，使用onmouseover事件获取焦点隔开两事件 2014-09-02 09:57:59 +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 修改：网站中的旧分数显示为新分数 2014-06-24 13:57:51 +08:00
praise_tread Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00
previews first commit 2013-08-01 10:33:49 +08:00
projects Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +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 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00
roles RolesController.rb移回app/controls 2014-06-19 18:16:55 +08:00
school 高校页面代码优化：1、中文国际化。2、写死的链接改为从配置中读取 2014-09-12 11:34:03 +08:00
search first commit 2013-08-01 10:33:49 +08:00
settings modify 国际化 2013-09-02 15:11:40 +08:00
shares share previews 2013-10-25 15:46:14 +08:00
softapplications Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00
stores Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-13 18:06:33 +08:00
tags Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00
test bootstrap fine tuning. 2014-07-09 15:20:00 +08:00
timelog modify 2013-08-22 22:30:24 +08:00
trackers admin页面中问题追踪项相关错误（课程、项目分离此处代码未改导致的问题）、项目列表中项目提交次数改为从数据库中读取（运行bundle exec rake project_score:calculate统计项目提交次数） 2014-08-26 16:07:17 +08:00
users Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +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 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00
wiki 修复火狐不兼容自动换行的问题 2014-08-28 17:30:08 +08:00
wikis first commit 2013-08-01 10:33:49 +08:00
words 修复用户留言取消按钮描述不正确的问题 2014-08-21 17:14:30 +08:00
workflows first commit 2013-08-01 10:33:49 +08:00
zipdown 1.当作业文件列表为空时报403错提示改为alert提示 2014-07-22 14:29:45 +08:00