Commit Graph

2052 Commits (510b1c423344fbe534081d16c2c1a29934d1ee0c)
 

Author SHA1 Message Date
z9hang eb0e149ac7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang daecf1a53b 老师收到课程留言区的直接留言及对老师的回复的邮件提醒
11 years ago
yanxd 5d8edb218f 管理员查看user_projects 课程项目混淆的问题
11 years ago
z9hang 31804b3d45 发邮件
11 years ago
yanxd 306ae9f685 用户tag点击之后的名字显示修改,用户邮箱隐藏
11 years ago
yanxd c7d6a07b72 gems
11 years ago
sw 8227c5222a 修复老师未进行综评的用户进入互评界面报错的BUG
11 years ago
z9hang cd333c8f35 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 27a30d44be 1.修改判断当前用户是不是为课程老师的方法
11 years ago
yanxd 22d4835d08 asset pipeline. gemfile
11 years ago
xianbo a70593ad76 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
yanxd 200c052bb4 watchers
11 years ago
z9hang bf12692de4 登录名==》账号/邮箱
11 years ago
fanqiang 06a775e3f9 修改帖子显示数字错误
11 years ago
xianbo 0f56d9e885 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
fanqiang 4c3e2376f0 修改帖子页面
11 years ago
nwb 68b9a7efc5 修正批准成员申请未选择角色时的BUG
11 years ago
fanqiang fdf8b5640a 添加显示bug的页面
11 years ago
yanxd a9b88b8e66 issues#show words typo
11 years ago
yanxd 98444ef01e remove fuzzy routes|add school missing row
11 years ago
fanqiang 6dba5aaae6 修改帖子中 回复,关注,浏览的链接错误
11 years ago
wanglinchun d20114cc42 竞赛子站国际化完成
11 years ago
wanglinchun 4afc41a171 修改了编辑参赛作品不能更新托管项目的问题
11 years ago
wanglinchun a1083fe900 修改了原有参赛作品显示报500;
11 years ago
z9hang ddf5590c54 修复个人主页查看关注的项目时报user_id指代不明的sql错误
11 years ago
z9hang 5d4eec010e 隐藏点击描述用户的标签后跳到的标签页面显示的用户邮箱
11 years ago
wanglinchun 8d77c62359 sdfd
11 years ago
z9hang ab85ee5169 admin个人主页项目功能修正
11 years ago
yanxd 4b1d7e049d 233
11 years ago
yanxd 654cb404e2 bootstrap test
11 years ago
fanqiang 401f097079 项目展示页面添加帖子的发布者信息
11 years ago
fanqiang f392fc244f 修改连接,进入帖子后应该进入新的界面
11 years ago
wanglinchun b416d69639 vxc
11 years ago
yanxd 12b1553a33 Merge branch 'develop' into szzh
11 years ago
yanxd 2273a6fd0b Merge remote-tracking branch 'origin/develop' into develop
11 years ago
yanxd d77d7e14c7 home page memo css no wrap
11 years ago
yanxd 7a4e5afba0 test
11 years ago
wanglinchun be5de6f3f6 zh文件中添加国家化内容
11 years ago
wanglinchun b13638bb95 竞赛子站国际化
11 years ago
wanglinchun 7b6c96a8b6 view中contests中的文件已经全部国际化
11 years ago
wanglinchun 8b356cddb1 修改用户留言页面中未登录状态下的提示语位置
11 years ago
z9hang 0e6d9a804a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang ee3a5f5719 代码修改
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 be1a0e0fea Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
11 years ago
xianbo 734caef3dc Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
xianbo a3a95556a3 fix 王林春提交了冲突文件
11 years ago
z9hang ad5ac329f2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 6583ccb001 admin账户个人主页显示修改
11 years ago