 z9hang
|
d83899e3e4
|
添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码（未应用）
|
11 years ago |
|
z9hang
|
ae5ced6a51
|
课程权限添加（部分）
|
11 years ago |
 sw
|
94542e935a
|
增加点击作业名下载改作业下所有附件的功能
|
11 years ago |
|
sw
|
50171ad0f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
9bfe9ba1b2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
27be52e58d
|
老师的邮件中增加取消邮件通知链接
修复主页文件上传动态中点击进入附件跳转错误问题
|
11 years ago |
|
sw
|
1a0de23b38
|
修改作业在进行修改、删除、添加时的代码
|
11 years ago |
 yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
 fanqiang
|
9e05ecf5b4
|
修改主页展示部分
|
11 years ago |
 wanglinchun
|
43449e66b5
|
增加了竞赛通知按钮
|
11 years ago |
|
sw
|
03c8f39729
|
1.修复登录提示描述不正确的问题
2.修改作业显示界面html
|
11 years ago |
|
z9hang
|
2e36949604
|
添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看）
|
11 years ago |
|
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
|
11 years ago |
|
sw
|
218fb3f831
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
sw
|
e0273d320c
|
1.登录增加js提示可以用昵称和邮箱登录
2.修改资料界面增加昵称的修改以及修改昵称的验证
3.修改昵称的描述
|
11 years ago |
 nwb
|
b52690adc2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
61135a352a
|
上传文件表单支持添加文件标签
|
11 years ago |
|
z9hang
|
daecf1a53b
|
老师收到课程留言区的直接留言及对老师的回复的邮件提醒
|
11 years ago |
|
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
11 years ago |
|
xianbo
|
0f56d9e885
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
fanqiang
|
fdf8b5640a
|
添加显示bug的页面
|
11 years ago |
yanxd
|
98444ef01e
|
remove fuzzy routes|add school missing row
|
11 years ago |
|
wanglinchun
|
d20114cc42
|
竞赛子站国际化完成
|
11 years ago |
|
z9hang
|
ab85ee5169
|
admin个人主页项目功能修正
admin管理用户的搜索功能从/users/search中分离到/admin/search
admin管理用户界面添加管理界面布局
|
11 years ago |
|
yanxd
|
4b1d7e049d
|
233
|
11 years ago |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
11 years ago |
|
wanglinchun
|
be5de6f3f6
|
zh文件中添加国家化内容
|
11 years ago |
|
wanglinchun
|
7b6c96a8b6
|
view中contests中的文件已经全部国际化
|
11 years ago |
|
z9hang
|
0e6d9a804a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
11 years ago |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
11 years ago |
|
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
11 years ago |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
fanqiang
|
d3ead651fe
|
动态显示安全问题
|
11 years ago |
|
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
yanxd
|
f44b930037
|
233
|
11 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
11 years ago |
|
sw
|
7748704c3a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
|
sw
|
8bb8de7d7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
c7b19d8f2e
|
修改作业提交流程
|
11 years ago |
|
wanglinchun
|
518de57123
|
将参赛作品编辑更新后的提示语修改为汉语
|
11 years ago |
|
wanglinchun
|
947c0f8f64
|
竞赛页面中添加参赛作品成功创建的提示语
|
11 years ago |
|
wanglinchun
|
a5cb14274c
|
修改参赛作品页面中未登录状态下的提示
|
11 years ago |
|
wanglinchun
|
dd43e2c3fc
|
竞赛页面我要参赛中添加判断，当用户未登录时提示登录后参赛
|
11 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
|
nwb
|
097489e594
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4d21933e09
|
1.优化资源文件上传下载界面
2.教师的课程界面优化
|
11 years ago |
