 z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
10 years ago |
 alan
|
ade0720331
|
邮件系统界面重置
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
b9ea3e589e
|
修改《邮件系统》页面
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
z9hang
|
0f9915fc2a
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
Gemfile.lock
app/controllers/bids_controller.rb
app/controllers/users_controller.rb
db/schema.rb
|
10 years ago |
|
z9hang
|
6efe9ff5c6
|
注释掉无用的方法调用
|
11 years ago |
|
alan
|
6c9f5136c0
|
修改《竞赛主页显示错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
53b57d4c53
|
修改《个人主页积分弹框显示错误》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 sw
|
ee1df78f13
|
课程、项目首页增加用户姓名、邮箱、昵称等搜索功能
|
11 years ago |
|
sw
|
819c4c0bc1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/users_controller.rb
|
11 years ago |
|
sw
|
b512bc53e9
|
修改用户搜索无法精确搜索的bUG
|
11 years ago |
|
alan
|
629641d065
|
《调整学生列表页面》和《优化个人主页查询》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
73afb7e6c8
|
调用作业课程时首先判断该作业的所属课程是否存在
|
11 years ago |
|
alan
|
c99af4cb7b
|
修改《个人主页出现没权限访问链接》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
d81240e63c
|
修改《关注老师后，老师发布的作业都会在我主页的动态中显示出来，若我未加入该课程但感兴趣点击后返回403页面，提示不够人性化》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
1494821b67
|
用户搜索接口
|
11 years ago |
|
sw
|
fef005d2d3
|
修改搜索用户报错
|
11 years ago |
moon
|
e4e4c94d53
|
封掉所有列表入口，及页面中更多入口
|
11 years ago |
|
alan
|
e9d75bde6f
|
《修改资料》页面：工作单位为不必填
Signed-off-by: alan <547533434@qq.com>
|
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 |
|
z9hang
|
b141db6624
|
用户留言修复
|
11 years ago |
|
alan
|
1d76d559dd
|
添加功能<用户搜索的问题>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
f15c870053
|
1、代码优化。2、项目新建项目后个人主页中项目tab页点击报错问题
|
11 years ago |
|
z9hang
|
e4ff85894d
|
1、部分代码优化。2、未参加课程或项目的用户个人主页界面不显示对应的tab页
|
11 years ago |
|
z9hang
|
57776d67c5
|
优化代码
|
11 years ago |
|
sw
|
602982a124
|
龚乐鑫修改意见4：redirect_to后使用 url
|
11 years ago |
|
sw
|
8cd3dd0287
|
1.#1249 未登录和非本人进入用户课程界面时隐藏课程不显示
解决方案：判断当前用户和所查看的用户是否一致，不一致取消隐藏课程的显示
2.国际化代码以及页面代码调整
|
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 |
|
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 |
