 nwb
|
b7c4f87a8f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/index.html.erb
|
11 years ago |
|
nwb
|
02b4029e8c
|
资源文件下载界面调整
|
11 years ago |
 z9hang
|
d9e04bab0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
cc4bf3b328
|
添加超级管理员控制首页热门项目排序问题
|
11 years ago |
 sw
|
4825c5287e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
53ff6ea335
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
6a45a0287d
|
添加删除图片功能，修复用户修改资料界面form.quene undefine的js错误（导致加载中不消失的原因）
|
11 years ago |
|
sw
|
b142953a4b
|
1.创建项目增加功能：是否启动DTS测试，默认为不启用。根据用户选择，决定左侧DTS测试工具选项是否在该项目内显示
|
11 years ago |
|
z9hang
|
cf339edb6c
|
添加首页定制的非空验证，长度验证
|
11 years ago |
|
nwb
|
0950ac2329
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
87b623bc51
|
1.文档添加密级设置
2.新建文档、修改文档视图修改
|
11 years ago |
|
z9hang
|
fcdfeae326
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
3dfcc90574
|
课程、竞赛首页定制
超级管理员账户中首页定制界面优化
|
11 years ago |
|
nwb
|
1d4dad22ad
|
Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop
Conflicts:
ReadMe.txt
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
nwb
|
bdaf59513b
|
Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop
Conflicts:
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
nwb
|
9b3ffc90ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/repositories_controller.rb
db/schema.rb
|
11 years ago |
|
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
11 years ago |
|
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
11 years ago |
 yanxd
|
803e9cbdb5
|
globel issue#858, 中国高校--输入无效条件点击搜索，建议给出提示信息
|
11 years ago |
|
z9hang
|
720c75478a
|
修正上传图片可传非图片文件bug
|
11 years ago |
|
z9hang
|
9634046d11
|
权限管理机制优化
|
11 years ago |
|
nwb
|
dd396a6da2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
ae32b310cd
|
新建竞赛时的日期信息提醒变更
|
11 years ago |
|
nwb
|
3a7065bb2d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
sw
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
f664ec10b4
|
Merge branch 'szzh' into develop
Conflicts:
app/views/bids/_bid_homework_show.html.erb
|
11 years ago |
|
z9hang
|
54a2fb8a9c
|
主页项目得分与项目页面的项目得分保持一致
|
11 years ago |
|
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
11 years ago |
 linchun
|
79f68c2231
|
Merge branch 'szzh' into develop
|
11 years ago |
|
nwb
|
b4af75f289
|
部分界面优化
|
11 years ago |
|
nwb
|
f4aa817f42
|
修改合并后首页出错的问题
|
11 years ago |
|
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
|
11 years ago |
|
linchun
|
9c5066b81c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
app/controllers/account_controller.rb
|
11 years ago |
|
z9hang
|
773b728828
|
修改：自己不能踩或顶自己
|
11 years ago |
|
nwb
|
8a5e1f5d9f
|
界面修改
|
11 years ago |
|
nwb
|
099e8a0912
|
Merge branch 'szzh' into CourseModify
Conflicts:
app/controllers/application_controller.rb
app/views/attachments/upload.js.erb
app/views/courses/_homework_form.html.erb
app/views/layouts/base_courses.html.erb
app/views/users/_my_joinedcourse.html.erb
db/schema.rb
lib/redmine.rb
lib/redmine/access_control.rb
|
11 years ago |
senluo
|
cc39172d87
|
fix
|
11 years ago |
|
z9hang
|
697a6034b2
|
新得分显示
|
11 years ago |
|
yanxd
|
70abac4c1e
|
Merge branch 'competition' into develop
Conflicts:
app/controllers/application_controller.rb
config/locales/en.yml
config/locales/zh.yml
db/schema.rb
|
11 years ago |
|
wanglinchun
|
d76eec27cc
|
为竞赛通知评论添加登录权限
|
11 years ago |
|
wanglinchun
|
a40db3dc4b
|
首页添加了竞赛所获奖项显示
|
11 years ago |
|
nwb
|
f741b0581c
|
修改课程资源文件视图BUG
|
11 years ago |
|
sw
|
26b933dddb
|
t
|
11 years ago |
|
wanglinchun
|
1393aebace
|
完成了按钮样式
|
11 years ago |
|
wanglinchun
|
372de9932a
|
英文版竞赛子站完成
|
11 years ago |
|
wanglinchun
|
42aba52111
|
竞赛子站英文版5
|
11 years ago |
|
z9hang
|
4478c86cea
|
添加课程 查看真名、查看成员、作业导出权限代码（未应用）
|
11 years ago |
|
sw
|
8f94985186
|
1.添加作业时权限判断
2.增加作业成员tab页
|
11 years ago |
|
wanglinchun
|
c31c5d49d1
|
竞赛子站英文版4
|
11 years ago |
|
wanglinchun
|
6546d107c8
|
英文版3
|
11 years ago |
|
wanglinchun
|
b1b7c19e58
|
英文版实施2
|
11 years ago |
|
wanglinchun
|
0e09137b99
|
竞赛子站英文版实施中
|
11 years ago |
|
z9hang
|
09368442c6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
wanglinchun
|
040e469cb2
|
竞赛子站国际化
|
11 years ago |
|
z9hang
|
d83899e3e4
|
添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码（未应用）
|
11 years ago |
|
wanglinchun
|
928d61a3cd
|
国际化竞赛子站
|
11 years ago |
|
wanglinchun
|
bbf7aca174
|
完成了英文版参赛作品页面
|
11 years ago |
|
wanglinchun
|
56ca98ab18
|
完成英文版竞赛列表页面
|
11 years ago |
|
wanglinchun
|
8a2e57d675
|
竞赛列表英文页面完成
|
11 years ago |
|
sw
|
81a97f6a5e
|
1.老师创建作业增加功能：是否启用互评，以及该功能的修改。对不启用互评的作业，学生不可下载作业，不可互相打分，但可以留言；老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
2.对启用互评的作业，每个用户只可以进行一次打分，打分后不可修改
|
11 years ago |
|
z9hang
|
ae5ced6a51
|
课程权限添加（部分）
|
11 years ago |
|
sw
|
78ac974a75
|
1.修改课程作业列表界面提交作业
2.修复获取当前用户在指定作业下提交作业方法不正确的问题
|
11 years ago |
|
wanglinchun
|
da26c70f6c
|
修改首页子站入口
|
11 years ago |
|
wanglinchun
|
a38ffb9e9d
|
首页修改4
|
11 years ago |
|
wanglinchun
|
7abeabeadf
|
首页修改3
|
11 years ago |
|
wanglinchun
|
4b54f2949d
|
首页修改2
|
11 years ago |
|
wanglinchun
|
e5a76251a5
|
修改首页2
|
11 years ago |
|
wanglinchun
|
ebcdd2cc9e
|
修改首页英文显示
|
11 years ago |
|
wanglinchun
|
b5be2d58ce
|
英文子站首页
|
11 years ago |
|
sw
|
50171ad0f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
wanglinchun
|
6a8d697582
|
Merge branch 'develop' into competition
Conflicts:
config/routes.rb
lib/redmine.rb
|
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 |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
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 |
|
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 |
|
z9hang
|
daecf1a53b
|
老师收到课程留言区的直接留言及对老师的回复的邮件提醒
|
11 years ago |
|
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
11 years ago |
|
wanglinchun
|
d20114cc42
|
竞赛子站国际化完成
|
11 years ago |
|
wanglinchun
|
be5de6f3f6
|
zh文件中添加国家化内容
|
11 years ago |
|
wanglinchun
|
7b6c96a8b6
|
view中contests中的文件已经全部国际化
|
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 |
|
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
|
4d21933e09
|
1.优化资源文件上传下载界面
2.教师的课程界面优化
|
11 years ago |
|
wanglinchun
|
10b34341c7
|
修改参赛作品编辑页面说明文字：应用--》作品
|
11 years ago |
|
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
11 years ago |
|
t430
|
00b866f06a
|
Merge branch 'develop'
|
11 years ago |
|
wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
8f153520b4
|
调整上传资源界面
|
11 years ago |
|
nwb
|
f2f81e1d02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
8ef716b920
|
1.个人动态留言显示出留言人
2.留言添加跳转链接
|
11 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
d019a4d9ce
|
重新调整了：评奖，暂未评奖，未评奖
|
11 years ago |
|
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址；
参赛应用页面添加所属项目网址；
|
11 years ago |
|
nwb
|
25dba88a08
|
1.优化界面
2.资源下载界面添加按文件类型分类浏览
|
11 years ago |
|
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
11 years ago |
|
wanglinchun
|
81c3659a89
|
调整新建参赛作品的显示样式
|
11 years ago |
|
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
11 years ago |
|
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
11 years ago |
|
wanglinchun
|
1e0e5a5ab1
|
Merge branch 'competition' into develop
Conflicts:
config/routes.rb
|
11 years ago |
yanxd
|
19ddb38e1b
|
异步验证注册字段合法
|
11 years ago |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
11 years ago |
|
yanxd
|
4d8701220b
|
-。-
acoount.html对齐了一下
学校列表school/index.html默认显示全部学校
没有填写工作单位的用户强行跳转到修改资料页面
|
11 years ago |
|
wanglinchun
|
3edb1114c3
|
修改参赛作品列表页面的部分显示方式
|
11 years ago |
|
wanglinchun
|
caff0f55c9
|
调整了竞赛页面中参赛作品数量统计及跳转
|
11 years ago |
|
wanglinchun
|
fe151f9e29
|
竞赛页面中增加“我要参赛”菜单
|
11 years ago |
|
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
|
11 years ago |
Wen
|
53574a9592
|
wenwenwen
|
11 years ago |
|
wanglinchun
|
21fe914d8f
|
恢复误删的国际化
|
11 years ago |
|
Wen
|
e2a9e58ef5
|
本地化做了下
|
11 years ago |
|
wanglinchun
|
12ad20cf3b
|
修改应用列表页面的显示标题为：应用列表-Trustie——为大学生技术创新筑巢
|
11 years ago |
|
wanglinchun
|
ae972ddaa1
|
修改国际化
|
11 years ago |
|
wanglinchun
|
6ab0eb4477
|
修改后发现错误
|
11 years ago |
|
fanqiang
|
07b75924d8
|
修改tag搜索，使得tag搜索能够搜索开源项目
在帖子展示页面添加时间，并添加标签
|
11 years ago |
|
wanglinchun
|
9f75bf179a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
8f5958abc1
|
mao
|
11 years ago |
|
wanglinchun
|
189b935d5b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
wanglinchun
|
ed71a3faa1
|
调整删除竞赛的显示样式及位置
|
11 years ago |
|
Wen
|
02295e5ca9
|
给严总调试用
|
11 years ago |
 kg
|
daa19de51d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
kg
|
271427d29e
|
homepage status
|
11 years ago |
|
Wen
|
6a2626c90e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
Wen
|
473a44d11a
|
学校-课程模式！
|
11 years ago |
|
wanglinchun
|
6b5452f3e2
|
增加修改应用时提示语
|
11 years ago |
|
wanglinchun
|
a90804b312
|
修改上传应用软件包和截图的说明文字
|
11 years ago |
|
wanglinchun
|
05c0d2a5ac
|
替换竞赛模块首页中竞赛和应用的图标并调整相应的格式
|
11 years ago |
|
wanglinchun
|
8a429ec669
|
首页提示语
|
11 years ago |
 alan
|
87fdecdabd
|
创新竞赛添加删除功能
|
11 years ago |
|
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
|
11 years ago |
