 fanqiang
|
06a775e3f9
|
修改帖子显示数字错误
修改来源显示错误问题
|
2014-05-27 16:42:22 +08:00 |
xianbo
|
0f56d9e885
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-27 16:41:31 +08:00 |
|
fanqiang
|
4c3e2376f0
|
修改帖子页面
|
2014-05-27 16:25:43 +08:00 |
 nwb
|
68b9a7efc5
|
修正批准成员申请未选择角色时的BUG
|
2014-05-27 14:21:59 +08:00 |
|
fanqiang
|
fdf8b5640a
|
添加显示bug的页面
|
2014-05-27 09:01:36 +08:00 |
|
yanxd
|
a9b88b8e66
|
issues#show words typo
|
2014-05-27 08:51:03 +08:00 |
|
yanxd
|
98444ef01e
|
remove fuzzy routes|add school missing row
|
2014-05-27 08:32:43 +08:00 |
|
fanqiang
|
6dba5aaae6
|
修改帖子中 回复，关注，浏览的链接错误
|
2014-05-27 08:16:35 +08:00 |
 wanglinchun
|
d20114cc42
|
竞赛子站国际化完成
|
2014-05-26 19:51:20 +08:00 |
|
wanglinchun
|
4afc41a171
|
修改了编辑参赛作品不能更新托管项目的问题
|
2014-05-26 19:46:49 +08:00 |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
2014-05-26 19:19:11 +08:00 |
 z9hang
|
ddf5590c54
|
修复个人主页查看关注的项目时报user_id指代不明的sql错误
|
2014-05-26 17:04:55 +08:00 |
|
z9hang
|
5d4eec010e
|
隐藏点击描述用户的标签后跳到的标签页面显示的用户邮箱
|
2014-05-26 16:49:41 +08:00 |
|
wanglinchun
|
8d77c62359
|
sdfd
|
2014-05-26 16:37:06 +08:00 |
|
z9hang
|
ab85ee5169
|
admin个人主页项目功能修正
admin管理用户的搜索功能从/users/search中分离到/admin/search
admin管理用户界面添加管理界面布局
|
2014-05-26 16:25:53 +08:00 |
|
yanxd
|
4b1d7e049d
|
233
|
2014-05-26 14:27:47 +08:00 |
 yanxd
|
654cb404e2
|
bootstrap test
|
2014-05-26 11:27:10 +08:00 |
|
fanqiang
|
401f097079
|
项目展示页面添加帖子的发布者信息
|
2014-05-26 11:18:57 +08:00 |
|
fanqiang
|
f392fc244f
|
修改连接，进入帖子后应该进入新的界面
去掉项目展示部分的发布帖子连接
|
2014-05-26 11:05:02 +08:00 |
|
wanglinchun
|
b416d69639
|
vxc
|
2014-05-26 11:01:17 +08:00 |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
2014-05-26 09:05:36 +08:00 |
|
yanxd
|
2273a6fd0b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-26 08:56:58 +08:00 |
|
yanxd
|
d77d7e14c7
|
home page memo css no wrap
|
2014-05-26 08:56:16 +08:00 |
|
yanxd
|
7a4e5afba0
|
test
|
2014-05-24 12:12:38 +08:00 |
|
wanglinchun
|
be5de6f3f6
|
zh文件中添加国家化内容
|
2014-05-24 11:28:14 +08:00 |
|
wanglinchun
|
b13638bb95
|
竞赛子站国际化
|
2014-05-24 11:11:11 +08:00 |
|
wanglinchun
|
7b6c96a8b6
|
view中contests中的文件已经全部国际化
|
2014-05-24 10:56:58 +08:00 |
|
wanglinchun
|
8b356cddb1
|
修改用户留言页面中未登录状态下的提示语位置
|
2014-05-24 09:30:23 +08:00 |
|
z9hang
|
0e6d9a804a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-24 09:03:38 +08:00 |
|
z9hang
|
ee3a5f5719
|
代码修改
|
2014-05-23 17:40:59 +08:00 |
|
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-05-23 17:12:10 +08:00 |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
2014-05-23 17:07:58 +08:00 |
|
xianbo
|
be1a0e0fea
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-23 14:32:26 +08:00 |
|
xianbo
|
734caef3dc
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-23 14:21:34 +08:00 |
|
xianbo
|
a3a95556a3
|
fix 王林春提交了冲突文件
|
2014-05-23 14:16:32 +08:00 |
|
z9hang
|
ad5ac329f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-23 11:50:48 +08:00 |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
2014-05-23 11:50:36 +08:00 |
|
t430
|
edfd7372bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-05-23 11:42:41 +08:00 |
|
yanxd
|
4eebd48f92
|
realname
|
2014-05-23 11:38:30 +08:00 |
|
yanxd
|
3ae7729539
|
Merge branch 'szzh' into develop
|
2014-05-23 11:00:46 +08:00 |
|
yanxd
|
213939b474
|
realname
|
2014-05-23 10:59:52 +08:00 |
|
wanglinchun
|
4081ef93a3
|
参赛作品发布人不能打分和评论；
匿名用户隐藏打分功能
|
2014-05-23 10:51:07 +08:00 |
|
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
2014-05-23 09:49:36 +08:00 |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-23 09:44:33 +08:00 |
|
yanxd
|
6b5fda1c78
|
read txt attachment
|
2014-05-23 09:18:17 +08:00 |
 sw
|
0ec7d6b4e7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-22 20:01:34 +08:00 |
|
sw
|
71bbc50542
|
增加作业留言的分页显示
|
2014-05-22 20:01:26 +08:00 |
|
yanxd
|
598429695f
|
Merge branch 'develop' into szzh
|
2014-05-22 19:59:50 +08:00 |
|
yanxd
|
62f9ed052b
|
issues#655
|
2014-05-22 19:58:13 +08:00 |
|
nwb
|
eb5138e103
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-22 18:59:18 +08:00 |