 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>
|
11 years ago |
 z9hang
|
c9f6259587
|
空数据库时部分数据没有，添加非空判断
|
11 years ago |
|
z9hang
|
74ba4384b1
|
1、去除不用了的旧的积分代码。2、将刷新提交次数功能修改（原来是在显示项目或个人信息的页面之前调用repository.fetch_changesets刷新changeset，修改为创建changeset对象后马上调用repository.fetch_changesets方法刷新changeset对象，注意：尚需测试）
|
11 years ago |
|
z9hang
|
746022506d
|
用户列表排序问题、项目得分不一致问题
|
11 years ago |
|
z9hang
|
683cd9f918
|
个人积分修改
|
11 years ago |
|
z9hang
|
2ad51d7afe
|
修改引用的留言为不能修改
|
11 years ago |
|
z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
11 years ago |
|
z9hang
|
5800cf5fff
|
修正登陆错误
|
11 years ago |
|
z9hang
|
c60188038e
|
得分机制修改
|
11 years ago |
 yanxd
|
bf9a992399
|
活跃度排序不一致
|
11 years ago |
|
yanxd
|
ee95d9b115
|
user_activity page
|
11 years ago |
|
yanxd
|
cccbd941ce
|
用户删除，管理界面用户去排序，删除后跳转，去无效参数
|
11 years ago |
|
z9hang
|
dee09aad75
|
修复导航bug
|
11 years ago |
|
z9hang
|
513fd32ec5
|
修复查看个人动态无权限bug
|
11 years ago |
|
yanxd
|
fb138d1593
|
remove user_activities path, 3path bug.
|
11 years ago |
|
yanxd
|
472b61fefe
|
删除了不能通过的测试，修改user_activities。所有原路由测试可以通过。
|
11 years ago |
|
z9hang
|
4bd083b059
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/show.html.erb
|
11 years ago |
|
z9hang
|
bd43ef5d61
|
网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
|
11 years ago |
|
yanxd
|
df848ca756
|
print tag exception, course name valid test.
|
11 years ago |
 nwb
|
615b3ac2ac
|
课程界面调整
|
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
|
297fe9a3f4
|
添加gitlab远程登录接口
|
11 years ago |
 sw
|
8f8fb79a63
|
1.软件创客搜索功能修改表单提交为在js中提交
2.增加判断搜索条件是不是为空
|
11 years ago |
|
yanxd
|
e573438e43
|
eager_load
|
11 years ago |
|
yanxd
|
249ea19c0c
|
神坑，users和user_statuses表中，关注信息不同步，按照影响力排序还会有问题。以及users表中在us表没有对应条目，排序中是不会显示的
|
11 years ago |
|
z9hang
|
f5b69be967
|
新建贴吧描述为空不能新建、搜索空内容添加提示
|
11 years ago |
|
z9hang
|
6f5d6c382b
|
给用户留言的回复若为查看计入新留言数
|
11 years ago |
|
z9hang
|
74603e1256
|
解决直接访问ajax链接地址报错问题
|
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 |
|
z9hang
|
f9612ca63f
|
实时刷新（ajax轮询）
|
11 years ago |
|
z9hang
|
9061a77221
|
修改user.user_score为空问题的解决方式
|
11 years ago |
|
z9hang
|
1cb1eeeb1d
|
个人主页：姓名、工作单位
课程主页：课程名称、教师单位
项目主页：项目名称
竞赛主页：竞赛名称
主页：课程列=>单位名称
修复部分个人主页报错问题
|
11 years ago |
|
z9hang
|
697a6034b2
|
新得分显示
|
11 years ago |
|
nwb
|
c8900c279c
|
课程标签增加、删除
|
11 years ago |
|
nwb
|
2f3d9b1795
|
1.修改资源文件类index方法
2.添加课程资源文件index视图
|
11 years ago |
|
nwb
|
0d99644fa7
|
1.用户课程表逻辑修改
2.添加link_to_course相关逻辑
|
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 |
|
yanxd
|
5d8edb218f
|
管理员查看user_projects 课程项目混淆的问题
|
11 years ago |
|
z9hang
|
ddf5590c54
|
修复个人主页查看关注的项目时报user_id指代不明的sql错误
|
11 years ago |
|
z9hang
|
ab85ee5169
|
admin个人主页项目功能修正
admin管理用户的搜索功能从/users/search中分离到/admin/search
admin管理用户界面添加管理界面布局
|
11 years ago |
|
z9hang
|
ee3a5f5719
|
代码修改
|
11 years ago |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
11 years ago |
|
yanxd
|
c5a3a5bac3
|
user_courses.html
|
11 years ago |
|
nwb
|
4d21933e09
|
1.优化资源文件上传下载界面
2.教师的课程界面优化
|
11 years ago |
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
|
nwb
|
b733f5c2b9
|
修正后台注册用户问题
|
11 years ago |
yanxd
|
e6e001246f
|
# 必填自己的工作单位，其实就是学校
|
11 years ago |
|
yanxd
|
4d8701220b
|
-。-
acoount.html对齐了一下
学校列表school/index.html默认显示全部学校
没有填写工作单位的用户强行跳转到修改资料页面
|
11 years ago |
 fanqiang
|
e89d74e2a9
|
开源项目中新增tag，搜索查找待新增tag的obj
|
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
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
11 years ago |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
11 years ago |
Wen
|
a4557d4d19
|
已结束课程显示正常
|
11 years ago |
|
yanxd
|
21e55492fa
|
小改怡情 大改伤身 强改灰飞烟灭
|
11 years ago |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
11 years ago |
|
yanxd
|
cf2689917b
|
三天两头反复改 不如自挂东南枝
|
11 years ago |
|
yanxd
|
02a03f7c54
|
导航栏防止意外http参数不全的错误
|
11 years ago |
|
yanxd
|
fd426936bb
|
修复时间格式错误引发的列表错误
|
11 years ago |
|
yanxd
|
91353d2e5a
|
fix
|
11 years ago |
|
yanxd
|
0ed2e19268
|
项目列表
|
11 years ago |
 baiyu
|
13fdbde1cf
|
个人分数
|
12 years ago |
|
baiyu
|
db1874fa07
|
评分
|
12 years ago |
|
yanxd
|
64d85a9ab2
|
一部分ajax留言实现
|
12 years ago |
|
yanxd
|
6b3c3516cd
|
去除给留言的回复显示在留言中
|
12 years ago |
|
yanxd
|
845937592f
|
4、个人主页的的 动态中要包括留言的信息
|
12 years ago |
|
yanxd
|
4f9686fc57
|
活动不显示留言。
|
12 years ago |
|
fanqiang
|
4f00b12016
|
添加了论坛加tag功能
|
12 years ago |
|
yanxd
|
349020182a
|
.
|
12 years ago |
|
xianbo
|
5366b50c56
|
modify admin show
BY nieguanfei && huangjinquan
|
12 years ago |
|
xianbo
|
02ff8b8955
|
take off course fomre form the projrct ehich is watched
|
12 years ago |
 nieguanghui
|
6352ae7aa6
|
fix bug
|
12 years ago |
|
xianbo
|
607eb2c2ff
|
modify shoew of project
|
12 years ago |
|
nieguanghui
|
583c022048
|
修复作业列表搜索bug
|
12 years ago |
|
nieguanghui
|
75c0480071
|
增加个人活动列表，作业过滤功能，删除课程作业搜索框，修复课程页面以学生角色搜索也会出现新建课程的bug
|
12 years ago |
 huangjingquan
|
477e299e24
|
修改了用户主页课程列表显示
去掉了作业和关注需求，将关注需求统计显示
|
12 years ago |
|
xianbo
|
1f09bfbab1
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
xianbo
|
e9856b3524
|
modify the style of the projects witch show
|
12 years ago |
|
nieguanghui
|
1f8c10e48a
|
修复bug
|
12 years ago |
|
xianbo
|
2fa6276829
|
fix natural
|
12 years ago |
|
xianbo
|
21ffbe637e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/projects/_project.html.erb
app/views/projects/member.html.erb
app/views/users/index.html.erb
config/locales/zh.yml
db/schema.rb
files/2013/10/131007102834__my_course.html.erb
|
12 years ago |
|
xianbo
|
2589d429b0
|
add the project what one watch
|
12 years ago |
|
nieguanghui
|
b04fe3d1bb
|
增加项目评分 个人评分 ，个人在项目中的评分机制
|
12 years ago |
|
yanxd
|
ab5d8853b5
|
fixed issue#314
|
12 years ago |
|
yanxd
|
69869a05c9
|
reverse projects list, add explain to role.
|
12 years ago |
 huangjingquan
|
bcb66f2b32
|
在个人主页项目里面添加新建按钮
|
12 years ago |
|
huangjingquan
|
673850bd03
|
fix
|
12 years ago |
|
huangjingquan
|
19ebd48a95
|
修改了作业列表无法显示
|
12 years ago |
|
huangjingquan
|
00cef03049
|
修改了个人主页里关注需求全部需求改成只关注的需求
|
12 years ago |
|
huangjingquan
|
c49209cbfb
|
将课程和作业分开
作业单独一个tabs
|
12 years ago |
|
baiyu
|
13a2cfe644
|
修改了fork页面，增加了教师超链接
|
12 years ago |
|
huangjingquan
|
e25425d9a7
|
用户看别人课程主页时显示问题
|
12 years ago |
|
huangjingquan
|
a0c6a183fe
|
修改了个人主页的关注需求里面只显示需求不显示作业
|
12 years ago |
|
huangjingquan
|
cab5fb8b52
|
新的
|
12 years ago |
|
baiyu
|
56e5e55589
|
修改了fork里的格式及若干国际化
修改了给项目留言回复的权限
隐藏了作业列表的“发布作业”
|
12 years ago |
|
huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
12 years ago |
|
huangjingquan
|
5dbef9e2c5
|
修改了日历和版本库bug
|
12 years ago |
