sw
|
0c597d23a2
|
Merge branch 'szzh' into develop
|
2014-08-11 15:09:25 +08:00 |
sw
|
f7635370d7
|
优化课程首页效率
|
2014-08-11 14:49:58 +08:00 |
sw
|
ea0b7ef3f1
|
Merge branch 'szzh' into develop
|
2014-08-08 16:42:41 +08:00 |
linhk
|
0028c11426
|
退出项目功能
|
2014-08-08 16:43:34 +08:00 |
zhanghaitao
|
d9a9867f96
|
#815 中英文显示问题修改
|
2014-08-07 16:41:31 +08:00 |
sw
|
08821b9391
|
Merge branch 'szzh' into develop
|
2014-08-07 14:03:06 +08:00 |
linhk
|
b545c5034d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
|
2014-08-07 12:02:55 +08:00 |
sw
|
b0b3f257a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 11:31:39 +08:00 |
zhanghaitao
|
45cc3ddb9b
|
#873提示信息修改
|
2014-08-07 11:23:01 +08:00 |
linhk
|
f173db4c9d
|
英文版用户注册页面身份下拉框显示错误的Bug
|
2014-08-06 15:58:38 +08:00 |
sw
|
5f3ab0322b
|
修改竞赛上传图片提示 #1127
|
2014-08-04 16:04:36 +08:00 |
sw
|
94f6e871b1
|
修改新建用户时企业名不是英文且提示错误的BUG #1130
|
2014-08-04 15:49:23 +08:00 |
sw
|
d66dc65cca
|
Merge branch 'szzh' into develop
|
2014-07-31 17:27:01 +08:00 |
z9hang
|
03b212e363
|
首页定制,是否显示课程,竞赛
|
2014-07-30 15:26:55 +08:00 |
nwb
|
d6876fabc1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-29 08:36:46 +08:00 |
nwb
|
1156387161
|
“文件密级”改为“是否公开”
|
2014-07-29 08:36:30 +08:00 |
sw
|
e344f16f5c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 17:50:13 +08:00 |
sw
|
2141fcc3ca
|
将是否启用DTS测试移入项目模块配置
|
2014-07-28 17:49:28 +08:00 |
nwb
|
9da116c0e3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 17:14:20 +08:00 |
nwb
|
cb4efd914e
|
修正项目文档删除BUG
|
2014-07-28 17:14:02 +08:00 |
sw
|
a39672dd14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-28 15:09:14 +08:00 |
sw
|
18ddb8604b
|
取消参赛作品名称、描述的字数限制
|
2014-07-28 14:58:01 +08:00 |
z9hang
|
1daec14ab5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-28 10:38:23 +08:00 |
z9hang
|
8871652e01
|
添加首页定制,设置是否显示"我的课程"功能
|
2014-07-28 10:37:22 +08:00 |
nwb
|
9c9778d433
|
项目的“资料下载”改为“作品下载”
|
2014-07-28 09:23:40 +08:00 |
nwb
|
f052d0d461
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 17:37:07 +08:00 |
z9hang
|
97531960da
|
首页定制添加剂修改图片大小功能
|
2014-07-25 16:05:33 +08:00 |
nwb
|
1257e67380
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 14:06:59 +08:00 |
nwb
|
2bfc7aa93f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 11:12:08 +08:00 |
sw
|
70003c8374
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/zipdown_controller.rb
|
2014-07-25 11:10:45 +08:00 |
sw
|
6d5f72326f
|
增加定时任务
|
2014-07-25 11:09:47 +08:00 |
z9hang
|
7eb1a76734
|
修改编辑贴吧无导航栏、提交失败无提示bug
|
2014-07-25 10:42:56 +08:00 |
z9hang
|
80b5871756
|
竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
添加新的表记录个人得分相关细节,及各种得分更新方法
|
2014-07-23 17:56:15 +08:00 |
nwb
|
68be9c25b8
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/contest.html.erb
|
2014-07-22 09:52:16 +08:00 |
sw
|
ab55043880
|
修复当作业附件列表为空时,点击打包下载会报500错的BUG
|
2014-07-22 09:42:41 +08:00 |
nwb
|
79eac39dc2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-21 17:50:51 +08:00 |
nwb
|
5adac1a32a
|
课程讨论区回复内容为空时提示
|
2014-07-21 15:15:10 +08:00 |
nwb
|
b655f0c7b0
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-18 13:50:30 +08:00 |
nwb
|
29618d6a72
|
竞赛界面调整
|
2014-07-18 13:48:45 +08:00 |
nwb
|
b7c4f87a8f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/index.html.erb
|
2014-07-18 09:57:47 +08:00 |
nwb
|
02b4029e8c
|
资源文件下载界面调整
|
2014-07-17 15:05:49 +08:00 |
z9hang
|
d9e04bab0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-16 14:22:37 +08:00 |
z9hang
|
cc4bf3b328
|
添加超级管理员控制首页热门项目排序问题
|
2014-07-16 14:22:12 +08:00 |
sw
|
4825c5287e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-16 10:15:43 +08:00 |
z9hang
|
53ff6ea335
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-15 16:16:13 +08:00 |
z9hang
|
6a45a0287d
|
添加删除图片功能,修复用户修改资料界面form.quene undefine的js错误(导致加载中不消失的原因)
|
2014-07-15 16:13:50 +08:00 |
sw
|
b142953a4b
|
1.创建项目增加功能:是否启动DTS测试,默认为不启用。根据用户选择,决定左侧DTS测试工具选项是否在该项目内显示
|
2014-07-15 10:28:49 +08:00 |
z9hang
|
cf339edb6c
|
添加首页定制的非空验证,长度验证
|
2014-07-14 16:12:58 +08:00 |
nwb
|
0950ac2329
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-14 11:32:01 +08:00 |
nwb
|
87b623bc51
|
1.文档添加密级设置
2.新建文档、修改文档视图修改
|
2014-07-14 10:44:07 +08:00 |
z9hang
|
fcdfeae326
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-11 11:45:46 +08:00 |
z9hang
|
3dfcc90574
|
课程、竞赛首页定制
超级管理员账户中首页定制界面优化
|
2014-07-11 11:41:54 +08:00 |
nwb
|
1d4dad22ad
|
Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop
Conflicts:
ReadMe.txt
app/views/layouts/_base_footer.html.erb
|
2014-07-11 11:38:36 +08:00 |
nwb
|
bdaf59513b
|
Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop
Conflicts:
app/views/layouts/_base_footer.html.erb
|
2014-07-11 09:11:37 +08:00 |
nwb
|
9b3ffc90ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/repositories_controller.rb
db/schema.rb
|
2014-07-11 09:08:50 +08:00 |
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
2014-07-11 09:07:09 +08:00 |
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
2014-07-10 17:38:04 +08:00 |
yanxd
|
803e9cbdb5
|
globel issue#858, 中国高校--输入无效条件点击搜索,建议给出提示信息
|
2014-07-10 16:21:55 +08:00 |
z9hang
|
720c75478a
|
修正上传图片可传非图片文件bug
|
2014-07-10 10:15:20 +08:00 |
z9hang
|
9634046d11
|
权限管理机制优化
|
2014-07-09 16:02:15 +08:00 |
nwb
|
dd396a6da2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-07 16:27:49 +08:00 |
nwb
|
ae32b310cd
|
新建竞赛时的日期信息提醒变更
|
2014-07-07 14:39:44 +08:00 |
nwb
|
3a7065bb2d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-04 11:12:27 +08:00 |
sw
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 10:09:25 +08:00 |
yanxd
|
f664ec10b4
|
Merge branch 'szzh' into develop
Conflicts:
app/views/bids/_bid_homework_show.html.erb
|
2014-07-03 09:07:09 +08:00 |
z9hang
|
54a2fb8a9c
|
主页项目得分与项目页面的项目得分保持一致
|
2014-07-02 11:32:49 +08:00 |
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
2014-07-01 11:53:55 +08:00 |
linchun
|
79f68c2231
|
Merge branch 'szzh' into develop
|
2014-06-28 08:51:23 +08:00 |
nwb
|
b4af75f289
|
部分界面优化
|
2014-06-26 11:15:06 +08:00 |
nwb
|
f4aa817f42
|
修改合并后首页出错的问题
|
2014-06-26 10:01:44 +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 |
linchun
|
9c5066b81c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
app/controllers/account_controller.rb
|
2014-06-23 15:06:37 +08:00 |
z9hang
|
773b728828
|
修改:自己不能踩或顶自己
|
2014-06-23 11:17:42 +08:00 |
nwb
|
8a5e1f5d9f
|
界面修改
|
2014-06-19 11:45:02 +08:00 |
senluo
|
cc39172d87
|
fix
|
2014-06-16 21:52:08 +08:00 |
z9hang
|
697a6034b2
|
新得分显示
|
2014-06-16 17:50:28 +08:00 |
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 |
wanglinchun
|
d76eec27cc
|
为竞赛通知评论添加登录权限
|
2014-06-12 11:11:12 +08:00 |
wanglinchun
|
a40db3dc4b
|
首页添加了竞赛所获奖项显示
|
2014-06-10 17:17:31 +08:00 |
sw
|
26b933dddb
|
t
|
2014-06-10 08:59:31 +08:00 |
wanglinchun
|
1393aebace
|
完成了按钮样式
|
2014-06-09 11:30:18 +08:00 |
wanglinchun
|
372de9932a
|
英文版竞赛子站完成
|
2014-06-06 11:24:05 +08:00 |
wanglinchun
|
42aba52111
|
竞赛子站英文版5
|
2014-06-06 10:46:56 +08:00 |
z9hang
|
4478c86cea
|
添加课程 查看真名、查看成员、作业导出权限代码(未应用)
|
2014-06-06 10:37:06 +08:00 |
sw
|
8f94985186
|
1.添加作业时权限判断
2.增加作业成员tab页
|
2014-06-06 10:28:37 +08:00 |
z9hang
|
09368442c6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-06 08:35:10 +08:00 |
z9hang
|
d83899e3e4
|
添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码(未应用)
|
2014-06-05 17:39:48 +08:00 |
sw
|
81a97f6a5e
|
1.老师创建作业增加功能:是否启用互评,以及该功能的修改。对不启用互评的作业,学生不可下载作业,不可互相打分,但可以留言;老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
2.对启用互评的作业,每个用户只可以进行一次打分,打分后不可修改
|
2014-06-05 14:00:18 +08:00 |
z9hang
|
ae5ced6a51
|
课程权限添加(部分)
|
2014-06-04 17:39:11 +08:00 |
sw
|
78ac974a75
|
1.修改课程作业列表界面提交作业
2.修复获取当前用户在指定作业下提交作业方法不正确的问题
|
2014-06-04 16:01:33 +08:00 |
wanglinchun
|
da26c70f6c
|
修改首页子站入口
|
2014-06-04 10:53:04 +08:00 |
wanglinchun
|
a38ffb9e9d
|
首页修改4
|
2014-06-04 10:43:32 +08:00 |
wanglinchun
|
ebcdd2cc9e
|
修改首页英文显示
|
2014-06-04 10:08:57 +08:00 |
wanglinchun
|
b5be2d58ce
|
英文子站首页
|
2014-06-04 09:35:39 +08:00 |
sw
|
50171ad0f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-04 08:51:46 +08:00 |
sw
|
9bfe9ba1b2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-03 17:21:01 +08:00 |
z9hang
|
27be52e58d
|
老师的邮件中增加取消邮件通知链接
修复主页文件上传动态中点击进入附件跳转错误问题
|
2014-06-03 16:58:32 +08:00 |
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
2014-05-30 20:32:37 +08:00 |
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
2014-05-30 10:57:13 +08:00 |
wanglinchun
|
43449e66b5
|
增加了竞赛通知按钮
|
2014-05-29 20:02:00 +08:00 |
sw
|
03c8f39729
|
1.修复登录提示描述不正确的问题
2.修改作业显示界面html
|
2014-05-29 08:37:54 +08:00 |
z9hang
|
2e36949604
|
添加课程列表查看权限(需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看)
|
2014-05-28 18:04:16 +08:00 |
z9hang
|
2d77975221
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/courses_helper.rb
app/views/bids/_homework_list.html.erb
config/locales/en.yml
|
2014-05-28 15:40:57 +08:00 |
sw
|
e0273d320c
|
1.登录增加js提示可以用昵称和邮箱登录
2.修改资料界面增加昵称的修改以及修改昵称的验证
3.修改昵称的描述
|
2014-05-28 15:05:11 +08:00 |
z9hang
|
daecf1a53b
|
老师收到课程留言区的直接留言及对老师的回复的邮件提醒
|
2014-05-28 14:17:43 +08:00 |
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
2014-05-27 17:04:29 +08:00 |
wanglinchun
|
d20114cc42
|
竞赛子站国际化完成
|
2014-05-26 19:51:20 +08:00 |
wanglinchun
|
be5de6f3f6
|
zh文件中添加国家化内容
|
2014-05-24 11:28:14 +08:00 |
wanglinchun
|
7b6c96a8b6
|
view中contests中的文件已经全部国际化
|
2014-05-24 10:56:58 +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 |
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-23 09:44:33 +08:00 |
fanqiang
|
d3ead651fe
|
动态显示安全问题
|
2014-05-22 17:04:45 +08:00 |
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-22 16:38:04 +08:00 |
yanxd
|
f44b930037
|
233
|
2014-05-22 15:33:38 +08:00 |
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
2014-05-22 11:58:43 +08:00 |
sw
|
7748704c3a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-22 09:51:05 +08:00 |
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
2014-05-21 16:45:11 +08:00 |
sw
|
8bb8de7d7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-21 15:31:05 +08:00 |
sw
|
c7b19d8f2e
|
修改作业提交流程
|
2014-05-21 14:10:11 +08:00 |
wanglinchun
|
518de57123
|
将参赛作品编辑更新后的提示语修改为汉语
|
2014-05-21 11:24:11 +08:00 |
wanglinchun
|
947c0f8f64
|
竞赛页面中添加参赛作品成功创建的提示语
|
2014-05-21 11:16:46 +08:00 |
wanglinchun
|
a5cb14274c
|
修改参赛作品页面中未登录状态下的提示
|
2014-05-21 09:43:42 +08:00 |
wanglinchun
|
dd43e2c3fc
|
竞赛页面我要参赛中添加判断,当用户未登录时提示登录后参赛
|
2014-05-21 09:38:08 +08:00 |
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
2014-05-20 14:33:50 +08:00 |
nwb
|
4d21933e09
|
1.优化资源文件上传下载界面
2.教师的课程界面优化
|
2014-05-20 11:33:17 +08:00 |
wanglinchun
|
10b34341c7
|
修改参赛作品编辑页面说明文字:应用--》作品
|
2014-05-20 10:48:11 +08:00 |
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
2014-05-19 17:39:51 +08:00 |
t430
|
00b866f06a
|
Merge branch 'develop'
|
2014-05-16 17:28:30 +08:00 |
wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-05-16 17:06:38 +08:00 |
nwb
|
8f153520b4
|
调整上传资源界面
|
2014-05-16 16:29:01 +08:00 |
nwb
|
f2f81e1d02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 13:54:06 +08:00 |
nwb
|
8ef716b920
|
1.个人动态留言显示出留言人
2.留言添加跳转链接
|
2014-05-15 13:37:24 +08:00 |
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
2014-05-15 09:46:38 +08:00 |
wanglinchun
|
d019a4d9ce
|
重新调整了:评奖,暂未评奖,未评奖
|
2014-05-14 16:29:46 +08:00 |
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址;
参赛应用页面添加所属项目网址;
|
2014-05-13 16:49:23 +08:00 |
nwb
|
25dba88a08
|
1.优化界面
2.资源下载界面添加按文件类型分类浏览
|
2014-05-13 16:34:53 +08:00 |
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
2014-05-13 15:49:14 +08:00 |
wanglinchun
|
81c3659a89
|
调整新建参赛作品的显示样式
|
2014-05-12 20:21:54 +08:00 |
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
2014-05-12 18:46:39 +08:00 |
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
2014-05-10 14:27:48 +08:00 |
wanglinchun
|
1e0e5a5ab1
|
Merge branch 'competition' into develop
Conflicts:
config/routes.rb
|
2014-05-10 11:28:37 +08:00 |
yanxd
|
19ddb38e1b
|
异步验证注册字段合法
|
2014-05-10 09:22:45 +08:00 |
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
2014-05-09 17:13:23 +08:00 |
yanxd
|
4d8701220b
|
-。-
acoount.html对齐了一下
学校列表school/index.html默认显示全部学校
没有填写工作单位的用户强行跳转到修改资料页面
|
2014-05-09 17:08:42 +08:00 |
wanglinchun
|
3edb1114c3
|
修改参赛作品列表页面的部分显示方式
|
2014-05-08 19:05:51 +08:00 |
wanglinchun
|
caff0f55c9
|
调整了竞赛页面中参赛作品数量统计及跳转
|
2014-05-08 18:38:09 +08:00 |
wanglinchun
|
fe151f9e29
|
竞赛页面中增加“我要参赛”菜单
|
2014-05-08 08:33:03 +08:00 |
fanqiang
|
2c8580a4e8
|
Merge branch 'crawl' into develop
Conflicts:
app/controllers/tags_controller.rb
app/views/tags/_tag.html.erb
app/views/tags/_tag_search_results.html.erb
app/views/tags/index.html.erb
config/locales/zh.yml
config/routes.rb
db/schema.rb
|
2014-05-05 09:11:59 +08:00 |
Wen
|
53574a9592
|
wenwenwen
|
2014-04-30 16:19:49 +08:00 |
wanglinchun
|
21fe914d8f
|
恢复误删的国际化
|
2014-04-30 15:13:40 +08:00 |
Wen
|
e2a9e58ef5
|
本地化做了下
|
2014-04-30 13:55:54 +08:00 |
wanglinchun
|
12ad20cf3b
|
修改应用列表页面的显示标题为:应用列表-Trustie——为大学生技术创新筑巢
|
2014-04-29 10:25:24 +08:00 |
wanglinchun
|
ae972ddaa1
|
修改国际化
|
2014-04-29 10:05:33 +08:00 |
wanglinchun
|
6ab0eb4477
|
修改后发现错误
|
2014-04-29 09:48:11 +08:00 |
fanqiang
|
07b75924d8
|
修改tag搜索,使得tag搜索能够搜索开源项目
在帖子展示页面添加时间,并添加标签
|
2014-04-26 10:42:19 +08:00 |
wanglinchun
|
9f75bf179a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-25 16:22:05 +08:00 |
yanxd
|
8f5958abc1
|
mao
|
2014-04-25 16:08:00 +08:00 |
wanglinchun
|
189b935d5b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-04-25 11:22:33 +08:00 |
wanglinchun
|
ed71a3faa1
|
调整删除竞赛的显示样式及位置
|
2014-04-25 11:10:13 +08:00 |
Wen
|
02295e5ca9
|
给严总调试用
|
2014-04-25 09:40:05 +08:00 |
kg
|
daa19de51d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-24 09:13:51 +08:00 |
kg
|
271427d29e
|
homepage status
|
2014-04-24 08:18:14 +08:00 |
Wen
|
6a2626c90e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-23 21:41:02 +08:00 |
Wen
|
473a44d11a
|
学校-课程模式!
|
2014-04-23 21:20:03 +08:00 |
wanglinchun
|
6b5452f3e2
|
增加修改应用时提示语
|
2014-04-23 17:06:48 +08:00 |
wanglinchun
|
a90804b312
|
修改上传应用软件包和截图的说明文字
|
2014-04-23 09:58:37 +08:00 |
wanglinchun
|
05c0d2a5ac
|
替换竞赛模块首页中竞赛和应用的图标并调整相应的格式
|
2014-04-22 19:27:31 +08:00 |
wanglinchun
|
8a429ec669
|
首页提示语
|
2014-04-21 19:40:04 +08:00 |
alan
|
87fdecdabd
|
创新竞赛添加删除功能
|
2014-04-21 18:13:57 +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 |
kg
|
d450da9df8
|
footer , footer of base_course,upload files count and delete all upload
|
2014-04-17 08:33:44 +08:00 |
wanglinchun
|
a52e057d94
|
修改添加应用不能刷新的问题
|
2014-04-16 21:44:52 +08:00 |
wanglinchun
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
2014-04-16 08:46:04 +08:00 |
Wen
|
c34f2da385
|
课程注册与用户注册页面的学校选择全部搞定!
|
2014-04-15 17:37:38 +08:00 |
wanglinchun
|
b4b61a3422
|
修改小bug;设计打分和评论唯一性前提交版
|
2014-04-14 21:54:54 +08:00 |
wanglinchun
|
733497fef8
|
调整竞赛列表页面中部分统计数字的超链接
|
2014-04-14 17:29:38 +08:00 |
wanglinchun
|
98b6493b91
|
给应用添加开发人员字段及显示
|
2014-04-14 09:50:36 +08:00 |
wanglinchun
|
a4df4cf893
|
修改竞赛和参与竞赛的新建应用之间的关联关系
|
2014-04-11 16:40:09 +08:00 |
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前,目前部分代码由于数据表及关联没考虑清楚,导致无法关联,下一步修改代码,重新建表,完成关联功能及应用的正常显示
|
2014-04-11 09:00:00 +08:00 |
wanglinchun
|
be61b9d1ac
|
调整了具体应用页面评价应用的功能
|
2014-04-10 08:33:30 +08:00 |
fanqiang
|
d381423c0e
|
添加了版主功能
|
2014-04-06 22:12:16 +08:00 |
fanqiang
|
89b668be82
|
添加申请版主功能,目前已经可以写入数据库
|
2014-04-06 16:34:23 +08:00 |
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西,包括数据库的相应表,新建了发布应用的页面,上传图片功能未实现,界面格式还需调整
|
2014-04-04 17:54:20 +08:00 |
wanglinchun
|
1e7e0a1bb5
|
修改加入竞赛和退出竞赛不能刷新的问题;新建项目后不能刷新的问题;竞赛列表和竞赛页面搜索问题
|
2014-04-03 22:15:19 +08:00 |
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
2014-04-03 17:26:56 +08:00 |
yanxd
|
930bc4083e
|
forge 软件
|
2014-03-31 17:02:28 +08:00 |
yanxd
|
6bef7029bc
|
项目课程分不清,添加解释语句
|
2014-03-25 15:21:38 +08:00 |
wanglinchun
|
8d2bbfe320
|
调整首页主题部分字体格式
|
2014-03-24 21:36:10 +08:00 |
wanglinchun
|
1fabad8c2f
|
修改项目托管主页和课程实践主页主题句
|
2014-03-24 16:27:18 +08:00 |
yanxd
|
d9bc17c1ea
|
留言权限, basecourse关闭课程重构
|
2014-03-19 17:32:32 +08:00 |
yanxd
|
e0c87996bf
|
改了个课程截至日期,并且在courses_controller中设置了过期不允许加入的设定,目测没什么问题,明天再看看
|
2014-03-17 22:43:38 +08:00 |
wanglinchun
|
abb27025d3
|
修改course门户主页中新开课程后更多的链接问题
|
2014-03-08 09:55:00 +08:00 |
yanxd
|
0b385cdbbb
|
毛的资源库关联文件
|
2014-03-06 16:47:28 +08:00 |
yanxd
|
2ca1362e83
|
“按用户搜索”和“搜索”的区别,分别可以搜索什么? 上面搜索删掉
1、标签的格式需 要优化(所有涉及到标签的地方的标签的格式都需要调整) tag周围距离
“课程通知“应该调整到“课程作业”后面 改!
|
2014-02-25 15:43:03 +08:00 |
yanxd
|
7deeab62bc
|
course.trustie.net
|
2014-02-24 10:40:45 +08:00 |
wanglinchun
|
9aa903d79c
|
修改了新建课程页面的显示问题
|
2014-02-19 20:21:46 +08:00 |
yanxd
|
0ed2e19268
|
项目列表
|
2014-01-24 10:55:25 +08:00 |
wanglinchun
|
f0132a0f5f
|
在“课程实践->讨论区”为匿名用户不能进行评论添加登陆的提示以及登陆的链接
在“课程实践->留言”中的用户反馈改为用户留言
将“课程实践”中讨论区、资源库、课程通知和留言中提示语格式进行统一
|
2014-01-21 17:02:33 +08:00 |
yanxd
|
d202c84b44
|
导航条下拉菜单. [Version] alpha v0.1
|
2014-01-20 20:25:27 +08:00 |
yanxd
|
0d9453080c
|
bug
|
2014-01-18 10:52:05 +08:00 |