 sw
|
33e9a3e326
|
#1958 关注有用户0个后边取消冒号
|
11 years ago |
|
sw
|
5ef1bc1d02
|
修改本地登录后报错
修改zh.yml文件异常
|
11 years ago |
whimlex
|
22aae1910b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/_search_project.html.erb
config/locales/en.yml
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
11 years ago |
|
sw
|
93410e0d57
|
#1919 取消作业留言的动态显示
|
11 years ago |
|
whimlex
|
3279928bef
|
邮件样式调整，国际化；用户资料页面调整
|
11 years ago |
 alan
|
23140307aa
|
实现<去存储过程功能，并修改打分的表更新>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
933a84f51d
|
项目、课程主页用户搜索后结果界面也支持按姓名、昵称、邮箱搜索
|
11 years ago |
|
alan
|
d81240e63c
|
修改《关注老师后，老师发布的作业都会在我主页的动态中显示出来，若我未加入该课程但感兴趣点击后返回403页面，提示不够人性化》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
b6327460a8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
5ad2d22f98
|
#1724 修复部分用户在课程列表中有2个退出课程的按钮
|
11 years ago |
|
alan
|
7c1b86556d
|
增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
1084cda730
|
#1665 “软件创客”链接入口，点击报404
|
11 years ago |
|
sw
|
fef005d2d3
|
修改搜索用户报错
|
11 years ago |
|
sw
|
861dbc854e
|
修复个人动态主页课程连接错误
|
11 years ago |
moon
|
f21767cb16
|
增加其他角色新建课程权限
|
11 years ago |
|
alan
|
e86ef8e6f0
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
baacf328b7
|
增加《注册跳转邮箱页面》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 z9hang
|
e6aa9d3592
|
修复用户、课程、项目、竞赛、留言模块样式，去除回复时的回复某某字样，及字数控制
|
11 years ago |
|
sw
|
460ba55dde
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
11 years ago |
|
alan
|
0aae731eef
|
修改bug<点击排序后内容类型自动变为全部，但又并未显示全部资源>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
b141db6624
|
用户留言修复
|
11 years ago |
|
alan
|
1d76d559dd
|
添加功能<用户搜索的问题>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
96626eeb6b
|
恢复respond_path路由并修改部分respond_path
恢复homework_list.html.erb文件
|
11 years ago |
|
z9hang
|
65a89bb9a5
|
#1412个人主页--课程--当该用户加入多个课程时，建议“关闭课程”字样对齐
|
11 years ago |
|
alan
|
6e77c5a0b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/my_controller.rb
app/views/contestnotifications/index.html.erb
app/views/courses/_join_private_course.html.erb
app/views/wiki/edit.html.erb
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
91d08d5b9a
|
#1233修复个人主页--动态：点击项目链接报500错误的BUG
优化页面代码
|
11 years ago |
|
sw
|
bf49f46b22
|
修复加入课程报错的BUG
|
11 years ago |
|
sw
|
4ceb0e8789
|
#1289修复输入标签内容并点击“增加”后，标签的内容还在文本框中的BUG
解决方案：新增标签后增加js代码设置输入框内值为空
|
11 years ago |
|
z9hang
|
258967263e
|
1、代码优化。2、很多页面标题不正确问题
|
11 years ago |
|
sw
|
8530abf769
|
1.格式化代码
2.修复进入其他人个人动态页面显示的名字仍是"我"的BUG #1251
解决方案：增加访问用户ID和当前登录Id是不是一致的判断
|
11 years ago |
|
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 |
|
sw
|
b5edc0a686
|
#1233 修复进入其他人动态首页时，项目连接报500错误
解决方案：和进入自己的动态首页同一方法处理
|
11 years ago |
|
z9hang
|
36329200b7
|
直接访问积分链接报错问题，原因：1项目积分有个方法修改了名字此处未改。2个人积分链有个变量未赋值
|
11 years ago |
|
z9hang
|
f13eb73a72
|
label写错纠正，一个写死的主页链接纠正
|
11 years ago |
|
sw
|
dcde828e64
|
1.个人主页--关注、粉丝，即使关注者、粉丝没有参加项目、课程，显示为“参与了0个项目/课程” #1211
2 修复个人主页关注、粉丝参与课程列表不正确的BUG
|
11 years ago |
|
sw
|
fbb19480f5
|
修复火狐不兼容自动换行的问题
|
11 years ago |
|
sw
|
c7caa08c70
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
f0db3e1b4a
|
添加负积分修正为0的说明
|
11 years ago |
|
sw
|
97f8aedd13
|
修复用户动态首页描述不正确的问题
|
11 years ago |
|
z9hang
|
74ba4384b1
|
1、去除不用了的旧的积分代码。2、将刷新提交次数功能修改（原来是在显示项目或个人信息的页面之前调用repository.fetch_changesets刷新changeset，修改为创建changeset对象后马上调用repository.fetch_changesets方法刷新changeset对象，注意：尚需测试）
|
11 years ago |
 chenmin
|
87f8e90f25
|
1、多余标签删除
|
11 years ago |
|
chenmin
|
9f54df232b
|
修复个人主页点击粉丝或者关注时，如果粉丝参加的课程和项目为0的bug；
|
11 years ago |
|
sw
|
123353fd8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
linhk
|
0635932187
|
用户个人主页项目链接错误修改
|
11 years ago |
|
sw
|
337ca5fb93
|
修复用户留言取消按钮描述不正确的问题
|
11 years ago |
luguo
|
cc08cdc140
|
解决我的课程下面的课程描述带格式显示不正常。
|
11 years ago |
|
sw
|
22bbf45269
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
440395f26f
|
#1290 修改admin配置管理--用户列表--项目列表界面以及相关功能问题
|
11 years ago |
|
z9hang
|
14026d0e0b
|
个人得分细节显示
|
11 years ago |
|
z9hang
|
caed78327a
|
积分计算修改
|
11 years ago |
|
z9hang
|
683cd9f918
|
个人积分修改
|
11 years ago |
|
sw
|
37e5bdee22
|
修复某些课程动态内容为空的BUG #1128
|
11 years ago |
|
sw
|
69f7f97bf8
|
修复个人动态主页缺陷描述超出页面的BUG
|
11 years ago |
|
z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
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
|
cc215e6c7b
|
修复个人动态图片显示不准确的问题
|
11 years ago |
 nwb
|
00cf448bda
|
用户动态兼容空留言
|
11 years ago |
|
sw
|
dd589c4811
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
a7debdae98
|
格式化代码
|
11 years ago |
|
z9hang
|
dee09aad75
|
修复导航bug
|
11 years ago |
 yanxd
|
fb138d1593
|
remove user_activities path, 3path bug.
|
11 years ago |
|
z9hang
|
40d8ec6c6e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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 |
|
sw
|
9f02003bb9
|
用户课程列表增加自动换行
|
11 years ago |
|
sw
|
41983833d7
|
用户项目列表增加自动换行
|
11 years ago |
|
z9hang
|
bd43ef5d61
|
网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
|
11 years ago |
|
sw
|
e0f5708038
|
修改错误
|
11 years ago |
|
sw
|
999a252f7b
|
修改软件创客搜索结果显示样式
|
11 years ago |
|
sw
|
4a04d47c3c
|
commit
|
11 years ago |
|
sw
|
bcaaa02bed
|
取消已完成课程在软件创客列表的显示
|
11 years ago |
|
z9hang
|
036f8a3870
|
user.trustie.net域名下的用户列表课程项目链接跳转域名不正确
|
11 years ago |
|
sw
|
8f8fb79a63
|
1.软件创客搜索功能修改表单提交为在js中提交
2.增加判断搜索条件是不是为空
|
11 years ago |
|
sw
|
7a9b5156c9
|
修复软件创客列表当用户姓名比较长时，用户姓名会被个人得分覆盖掉的BUG
|
11 years ago |
|
sw
|
59a5541e45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
4f2298fd22
|
修复个人动态首页中留言等动态显示有误的问题
|
11 years ago |
|
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
11 years ago |
|
sw
|
7bcb1cbe2e
|
修复个人主页中作业、项目介绍不正确的BUG
|
11 years ago |
|
sw
|
bc9f1e5a01
|
1.修改软件创客中每个用户内容显示不一致的BUG
2.去掉用户项目列表最后一个项目后的逗号
|
11 years ago |
|
sw
|
a1920ca54c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
1e6693cdcf
|
1.取消软件创客界面2个个人得分显示
2.修复软件创客界面用户参与课程显示不正确的BUG
3.添加获取用户参与的未过期的项目列表
|
11 years ago |
|
yanxd
|
d54f37e630
|
个人动态，判断留言人逻辑有误
|
11 years ago |
|
sw
|
108866b8ba
|
1
|
11 years ago |
|
nwb
|
e94ed86ead
|
部分BUG修正
|
11 years ago |
|
z9hang
|
9a8c5ebecc
|
个人得分规则显示
留言回复未加分bug修改
|
11 years ago |
|
nwb
|
3565b9da88
|
修正用户课程界面关闭、重启课程，数据刷新不及时的问题
|
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
|
02e221eedb
|
修改：网站中的旧分数显示为新分数
|
11 years ago |
|
z9hang
|
f9612ca63f
|
实时刷新（ajax轮询）
|
11 years ago |
|
nwb
|
8cdab80d31
|
用户课程界面链接BUG修改
|
11 years ago |
|
z9hang
|
9061a77221
|
修改user.user_score为空问题的解决方式
|
11 years ago |
|
yanxd
|
b76f1c2b12
|
管理员用户粉丝列表出错。
|
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 |
|
z9hang
|
9e53ad67d0
|
去除个人分数显示的链接
|
11 years ago |
|
z9hang
|
697a6034b2
|
新得分显示
|
11 years ago |
|
nwb
|
a793b8923d
|
1.Non member角色添加add_couese权限
2.course_helper优化排序等相关函数
3.课程index界面修改
|
11 years ago |
|
z9hang
|
cae0893ea6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
ee030e6fb5
|
讨论区发帖协同得分+2
|
11 years ago |
|
yanxd
|
ff6373badc
|
看用户列表出错
|
11 years ago |
|
yanxd
|
8b176c0027
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
db61ecc255
|
合并user_score属性
|
11 years ago |
|
z9hang
|
cf5c7a6610
|
修复学生从个人主页课程标签页未参加课程状态下点击加入课程进入课程列表搜索课程失败bug
|
11 years ago |
|
nwb
|
59742b9ddb
|
1.给各角色添加项目相关的权限
2.添加课程权限解析系统
|
11 years ago |
|
nwb
|
6a9037dde5
|
修改关闭课程逻辑
|
11 years ago |
|
nwb
|
10397eec3e
|
更改课程图标显示逻辑，添加课程图标文件夹
|
11 years ago |
|
nwb
|
a49cf3eb6b
|
1.修改课程作业路由
2.课程control添加作业显示方法
|
11 years ago |
|
nwb
|
0d99644fa7
|
1.用户课程表逻辑修改
2.添加link_to_course相关逻辑
|
11 years ago |
|
nwb
|
fb36a0d5ba
|
1.课程control添加create方法
2.课程model添加部分新列及相关逻辑
|
11 years ago |
|
z9hang
|
3690bf79f4
|
修复个人动态中留言人链接错误
|
11 years ago |
|
yanxd
|
006e4ae45e
|
user tab bar
|
12 years ago |
|
z9hang
|
ddf5590c54
|
修复个人主页查看关注的项目时报user_id指代不明的sql错误
|
12 years ago |
|
z9hang
|
ab85ee5169
|
admin个人主页项目功能修正
admin管理用户的搜索功能从/users/search中分离到/admin/search
admin管理用户界面添加管理界面布局
|
12 years ago |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
12 years ago |
|
yanxd
|
62f9ed052b
|
issues#655
|
12 years ago |
|
yanxd
|
3e8decf1d1
|
student user_course
|
12 years ago |
|
yanxd
|
c5a3a5bac3
|
user_courses.html
|
12 years ago |
|
yanxd
|
dac992548a
|
course_form
|
12 years ago |
|
nwb
|
4156983494
|
缺陷添加缩略图显示
|
12 years ago |
|
nwb
|
097489e594
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
4d21933e09
|
1.优化资源文件上传下载界面
2.教师的课程界面优化
|
12 years ago |
|
z9hang
|
2b12d31fb8
|
去除网站中的邮箱地址显示
|
12 years ago |
|
nwb
|
be73a232e8
|
修改显示
|
12 years ago |
|
nwb
|
f2f81e1d02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
4b064f3c2a
|
1.用户留言添加了竞赛类信息
2.优化跳转显示
|
12 years ago |
|
nwb
|
8ef716b920
|
1.个人动态留言显示出留言人
2.留言添加跳转链接
|
12 years ago |
|
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
12 years ago |
|
nwb
|
81596d674b
|
屏蔽了温馨提示
|
12 years ago |
yanxd
|
4d8701220b
|
-。-
acoount.html对齐了一下
学校列表school/index.html默认显示全部学校
没有填写工作单位的用户强行跳转到修改资料页面
|
12 years ago |
|
yanxd
|
08892d1cf7
|
s
|
12 years ago |
|
yanxd
|
cee205a568
|
issues#377 074e8adf 引入的issue页面权限问题，除了控制器还修改过views判断语句 keyworks: @edit_allowed
issues#379 tag字符串短
issues#380 tag 提交之后 不隐藏输入框
issues#381 搜索框有误
|
12 years ago |
|
yanxd
|
9034dd09e7
|
开启重启课程在课程列表里
|
12 years ago |
 nieguanghui
|
6baa87a8ea
|
修复项目列表分数显示不一致的问题，修改用户列表显示不一致的问题，修改作业中项目显示分数和项目内部分数不一致的问题
|
12 years ago |
xianbo
|
1c69e80745
|
keep same between take project and watch project
|
12 years ago |
|
yanxd
|
24dd71e6b3
|
关注项目
|
12 years ago |
|
yanxd
|
64e68ff8a0
|
关注项目无法显示的问题
|
12 years ago |
|
xianbo
|
104eaf8c00
|
fix student can create course in teacher maiun course page
|
12 years ago |
|
yanxd
|
84c5032eb2
|
整理下，加个推荐tag
|
12 years ago |
|
yanxd
|
378e8cbefd
|
socailForge#329
|
12 years ago |
|
yanxd
|
daed8a1164
|
暂且提交，增加活动失败。
|
12 years ago |
|
yanxd
|
78c2f40b8a
|
作业文字 文件列表 标签提交后删除
|
12 years ago |
|
yanxd
|
ce1e6c49f1
|
改留言
|
12 years ago |
|
yanxd
|
8963cc3a3c
|
邮件问题一
|
12 years ago |
 wanglinchun
|
27ee22e05d
|
调整个人得分窗口的格式
|
12 years ago |
|
wanglinchun
|
730ecd546f
|
修改教师及学生已结束课程的颜色
|
12 years ago |
|
wanglinchun
|
2d55f2fda9
|
修改
|
12 years ago |
|
wanglinchun
|
10ce937900
|
调整教师和学生已结束课程显示颜色
|
12 years ago |
|
yanxd
|
21e55492fa
|
小改怡情 大改伤身 强改灰飞烟灭
|
12 years ago |
|
yanxd
|
4efa3f7752
|
导航条下方的网站域名显示 forge ===> course
|
12 years ago |
