 z9hang
|
683cd9f918
|
个人积分修改
|
11 years ago |
|
z9hang
|
96fa28f70d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 sw
|
b0b3f257a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
56a06c4a04
|
修复git说明页面导航丢失问题
修改个人得分
|
11 years ago |
|
z9hang
|
eacc0fdf53
|
修复编辑作业提交时的bug
修改个人得分
|
11 years ago |
|
sw
|
34af8053cc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
z9hang
|
17e6f0ee4f
|
部分私有的项目提交次数显示问题
|
11 years ago |
|
z9hang
|
c6271e2aa9
|
修复由项目积分改动引起的一个页面无法查看bug、添加项目得分统计任务
|
11 years ago |
|
sw
|
22335b23a6
|
修复新建账号申请项目时在申请列表无法显示的BUG #1180
|
11 years ago |
|
z9hang
|
05186c8590
|
项目积分存数据库
有项目积分引起的系列bug
|
11 years ago |
|
z9hang
|
7907edf168
|
更新项目得分规则
调整项目列表显示样式
|
11 years ago |
|
z9hang
|
2c77d1b4cf
|
访问资源库问题
|
11 years ago |
|
z9hang
|
80b2a2dc45
|
修正公共贴吧新建帖子问题
修正课程列表错误
|
11 years ago |
|
z9hang
|
ff02c4f9f2
|
修正课程显示老师、学生人数与课程中老师、学生数量不一致问题
修正学校主页课程推荐中显示的课程人数与课程总人数不一致问题
|
11 years ago |
|
z9hang
|
0d46c63c54
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
2ad51d7afe
|
修改引用的留言为不能修改
|
11 years ago |
|
sw
|
8b80d99a70
|
修复资源标记搜索不正确的BUG issues#1089
|
11 years ago |
|
z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
11 years ago |
|
z9hang
|
c60188038e
|
得分机制修改
|
11 years ago |
|
z9hang
|
225e3c396a
|
个人得相关分方法添加
|
11 years ago |
|
sw
|
a39672dd14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
18ddb8604b
|
取消参赛作品名称、描述的字数限制
|
11 years ago |
 nwb
|
74de064cca
|
1.文件删除权限判断优化
2.课程通知附件删除BUG修改
|
11 years ago |
|
z9hang
|
673ffb1819
|
提交次数刷新问题
|
11 years ago |
|
z9hang
|
f83336aed0
|
修改首页定制中热门项目排序方式的实现
|
11 years ago |
|
z9hang
|
4542b9e21a
|
积分修改
|
11 years ago |
|
z9hang
|
6b441760c4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
80b5871756
|
竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
添加新的表记录个人得分相关细节，及各种得分更新方法
|
11 years ago |
 yanxd
|
9c3ff51633
|
remove useless navbar method called
|
11 years ago |
|
sw
|
6e954d314f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
b1251db30c
|
1.修改竞赛作品时增加作品类别下拉框选择
2.修改竞赛作品时增加获取选择其他时作品类别
|
11 years ago |
|
nwb
|
d8d8473811
|
优化课程列表成员数计算
|
11 years ago |
|
sw
|
ba66cde840
|
1.优化作业显示界面加载效率
2.修复获取作业的互评得分、综评得分、教师评分不准确的问题
|
11 years ago |
|
sw
|
93d8fd31a0
|
增加作品分类下拉框
|
11 years ago |
|
nwb
|
6bced5106e
|
调整课程列表视图
|
11 years ago |
|
sw
|
46c7a4bb9f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
5272a90227
|
修改人数显示
|
11 years ago |
|
yanxd
|
df848ca756
|
print tag exception, course name valid test.
|
11 years ago |
|
nwb
|
a4d06fbb12
|
课程成员设置为只能使用单一权限
|
11 years ago |
|
sw
|
bcaaa02bed
|
取消已完成课程在软件创客列表的显示
|
11 years ago |
|
nwb
|
6968039c87
|
修改课程学生计算函数
|
11 years ago |
|
nwb
|
f4d6696d2e
|
优化资源搜索界面
|
11 years ago |
|
nwb
|
6a65b2a84b
|
去掉测试代码
|
11 years ago |
|
nwb
|
b60a0ddf59
|
1.添加给gitlab项目新增用户及赋权限接口
2.添加给gitlab项目删除用户接口
|
11 years ago |
|
nwb
|
3d8571b59e
|
1.实现新增gitlab用户接口
2.实现删除gitlab用户接口
|
11 years ago |
|
nwb
|
6dcc50e60b
|
添加gitlab创建项目(版本库)接口
|
11 years ago |
|
nwb
|
36ab954cf9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
297fe9a3f4
|
添加gitlab远程登录接口
|
11 years ago |
|
z9hang
|
cc4bf3b328
|
添加超级管理员控制首页热门项目排序问题
|
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
|
31245f6fb2
|
修复软件创客列表中某些用户的用户名显示不为超链接(未激活账户)
|
11 years ago |
|
sw
|
59a5541e45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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 |
|
sw
|
4f2298fd22
|
修复个人动态首页中留言等动态显示有误的问题
|
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 |
|
sw
|
a5518363c3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
65c137e617
|
修复进入课程作业报错的问题
|
11 years ago |
|
yanxd
|
2b57e170ef
|
want that image popup in html when user click on thumbnail.
|
11 years ago |
|
z9hang
|
9634046d11
|
权限管理机制优化
|
11 years ago |
|
z9hang
|
b87abf1f68
|
权限管理优化
|
11 years ago |
xianbo
|
25ee1d8672
|
for adjust test domain and give a setting reposwq
|
11 years ago |
|
yanxd
|
ab03962e9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
aca63146e9
|
搜索文件归属，课程相关逻辑修改，查询把过滤去掉了。暂时没想有什么过滤的好办法
|
11 years ago |
|
nwb
|
bc179fbc39
|
右上角菜单增加二级菜单
|
11 years ago |
|
nwb
|
c927bb6fd6
|
首页课程列表修改
|
11 years ago |
|
sw
|
1e6693cdcf
|
1.取消软件创客界面2个个人得分显示
2.修复软件创客界面用户参与课程显示不正确的BUG
3.添加获取用户参与的未过期的项目列表
|
11 years ago |
|
nwb
|
dc0180988f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
d001b4416a
|
1.优化课程首页
2.优化课程首页搜索逻辑
|
11 years ago |
|
sw
|
2bdb0e20e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/course.html.erb
|
11 years ago |
|
nwb
|
98ba57b819
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4d25ec1623
|
1.添加课程垃圾数据清理迁移文件
2.课程首页逻辑更改
|
11 years ago |
|
yanxd
|
0e2b7ba362
|
tag search fix
|
11 years ago |
|
sw
|
5abee0a06c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
2a6cbe28f0
|
修正课程首页错误
|
11 years ago |
|
sw
|
3c7e680b1b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
nwb
|
31e338f1e5
|
修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
|
11 years ago |
|
sw
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
898ecb443a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e8705bccb1
|
修改文件上传界面样式
|
11 years ago |
|
z9hang
|
54a2fb8a9c
|
主页项目得分与项目页面的项目得分保持一致
|
11 years ago |
|
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
11 years ago |
|
sw
|
12b6525cc6
|
t
|
11 years ago |
|
sw
|
ed9b97f987
|
增加访问作业显示列表的权限
|
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 |
|
sw
|
358d4a53b8
|
修复未公开项目动态仍在主页最新动态显示的问题
|
11 years ago |
|
sw
|
0dce86d47e
|
修改首页项目显示为按活跃度排名的前10个项目
|
11 years ago |
|
sw
|
18762e2da7
|
增加、修改作业时提交项目增加空值选择，即不选定任何关联项目
|
11 years ago |
|
sw
|
5277eddb95
|
封装获取一个作业参与人员方法
|
11 years ago |
|
sw
|
989407dad2
|
12
|
11 years ago |
|
sw
|
09eae9e253
|
1.作业列表增加项目得分显示
2.封装获取指定项目得分的方法，并保留2位有效数字
|
11 years ago |
|
sw
|
463edeee71
|
1.修复未开启互评功能作业总评得分计算不正确的问题
2.修复未选择项目新建、修改有误的BUG
|
11 years ago |
|
sw
|
59e6433938
|
修复获取当前用户建立项目不正确的问题
|
11 years ago |
|
sw
|
f3f303e6e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
ef234d8c50
|
1.按照新的评分规则修改作业得分
2.修改作业列表显示界面
3.增加获取作业的互评得分、教师评分、最终评分方法
|
11 years ago |
|
nwb
|
0736dd1254
|
课程讨论区回复权限和界面BUG修正
|
11 years ago |
|
z9hang
|
f2cb1390da
|
修复带pre标签缺陷留言的显示问题
|
11 years ago |
|
nwb
|
0480405afb
|
1.修改原课程各数据迁移文件BUG
2.迁移课程学生数据
|
11 years ago |
|
sw
|
97a4aaf8ab
|
homework_attach增加列project_id及相关数据迁移
编辑作业页面增加选择关联项目，以及数据更新项目的实现
|
11 years ago |
|
nwb
|
3afb70bf84
|
主讲教师修改为不允许退出课程
|
11 years ago |
|
nwb
|
78612488e5
|
1.修改新建作业及视图
2.修改编辑作业及视图
|
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 |
|
nwb
|
9c3605320e
|
加入、退出课程逻辑优化
|
11 years ago |
|
nwb
|
b4e78d2b0c
|
课程添加成员逻辑更改
|
11 years ago |
|
nwb
|
2a4486bf0d
|
修改迁移文件
|
11 years ago |
|
yanxd
|
47e6c3eedd
|
home cache
|
11 years ago |
|
yanxd
|
93d13c8867
|
system bin, 坑
|
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 |
|
nwb
|
c8900c279c
|
课程标签增加、删除
|
11 years ago |
|
sw
|
a100193373
|
1.作业参与人员可以对作业进行修改，但不能进行删除
2.作业成员(发布人员和参与人员)不能对作业进行评分
3.修改进行作业删除、添加、修改、添加成员等方法的权限判断
|
11 years ago |
|
nwb
|
70901832a8
|
1.修改课程讨论区control index、show方法及路由
2.BoardsHelper添加课程相关方法
|
11 years ago |
|
sw
|
a681aa76cb
|
1.修复进入互评界面的报错
2.互评界面增加参与人员显示
3.添加成员页面开发人员改为参与人员
|
11 years ago |
|
sw
|
d0dd6eb781
|
1.修改作业时实现作业添加参与人员与删除参与人员
2.homework_attach、homework_user、users关系添加
3.优化页面显示
|
11 years ago |
|
sw
|
130f9f87c2
|
1.实现作业添加成员的翻页功能
2.美化作业成员界面显示
|
11 years ago |
|
nwb
|
a793b8923d
|
1.Non member角色添加add_couese权限
2.course_helper优化排序等相关函数
3.课程index界面修改
|
11 years ago |
|
sw
|
cbb348dc0e
|
实现给作业增加用户页面相关js代码及css代码
|
11 years ago |
|
sw
|
67c9fefba6
|
增加tab页切换的js
|
11 years ago |
|
sw
|
787e043650
|
1.修改下载作业时的错误
2.修改判断是不是为当前课程学生、老师的方法
|
11 years ago |
|
sw
|
26b933dddb
|
t
|
11 years ago |
|
sw
|
e5fec207aa
|
1.修改判断当前用户是否为指定课程成员、学生、老师的方法
2.新建作业时获取当前项目学生方法
3.增加checkbox生成方法
|
11 years ago |
|
nwb
|
2f3d9b1795
|
1.修改资源文件类index方法
2.添加课程资源文件index视图
|
11 years ago |
|
z9hang
|
f383f501ec
|
修改权限代码:判断用户是否为项目的管理员、判断用户是否为课程的老师、学生由根据role_id判断改为根据其权限判断
|
11 years ago |
|
nwb
|
59742b9ddb
|
1.给各角色添加项目相关的权限
2.添加课程权限解析系统
|
11 years ago |
|
sw
|
8f94985186
|
1.添加作业时权限判断
2.增加作业成员tab页
|
11 years ago |
|
yanxd
|
174c5556a0
|
减少sql查询， logger ===> Rails.logger
|
11 years ago |
|
yanxd
|
1c7923e5bd
|
sql
|
11 years ago |
|
sw
|
8e2288a362
|
1.封装获取作业平均评分方法
2.优化作业列表界面效率
|
11 years ago |
 wanglinchun
|
0255a61d2f
|
dfg
|
11 years ago |
|
sw
|
81a97f6a5e
|
1.老师创建作业增加功能：是否启用互评，以及该功能的修改。对不启用互评的作业，学生不可下载作业，不可互相打分，但可以留言；老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
2.对启用互评的作业，每个用户只可以进行一次打分，打分后不可修改
|
11 years ago |
|
wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
11 years ago |
|
nwb
|
0d99644fa7
|
1.用户课程表逻辑修改
2.添加link_to_course相关逻辑
|
11 years ago |
|
sw
|
78ac974a75
|
1.修改课程作业列表界面提交作业
2.修复获取当前用户在指定作业下提交作业方法不正确的问题
|
11 years ago |
|
nwb
|
4404222437
|
0604
|
11 years ago |
|
sw
|
29ac5ff12a
|
如果当前用户已经提交过作业就不显示新增作业按钮
|
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 |
|
nwb
|
cd10dd5433
|
课程权限判断变更，从项目权限分离
|
11 years ago |
|
nwb
|
7d3d406c00
|
新增部分课程所需的解析函数
|
11 years ago |
|
nwb
|
9f948c971f
|
添加课程排序方法
|
11 years ago |
|
wanglinchun
|
528af32f91
|
修改forge，localhost首页不能显示的问题
|
11 years ago |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
11 years ago |
|
z9hang
|
2e9251530c
|
修改缺陷状态留言处引用的链接被遮住问题
|
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 |
|
sw
|
22688dd5da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
 fanqiang
|
150bb1ba1e
|
修改开源社区主页中的漏洞展示部分
|
11 years ago |
|
sw
|
96504d6806
|
1.修改作业提交流程，
2.增加修改作业、删除作业方法
3.修改作业页面显示
|
11 years ago |
|
yanxd
|
006e4ae45e
|
user tab bar
|
11 years ago |
|
nwb
|
f936c30ec9
|
添加与course.index相关的control、view、help等实现
|
11 years ago |
|
sw
|
218fb3f831
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
config/locales/zh.yml
|
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 |
|
sw
|
27a30d44be
|
1.修改判断当前用户是不是为课程老师的方法
2.增加作业综评功能
3.其他课程的学生是不能互评的，只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时，作业最终得分只显示一个分字
|
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 |
yanxd
|
a9b88b8e66
|
issues#show words typo
|
11 years ago |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
11 years ago |
|
yanxd
|
654cb404e2
|
bootstrap test
|
11 years ago |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
7a4e5afba0
|
test
|
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 |
|
yanxd
|
598429695f
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
62f9ed052b
|
issues#655
|
11 years ago |
|
fanqiang
|
d3ead651fe
|
动态显示安全问题
|
11 years ago |
|
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
65c3bb5eb1
|
1.作业列表评分结果显示保留2位有效数字
2.互评界面显示最终评分数值
3.增加互评按钮，修改查看学号、按学号排序等功能的条件
4.修改互评界面作业下载信息显示，取消描述
|
11 years ago |
|
yanxd
|
f44b930037
|
233
|
11 years ago |
|
wanglinchun
|
2f709c92ba
|
重构bid_helper，contest_helper以及application_helper中共同用到的方法
|
11 years ago |
|
nwb
|
f51873d98b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
11 years ago |
|
yanxd
|
34aa8433de
|
import hubspot
|
11 years ago |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
fanqiang
|
10aa8eee81
|
显示帖子的发布者和时间
|
11 years ago |
|
wanglinchun
|
88b7fd24b1
|
给新建参赛作品中托管项目添加默认选项，使用户自行选择是否需要将参赛作品托管到制定的项目中
|
11 years ago |
|
nwb
|
1d6816419d
|
优化用户申请加入项目界面刷新
|
11 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
fanqiang
|
973a59042c
|
修改帖子显示用户名与链接问题
|
11 years ago |
|
wanglinchun
|
77b7da81fd
|
参赛作品页面编辑功能中添加修改托管项目列表完成
|
11 years ago |
|
yanxd
|
c4bd9aaabd
|
Merge branch 'szzh' into develop
|
11 years ago |
|
nwb
|
4156983494
|
缺陷添加缩略图显示
|
11 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
|
sw
|
c141501085
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
yanxd
|
9373666576
|
混淆课程数量
|
11 years ago |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
11 years ago |
|
sw
|
14a468066f
|
修复打开首页，SQL没有默认的school_id的问题
|
11 years ago |
|
sw
|
7ead12dba6
|
1.优化路由代码
2.修改当查询学校课程数数量少于8个时，推荐9-当前学校课程数量门最好的课程给用户，并且排除当前学校课程
|
11 years ago |
|
wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
0385013905
|
修复主页跳转
去除老师删除项目型作业，优化代码
|
11 years ago |
|
fanqiang
|
c6ee7e53e6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
fanqiang
|
1a7c82174c
|
修改表结构
|
11 years ago |
|
yanxd
|
665a17eda5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
yanxd
|
829c77879a
|
typo
|
11 years ago |
|
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
11 years ago |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
11 years ago |
|
z9hang
|
fcc5f220ce
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
25dba88a08
|
1.优化界面
2.资源下载界面添加按文件类型分类浏览
|
11 years ago |
|
z9hang
|
73dcf3679d
|
去除课程、项目配置中的讨论区配置
|
11 years ago |
|
sw
|
64900b1fd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
5d2bb4ccbd
|
1.选择学校进入学校课程列表，点击更多由显示所有课程可能改为显示当前学校课程列表，之后排序也一样
2.当查询学校课程列表为空时，推荐改为本系统中本年度开设的最好的课程，同时加入课程改为关注课程。此时点击更多查看的为所有课程
3.查询出课程列表将学校和教师放在课程上面
|
11 years ago |
|
nwb
|
431b6603f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
11 years ago |
|
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
11 years ago |
|
sw
|
b97c2e230f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
74a9aa14d6
|
增加获取学校列表按学校开设课程数排序的方法
增加当当前学校开设课程数目为0时按照上方法推荐其进入其他学校查看课程
|
11 years ago |
|
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
11 years ago |
|
fanqiang
|
9b151567f1
|
修改没有帮助显示问题
|
11 years ago |
|
yanxd
|
05baffe4f3
|
issue导航，首页贴吧动态html,加入了最后回复
|
11 years ago |
Wen
|
501b491363
|
=.=
|
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
|
90b53a7efb
|
打分的调整
|
11 years ago |
|
Wen
|
040e4b2740
|
用户打分.
|
11 years ago |
|
wanglinchun
|
3da6d5cd37
|
应用页面列表排序（按时间排序已好，另一种排序暂未定）
|
11 years ago |
|
wanglinchun
|
b542f8072d
|
调整竞赛列表页面中的排序问题
|
11 years ago |
|
fanqiang
|
07b75924d8
|
修改tag搜索，使得tag搜索能够搜索开源项目
在帖子展示页面添加时间，并添加标签
|
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
|
1ca0113204
|
Merge branch 'competition' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
wanglinchun
|
9038f2758c
|
根据将旧的竞赛信息和参与竞赛的项目信息迁移到新的竞赛相关数据表后重新调整竞赛子站首页最新热门竞赛的显示
|
11 years ago |
|
yanxd
|
f4595dfcd2
|
修改部分拍段project、course方式
projectlist 报错
|
11 years ago |
 kg
|
77ea0092b7
|
add course homepage activity
|
11 years ago |
|
Wen
|
473a44d11a
|
学校-课程模式！
|
11 years ago |
|
Wen
|
00e62ec8f7
|
用户评分理论上完成版.
|
11 years ago |
|
fanqiang
|
91d5959016
|
添加了对管理员申请的接受与拒绝
|
11 years ago |
|
Wen
|
ded3da6670
|
用户评分理论上完成了
|
11 years ago |
|
fanqiang
|
28b10ed3fd
|
修改了搜索功能，并能对搜索进行过滤
|
11 years ago |
|
Wen
|
3ba524668f
|
用户评分未完成版本= =
上传一下以防丢了
|
11 years ago |
|
wanglinchun
|
94a7bacdd2
|
首页：当无应用时，提示暂无应用
|
11 years ago |
 baiyu
|
f0b497e455
|
user score merge
|
11 years ago |
|
baiyu
|
36cd91401f
|
user score
|
11 years ago |
|
fanqiang
|
8600265f00
|
修改查询条件样式
|
11 years ago |
|
xianbo
|
bb4d141b0e
|
erge branch 'competition' into develop
Conflicts:
app/views/layouts/base_newcontest.html.erb
|
11 years ago |
|
wanglinchun
|
43064c4bc2
|
调整竞赛模块首页中显示的竞赛：既有旧的竞赛又有新的竞赛
|
11 years ago |
|
xianbo
|
647081539c
|
fix
|
11 years ago |
|
wanglinchun
|
76ccfe8ac4
|
fix
|
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 |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
11 years ago |
 alan
|
f6a1e90ad1
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
wanglinchun
|
3a5b5bc0ce
|
设计并调整竞赛模块的首页显示样式
|
11 years ago |
|
yanxd
|
84d3e40c41
|
zip down controller created
|
11 years ago |
|
wanglinchun
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
11 years ago |
|
wanglinchun
|
733497fef8
|
调整竞赛列表页面中部分统计数字的超链接
|
11 years ago |
|
alan
|
933fc6cb33
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
alan
|
7781203474
|
附件按tag查询时，只查选定项目中的附件
|
11 years ago |
|
wanglinchun
|
f9e5dd47f6
|
修改了竞赛列表的排序问题
|
11 years ago |
|
wanglinchun
|
64895a75ed
|
显示上传截图+应用显示
|
11 years ago |
|
wanglinchun
|
a4df4cf893
|
修改竞赛和参与竞赛的新建应用之间的关联关系
|
11 years ago |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
11 years ago |
|
yanxd
|
1b6cdeac05
|
列表上提交作业，大概好了吧
|
11 years ago |
|
yanxd
|
045b55236f
|
作业提交临时解决方案
|
12 years ago |
|
fanqiang
|
d381423c0e
|
添加了版主功能
|
12 years ago |
|
fanqiang
|
89b668be82
|
添加申请版主功能，目前已经可以写入数据库
|
12 years ago |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
12 years ago |
|
yanxd
|
7e130ee89e
|
去掉login_flag
|
12 years ago |
|
wanglinchun
|
2a278e0a2d
|
all
|
12 years ago |
|
fanqiang
|
9af808821d
|
修改框架，添加"没有帮助"和"申请成为版主"功能
|
12 years ago |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
12 years ago |
|
yanxd
|
a1a58ee26c
|
加注释
|
12 years ago |
|
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
4f5216e632
|
merge
|
12 years ago |
|
yanxd
|
84c5032eb2
|
整理下，加个推荐tag
|
12 years ago |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
12 years ago |
|
xianbo
|
2bba27e7a1
|
evils uri
|
12 years ago |
|
xianbo
|
3d2516f53c
|
fix navigation
|
12 years ago |
|
yanxd
|
d2ebfca314
|
加个数组判断
|
12 years ago |
|
yanxd
|
850ff6194f
|
issue#509,#510
|
12 years ago |
|
yanxd
|
8c251da25d
|
Bug：新建作业时菜单栏第一个显示蓝色，应该是第二个显示蓝色
|
12 years ago |
|
xianbo
|
6e065361b3
|
fix main page navigation
|
12 years ago |
|
fanqiang
|
d935152ed7
|
initial crawl
|
12 years ago |
|
yanxd
|
c38a8e4f6a
|
socialForge#324
|
12 years ago |
|
xianbo
|
3bf0a8f138
|
fix default show
|
12 years ago |
|
yanxd
|
6ba25556b7
|
issues id new world
|
12 years ago |
|
xianbo
|
321f2df0b9
|
add chance to new preoject
|
12 years ago |
|
xianbo
|
8db09739a1
|
optimize the show of forge
|
12 years ago |
|
yanxd
|
2e3b44c830
|
id-name(position|count)
|
12 years ago |
|
xianbo
|
34fd8a933a
|
fix the show of domain and project page
|
12 years ago |
|
Wen
|
ce7af30788
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
Wen
|
31b7ab8ae5
|
创建课程处添加了学校
数据库中存储学校的ID
但是学校与省份的级联还没有做好=A=
|
12 years ago |
|
xianbo
|
20cd5941a8
|
modify project main page
|
12 years ago |
|
yanxd
|
c905ded3b5
|
擦屁股
|
12 years ago |
|
yanxd
|
52fe99d71c
|
fixed 谭 domain bug in development environment.
|
12 years ago |
|
yanxd
|
e97caddbdb
|
又一个course timeout问题
|
12 years ago |
|
xianbo
|
3f55e78f49
|
add diff url in navigation
|
12 years ago |
|
yanxd
|
e0c87996bf
|
改了个课程截至日期，并且在courses_controller中设置了过期不允许加入的设定，目测没什么问题，明天再看看
|
12 years ago |
|
yanxd
|
daed8a1164
|
暂且提交，增加活动失败。
|
12 years ago |
|
yanxd
|
592d704a6d
|
主页 文件上传bug
|
12 years ago |
|
yanxd
|
3df986a908
|
教师列表转换排序方式后则搜索所有人员bug
|
12 years ago |
|
yanxd
|
46b508be2b
|
首页 论坛发帖权限
|
12 years ago |
|
yanxd
|
e7841cb512
|
fix
|
12 years ago |
|
yanxd
|
8963cc3a3c
|
邮件问题一
|
12 years ago |
|
yanxd
|
3b7e8483e3
|
搜索算法
|
12 years ago |
|
yanxd
|
0b385cdbbb
|
毛的资源库关联文件
|
12 years ago |
|
yanxd
|
e9373991d2
|
maoxian
|
12 years ago |
|
yanxd
|
21e55492fa
|
小改怡情 大改伤身 强改灰飞烟灭
|
12 years ago |
|
yanxd
|
2ca1362e83
|
“按用户搜索”和“搜索”的区别，分别可以搜索什么？ 上面搜索删掉
1、标签的格式需 要优化（所有涉及到标签的地方的标签的格式都需要调整） tag周围距离
“课程通知“应该调整到“课程作业”后面 改！
|
12 years ago |
|
yanxd
|
8a3d1d033c
|
用户navbar问题，注册对齐问题
|
12 years ago |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
12 years ago |
|
yanxd
|
cf2689917b
|
三天两头反复改 不如自挂东南枝
|
12 years ago |
|
wanglinchun
|
b45332bab0
|
课程默认活跃度排序
|
12 years ago |
|
yanxd
|
ecec98aac9
|
菜单栏调整
|
12 years ago |
|
yanxd
|
104e2f8542
|
内容不一致引起的路由错误
|
12 years ago |
|
wanglinchun
|
42a1a9e0b9
|
重复提交问题
|
12 years ago |
|
yanxd
|
45f8b15083
|
paginate
|
12 years ago |
|
yanxd
|
61380a5e1a
|
文件来源
|
12 years ago |
|
yanxd
|
2bb44456d6
|
search
|
12 years ago |
|
yanxd
|
d09e995f52
|
class
|
12 years ago |
|
yanxd
|
85e89f5c09
|
storeshelper attachFromUrl
|
12 years ago |
|
yanxd
|
f91d94fd4c
|
fetch stores/index instance_object
|
12 years ago |
|
yanxd
|
4b8a4c82c9
|
学号在作业里显示问题，首页时间显示不确定问题，项目缺陷滑动效果乱跳问题。
|
12 years ago |
|
wanglinchun
|
4167e8bb8f
|
修改了门户网站中用户动态的[进入附件列表]显示颜色
|
12 years ago |
|
yanxd
|
123817df93
|
tools 顺序
首页讨论区去掉项目讨论区
所有留言删除功能
标题显示错误
|
12 years ago |
|
yanxd
|
2070e9dc7f
|
remove memo/messages info from welcome.index
|
12 years ago |
|
yanxd
|
997c546083
|
remove html char
|
12 years ago |
|
yanxd
|
c3cbf87b3d
|
首页排序大概搞定
|
12 years ago |
|
yanxd
|
fea1cdff53
|
首页时间排序，可能会引起其他调用event_datetime的问题。待观察
|
12 years ago |
|
yanxd
|
e12922544a
|
链接bug，去掉动态里的文档内容
|
12 years ago |
 nieguanghui
|
8a0dc59f3e
|
welcome index helper.
|
12 years ago |
|
yanxd
|
2c5cd7a12a
|
'merge'
|
12 years ago |
|
yanxd
|
f05d2131bd
|
组织留言数据方法
|
12 years ago |
|
nieguanghui
|
fbf73de68b
|
1234
|
12 years ago |
|
yanxd
|
3f82203735
|
it can be summited project with same name.
|
12 years ago |
|
nieguanghui
|
2db1067158
|
1、 网站中的搜索几乎都没有搜索后的提示语，这里应该加提示语，提示重新搜索。
2、 竞赛—关注 参与项目 用户反馈 这行应该去掉。
4. 去掉竞赛参与项目页面中”参与了竞赛”的 a 标签。
5．竞赛侧边栏显示方式的统一。
6. 解决竞赛侧边栏关注部分不显示头像的bug.修复侧边栏参与者部分没有参与者也不会显示提示的bug。
7. 增加竞赛中关注一栏的”more”链接。
7. 重构竞赛layouts代码。
|
12 years ago |
|
nieguanghui
|
ca9da99f7e
|
1、 实践课程->课程动态 列表 动态显示（有了最新动态后）应该为：如果是项目则显示新闻，课程则显示通知【光辉 周三】
2、 系统中需要加空格地方：留言时间后加空格；作业截止日期前加空格；项目-缺陷：指派给**加空格；项目动态-发布时间加空格，而且去掉a标签；项目-新闻（更新时间后缺空格）【光辉 周三】
3、 竞赛—左下角 参与项目后面的“更多“位置应该调整【光辉 周三】
4、 看别人的主页时没有标签【光辉 周三】
|
12 years ago |
|
yanxd
|
e1e2e6e986
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
4d2fd01cf9
|
进入附件列表
|
12 years ago |
|
nieguanghui
|
c6f657ed8c
|
重构排序代码
|
12 years ago |
|
yanxd
|
b0efdefa7d
|
学号显示问题
|
12 years ago |
|
yanxd
|
246ab25bf0
|
部分sql语句写成rails形式
|
12 years ago |
|
yanxd
|
5e9bb9a99f
|
删除提示框作业，作业提交的问题。附件提交之后还会存在。
|
12 years ago |
|
yanxd
|
fcc2dd7952
|
首页版本库，sth.
|
12 years ago |
|
yanxd
|
3484632ce8
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
b703c65033
|
关注取消关注位置漂移
个人主页学号的隐藏
|
12 years ago |
|
nieguanghui
|
f2d392de1d
|
调整主页界面显示
|
12 years ago |
|
yanxd
|
59b2c408e7
|
sa
|
12 years ago |
|
nieguanghui
|
0416902cde
|
修改个人动态显示内容
|
12 years ago |
|
nieguanghui
|
b9b089fb27
|
完善主页个人动态部分汉化问题
|
12 years ago |
|
yanxd
|
ca2f5c6705
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
cefddb635a
|
e
|
12 years ago |
|
nieguanghui
|
f23451e4bb
|
add something
|
12 years ago |
|
yanxd
|
dcb16cb789
|
fix bug"
|
12 years ago |
|
nieguanghui
|
c27528ffb7
|
1234
|
12 years ago |
|
yanxd
|
f7a6798b73
|
.
|
12 years ago |
|
yanxd
|
23785999f1
|
fix fetch time
|
12 years ago |
|
yanxd
|
4f6cd0800a
|
welcome helper fetch new memos
|
12 years ago |
|
nieguanghui
|
25baf61185
|
to do
|
12 years ago |
|
yanxd
|
4eeb7c3ea8
|
look at daily log.
|
12 years ago |
|
nieguanghui
|
02b5f2bafa
|
解决项目跑到课程里面的bug
|
12 years ago |
|
yanxd
|
d29154cc24
|
hot memo merged board/topic.
|
12 years ago |
|
nieguanghui
|
02bea99646
|
主页改进
|
12 years ago |
|
nieguanghui
|
69c113f386
|
修改主页显示
|
12 years ago |
|
yanxd
|
6cede3d2be
|
计算评论数量，修复按照时间查找bug,etc...
|
12 years ago |
|
nieguanghui
|
1ef5059708
|
主页
|
12 years ago |
|
yanxd
|
28978b88b2
|
首页用户动态加入讨论区内容，点击之后定位到帖子。
|
12 years ago |
|
yanxd
|
5914fb218c
|
add method to show download link
show download count in /project/:id/files
|
12 years ago |
|
nieguanghui
|
25fd898623
|
修改部分内容
|
12 years ago |
|
yanxd
|
0609c5c7ea
|
1.增加帖子回复时间查询语句
2.帖子回复的数量在数据库中有字段
3.新建帖子失败错误提示
4.下载里程碑top_menu删掉，
5.学生分页，分页方法封装
|
12 years ago |
|
yanxd
|
825b1e7fd7
|
点击tag之后的索引功能.
|
12 years ago |
|
nieguanghui
|
344e51105a
|
qq
|
12 years ago |
|
nieguanghui
|
39bf4ff188
|
解决鼠标bug
|
12 years ago |
|
nieguanghui
|
3700294890
|
门户网站页面微调
|
12 years ago |
|
nieguanghui
|
aa4596e170
|
增加图标显示
|
12 years ago |
|
yanxd
|
5d77f2031e
|
主页去除影响性能的代码
|
12 years ago |
|
nieguanghui
|
90b38cf5e8
|
s
|
12 years ago |
|
yanxd
|
49327905f8
|
refactor welcome help
|
12 years ago |
|
nieguanghui
|
6e704872be
|
1
|
12 years ago |
|
yanxd
|
579e78df9b
|
讨论区回复最多的主题帖
|
12 years ago |
|
yanxd
|
6a97cb69a8
|
welcome activity.
|
12 years ago |
|
nieguanghui
|
eb2bf5b879
|
增加方法
|
12 years ago |
|
nieguanghui
|
1f83ca612b
|
显示部分数据
|
12 years ago |
|
yanxd
|
cdbc26e8df
|
Merge branch 'forum' into develop
|
12 years ago |
|
yanxd
|
16c0bc3ac3
|
memo edit/destory.
|
12 years ago |
|
yanxd
|
48650a2a91
|
init forum. again.
|
12 years ago |
|
yanxd
|
ae1fe0027a
|
optimization project helper.
|
12 years ago |
|
fanqiang
|
16f70437d1
|
forum init.
|
12 years ago |
|
yanxd
|
5de8e1c2f2
|
new welcome index.
|
12 years ago |
|
yanxd
|
356a48caa8
|
move constant to module, fixed some translate.
|
12 years ago |
 huangjingquan
|
16611d8eff
|
修改了管理员权限
|
12 years ago |
|
yanxd
|
dd1f972edd
|
Revert "move courses mixed To projecthelper From applicantionHelper"
This reverts commit 42332201f2.
|
12 years ago |
|
yanxd
|
42332201f2
|
move courses mixed To projecthelper From applicantionHelper
|
12 years ago |
|
yanxd
|
c4bf9a8f72
|
refactor gender avatar html.erb => helper
|
12 years ago |
|
baiyu
|
e5baf0959b
|
1、竞赛里的参与者名字显示全称
2、个人主页里的“关注”与“粉丝”列表名字显示全称
3、区别了“关注”里个人参与的项目与课程
4、竞赛里的参与者的项目与课程数量的显示做出了区分
5、竞赛的参与者列表增加了学员学号
|
12 years ago |
|
baiyu
|
2f8ef03d32
|
1、增加了参与竞赛的用户列表
2、区分了个人主页里“粉丝”列表里的项目与课程的计数与显示
3、竞赛发布人的名字改为了全称
|
12 years ago |
|
baiyu
|
005e0802d4
|
增加了竞赛的“加入”
|
12 years ago |
|
xianbo
|
02ff8b8955
|
take off course fomre form the projrct ehich is watched
|
12 years ago |
|
yanxd
|
3b52936d17
|
roadmap -> milestone
|
12 years ago |
|
nieguanghui
|
adf8a7bc92
|
修改课程活跃度排序方式，解决课程列表文件链接错误
|
12 years ago |
|
yanxd
|
56cbca3ce8
|
fix little words
|
12 years ago |
|
xianbo
|
1cfba644f5
|
fix show of someone who watch and fxi the show of homework exdit
|
12 years ago |
|
huangjingquan
|
534c252bcb
|
修改了课程列表样式，部分国际化
|
12 years ago |
|
xianbo
|
3253f1cf28
|
modify show of some style
|
12 years ago |
|
xianbo
|
5032eaabcb
|
fix the show out of the frame and the location of show
|
12 years ago |
|
xianbo
|
607eb2c2ff
|
modify shoew of project
|
12 years ago |
|
yanxd
|
239a1484ae
|
remove useless code block
|
12 years ago |
|
nieguanghui
|
8df3bcf76f
|
修改评分显示颜色，重构课程列表显示部分代码
|
12 years ago |
|
nieguanghui
|
2b10258ae1
|
修改课程列表显示样式
|
12 years ago |
|
yanxd
|
2a6171ca52
|
refactor course helper
|
12 years ago |
|
yanxd
|
ce7b2ceba0
|
fix teacher/student search Identifier
|
12 years ago |
|
huangjingquan
|
c93ca4d2ed
|
添加了作业截止时间提醒功能！
|
12 years ago |
|
xianbo
|
003b4704cc
|
fix link to
|
12 years ago |
|
huangjingquan
|
ac2b90ecfd
|
退出课程加入权限
|
12 years ago |
|
xianbo
|
c7b38e5bf2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/news/index.html.erb
|
12 years ago |
|
xianbo
|
ca0f63a817
|
del the link of .head portrait
|
12 years ago |
|
yanxd
|
b55c5d20a3
|
added activity info from event, warning.
|
12 years ago |
|
yanxd
|
369e5eccc0
|
member_list ,group by roles in course#show
|
12 years ago |
|
yanxd
|
2286fbeff5
|
members split (teacher,student) in course
|
12 years ago |
|
yanxd
|
b617f3d42f
|
fix my welcome#index bug
|
12 years ago |
|
yanxd
|
dd0c087209
|
rest tan backurl
|
12 years ago |
|
xianbo
|
1f419c936d
|
del the back_url to let the different identity change has a correct url
|
12 years ago |
|
xianbo
|
e9856b3524
|
modify the style of the projects witch show
|
12 years ago |
|
yanxd
|
4bef2eee24
|
course can be shared files by project's member
|
12 years ago |
|
nieguanghui
|
b04fe3d1bb
|
增加项目评分 个人评分 ，个人在项目中的评分机制
|
12 years ago |
|
yanxd
|
5d0b5812b3
|
share completed with fq, xianbo
|
12 years ago |
|
yanxd
|
dde65a5895
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
baiyu
|
0206d3f2c3
|
需求里面添加了用户和项目与需求的联系
|
12 years ago |
|
yanxd
|
e2447b4c88
|
truncate textilizable
|
12 years ago |
|
yanxd
|
332bc0765d
|
240 characters or less limited in activity info. ===> projects#show
|
12 years ago |
|
yanxd
|
ec63fc41bb
|
add link in project/course list page, joinBUtton renamed.
|
12 years ago |
|
yanxd
|
e1d8c8a992
|
remove nyan css & move another file
|
12 years ago |
|
baiyu
|
8335c111c7
|
1、修改了“加入课程”位置
2、修改了我的账号里的格式
|
12 years ago |
|
yanxd
|
20883b92a5
|
add button css, fix js bug, add create project to push homework.
|
12 years ago |
|
xianbo
|
956aa3d0c1
|
remove forum block in course setting
|
12 years ago |
 huangjingquan
|
e25425d9a7
|
用户看别人课程主页时显示问题
|
12 years ago |
 wanglinchun
|
48a0f2f409
|
个人主页，课程相关国际化
|
12 years ago |
|
huangjingquan
|
bf081b95bd
|
学生自己的主页课程里面添加加入课程链接
竞赛里面 修复列表排序bug
新建竞赛的时候 修复了几个bug
|
12 years ago |
|
baiyu
|
39c45dff30
|
1、修改了注册里的问题
2、作业名称改为靠左
3、修改了提交作业、参加竞赛等混乱
4、修改了top bar的字体大小
|
12 years ago |
|
huangjingquan
|
9e77d3e001
|
修改了作业课程里面一些Bug
|
12 years ago |
|
baiyu
|
aefd9b545b
|
1、删除了“企业”里的“课程”
2、减小了顶和踩的图标
3、更改了课程图标
|
12 years ago |
|
huangjingquan
|
cab5fb8b52
|
新的
|
12 years ago |
|
baiyu
|
56e5e55589
|
修改了fork里的格式及若干国际化
修改了给项目留言回复的权限
隐藏了作业列表的“发布作业”
|
12 years ago |
|
huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
12 years ago |
|
fanqiang
|
9fbccfbb6d
|
改了一些问题
创建课程问题
添加了需求的FORK功能
|
12 years ago |
 william
|
da82a630e9
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into tmp1
Conflicts:
app/controllers/bids_controller.rb
app/helpers/bids_helper.rb
config/locales/zh.yml
db/schema.rb
|
12 years ago |
|
william
|
2079c87362
|
增加tag删除。
|
12 years ago |
|
fanqiang
|
781fa32dbb
|
添加了需求的fork功能
|
12 years ago |
|
william
|
61e4021625
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/controllers/bids_controller.rb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
config/locales/zh.yml
config/routes.rb
lib/redmine.rb
|
12 years ago |
|
william
|
7d919fd3c3
|
Merge branch 'liuping' into develop
Conflicts:
app/helpers/bids_helper.rb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
config/locales/zh.yml
db/schema.rb
|
12 years ago |
|
william
|
09fb972c96
|
分支合并
|
12 years ago |
|
xianbo
|
8ff8d0f4d4
|
modify some little bug && merge handle
|
12 years ago |
|
xianbo
|
806fae7b19
|
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
Conflicts:
app/controllers/account_controller.rb
app/controllers/my_controller.rb
app/controllers/projects_controller.rb
app/controllers/users_controller.rb
app/helpers/projects_helper.rb
app/helpers/users_helper.rb
app/models/project.rb
app/models/user.rb
app/models/user_extensions.rb
app/views/account/register.html.erb
app/views/bids/_bid_show.html.erb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
app/views/files/index.html.erb
app/views/layouts/base_bids.html.erb
app/views/layouts/base_users.html.erb
app/views/my/account.html.erb
app/views/users/watch_bids.html.erb
config/locales/en.yml
config/locales/zh.yml
config/routes.rb
db/schema.rb
lib/redmine.rb
public/stylesheets/application.css
|
12 years ago |
|
william
|
dcbaf1c02b
|
增加需求结束方法。
|
12 years ago |
baiyu
|
4fb040bc61
|
modify register bug
|
12 years ago |
|
huangjingquan
|
3536883248
|
课程合并
|
12 years ago |
 baiyu
|
c2302dc0c7
|
增加了附件删除功能
修改用户主页中课程与项目之间的关系
用户课程页面中的作业进行了按课程分组
|
12 years ago |
|
huangjingquan
|
466922d13b
|
修改了上次会议提出的几点
|
12 years ago |
|
huangjingquan
|
e4cbc7533e
|
tabs显示
|
12 years ago |
|
fanqiang
|
805ad6600b
|
添加了提交作业
|
12 years ago |
|
huangjingquan
|
767231c202
|
fg
|
12 years ago |
|
fanqiang
|
602e3dc3fa
|
修改个人主页
|
12 years ago |
|
huangjingquan
|
261c3fc337
|
new version
|
12 years ago |
|
xianbo
|
1e7d127998
|
new course table
|
12 years ago |
|
nieguanghui
|
7490806bf3
|
默认排序方式更改
|
12 years ago |
|
huangjingquan
|
55499db0ab
|
修改了英文版新闻评论被挤换行问题
英文版项目setting显示超出
|
12 years ago |
|
huangjingquan
|
77a47797d2
|
user列表
|
12 years ago |
|
huangjingquan
|
c4df893eab
|
修改了tabs页面，字体大小
|
12 years ago |
 zhangyang
|
4d82cad51d
|
move 2013.8.29
|
12 years ago |
Administrator
|
ee551d220d
|
问题中留言按钮改为文字
|
12 years ago |
|
nieguanghui
|
03415891f5
|
增加需求描述
|
12 years ago |
 kaizheng
|
0d447cae2c
|
活动显示分类国际化，需求反馈图标引用、删除国际化，留言图标引用、删除国际化
|
12 years ago |
|
william
|
0c22d409fc
|
添加写project_status和user_status两表的方法，
在关注中写这2个表，
重构了tag的过滤方法，
拿掉了user_extension.rb.
|
12 years ago |
|
fanqiang
|
c7beefa556
|
修改用户活动页面，添加了过滤功能。修改留言中引用和删除功能的显示问题
|
12 years ago |
|
zhangyang
|
4f2b26a9c5
|
修正问题bug
|
12 years ago |
|
nieguanghui
|
a126083579
|
用户主页头像显示改进
|
12 years ago |
|
william
|
6521ab2ce9
|
更换顶踩图标，添加对需求的tag搜索，重新美化了tag的搜索页面
|
12 years ago |
|
nieguanghui
|
647781effa
|
增加粉丝和关注处更多的链接
|
12 years ago |
|
nieguanghui
|
f91cfcdec2
|
再提交一次
|
12 years ago |
|
nieguanghui
|
1dd86b9116
|
修正了UTF-8问题；修正了上传头像显示问题
|
12 years ago |
|
william
|
0ef943d5f3
|
修复因为ISSUE引起的bug；
|
12 years ago |
|
william
|
6f54e1680d
|
修复了tag查询的问题；tag样式的显示
|
12 years ago |
|
fanqiang
|
75aca1bad4
|
123
|
12 years ago |
|
kaizheng
|
8309be475a
|
微小修改国际化
|
12 years ago |
|
fanqiang
|
0c89ef0360
|
修改注册BUG
|
12 years ago |
|
william
|
11df7d2787
|
修改了tag的显示
|
12 years ago |
|
Administrator
|
57991b727a
|
修改了版本库
|
12 years ago |
|
fanqiang
|
69e3dcee6c
|
修改用户活动，用户主页的其他部分添加分页
|
12 years ago |
|
william
|
be35324bbc
|
拿掉了对人、问题、需求、项目的赞功能，去掉了一些使用这些功能的代码。
|
12 years ago |
|
william
|
cf9aa12727
|
1.重新定义了顶和踩得规则：
对于为评价的问题，同时显示顶和踩的数字，并且数字的“+”“-”标成黑色；
对于评价的问题，如果评价是顶，则只显示所有顶的次数；反之，亦然；
2.在问题列表中也添加了顶和踩的功能；
3.对于问题列表的描述，在描述内容前添加了“描述：”，
所以为空的情况下，该处显示占位依然存在，使列表显示格式统一
|
12 years ago |
|
william
|
7a0db3b3f1
|
给需求的留言添加了“确认删除”弹窗，重构了赞和踩模块，针对问题添加了赞和踩功能。粉丝数的链接问题未修改玩。
|
12 years ago |
|
Administrator
|
c2a3b7b5a7
|
添加了新建版本库
|
12 years ago |
|
william
|
1cf8b8bbd1
|
修复了关注后不刷新页面中粉丝数的功能。
|
12 years ago |
|
william
|
80e74e4dd7
|
修改了一些赞的bug，添加了显示所有tag的功能。
|
12 years ago |
|
huangjingquan
|
0a2b91fa17
|
增加了粉丝和关注 单个页面，增加了默认用户图像，默认项目图像
|
12 years ago |
|
william
|
0b5ea87f11
|
加入了对赞功能模块，同时预留了踩功能，但暂时不使用。
|
12 years ago |
|
wanglinchun
|
be4dc216a9
|
修正新建项目页面默认LOGO显示问题
|
12 years ago |
|
nieguanghui
|
05023c8451
|
增加关注和粉丝头像处鼠标悬浮显示用户名字，问题列表样式调整
|
12 years ago |
|
fanqiang
|
4835cab6e4
|
添加了用户查找反馈的功能，可以查看对用户评论的引用和对用户需求的评论。解决了留言问题
|
12 years ago |
|
huangjingquan
|
f8a8ae6fac
|
增加了关注功能
|
12 years ago |
|
huangjingquan
|
d4494b3803
|
修改了任务分工上几条
|
12 years ago |
|
zhangyang
|
4eb9a0950e
|
top-menu背景颜色；项目配置tab样式；content上方横线；用户列表分页框样式
|
12 years ago |
|
nieguanghui
|
cafdfa67af
|
修改图片
|
12 years ago |
|
fanqiang
|
7949e1166c
|
添加备注
|
12 years ago |
|
nieguanghui
|
a29a84d8a3
|
显示图片的数据的封装
|
12 years ago |
|
nieguanghui
|
c24320fda5
|
列表样式改进，时间显示样式调整，颜色调整
|
12 years ago |
|
fanqiang
|
a97935a8ac
|
添加了用户主页中的关注需求界面，url为users/:id/watch_bids
|
12 years ago |
|
kaizheng
|
e635237acd
|
添加app\controllers\shares_controller.rb及相关文件用来作为api演示的小例子，Client.html放在根目录下作为演示客户端
|
12 years ago |
|
huangjingquan
|
70b211e355
|
first commit
|
12 years ago |
