 nwb
|
9da116c0e3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 17:14:20 +08:00 |
|
nwb
|
cb4efd914e
|
修正项目文档删除BUG
|
2014-07-28 17:14:02 +08:00 |
 yanxd
|
f18e828632
|
usercontroller#test
|
2014-07-28 15:37:26 +08:00 |
|
yanxd
|
bf9a992399
|
活跃度排序不一致
|
2014-07-28 15:37:26 +08:00 |
 z9hang
|
0d0fb7052e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 15:16:37 +08:00 |
 sw
|
a39672dd14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-28 15:09:14 +08:00 |
|
z9hang
|
90a35fa24a
|
竞赛、课程首页，贴吧动态名字过长显示问题
课程、项目编辑贴子导航丢失问题
|
2014-07-28 15:06:54 +08:00 |
|
sw
|
18ddb8604b
|
取消参赛作品名称、描述的字数限制
|
2014-07-28 14:58:01 +08:00 |
|
nwb
|
2c79a51e48
|
优化文件读取编码解析
|
2014-07-28 14:43:38 +08:00 |
|
z9hang
|
9bf8abd03b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 13:53:57 +08:00 |
|
z9hang
|
a4ecccc048
|
修复贴吧动态中昵称过长回复被挤到不正确位置bug
|
2014-07-28 13:53:39 +08:00 |
|
nwb
|
1b589bf562
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 11:30:02 +08:00 |
|
nwb
|
74de064cca
|
1.文件删除权限判断优化
2.课程通知附件删除BUG修改
|
2014-07-28 11:29:55 +08:00 |
|
yanxd
|
a8ed4272cc
|
ckeditor: 描述中网址后面带有换行，projects列表出错
|
2014-07-28 11:03:39 +08:00 |
|
nwb
|
f8328727cd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 10:46:15 +08:00 |
|
nwb
|
dfdc58719a
|
课程主留言添加删除功能
|
2014-07-28 10:46:05 +08:00 |
|
z9hang
|
1daec14ab5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-28 10:38:23 +08:00 |
|
z9hang
|
8871652e01
|
添加首页定制，设置是否显示"我的课程"功能
|
2014-07-28 10:37:22 +08:00 |
|
sw
|
cc215e6c7b
|
修复个人动态图片显示不准确的问题
|
2014-07-28 09:47:11 +08:00 |
|
nwb
|
ef62fc1fac
|
修正缺陷搜索缺陷编号显示问题
|
2014-07-28 09:46:19 +08:00 |
|
nwb
|
f36ccad76a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 09:23:47 +08:00 |
|
nwb
|
9c9778d433
|
项目的“资料下载”改为“作品下载”
|
2014-07-28 09:23:40 +08:00 |
|
yanxd
|
979d6dd067
|
dts_test. controller ===> model
|
2014-07-28 09:22:52 +08:00 |
|
nwb
|
983cdebbb6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 09:18:45 +08:00 |
|
nwb
|
00cf448bda
|
用户动态兼容空留言
|
2014-07-28 09:18:24 +08:00 |
|
yanxd
|
4fae105b96
|
project testing.
|
2014-07-25 17:43:19 +08:00 |
|
nwb
|
f052d0d461
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 17:37:07 +08:00 |
|
nwb
|
1922593fee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-25 17:36:35 +08:00 |
|
z9hang
|
a1e06991d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-25 17:36:11 +08:00 |
|
nwb
|
f8a59220e3
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 17:08:01 +08:00 |
|
z9hang
|
97531960da
|
首页定制添加剂修改图片大小功能
|
2014-07-25 16:05:33 +08:00 |
|
sw
|
43efd63dda
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-25 15:42:01 +08:00 |
|
sw
|
758541250f
|
插件数据增加迁移文件，确保数据库数据正确
|
2014-07-25 15:41:21 +08:00 |
|
nwb
|
560ee0a2fc
|
数据库文件
|
2014-07-25 15:24:55 +08:00 |
|
sw
|
b5b246f098
|
修复个性签名未自动换行的问题
|
2014-07-25 15:12:24 +08:00 |
|
nwb
|
c0ac9924e7
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 15:09:56 +08:00 |
|
nwb
|
2a4daf04f9
|
删除资源文件修改
|
2014-07-25 15:09:29 +08:00 |
|
sw
|
ea322d6177
|
修复项目提交时间字的长度过长时会换行的BUG
|
2014-07-25 14:51:10 +08:00 |
|
nwb
|
1257e67380
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 14:06:59 +08:00 |
|
nwb
|
6531bf5195
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-25 14:05:40 +08:00 |
|
nwb
|
735d7f2c1f
|
文件下载权限判断优化
|
2014-07-25 14:05:25 +08:00 |
|
z9hang
|
2c08f39001
|
修改首页简介样式
|
2014-07-25 14:02:23 +08:00 |
|
z9hang
|
d6a425849a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-25 13:38:20 +08:00 |
|
z9hang
|
34626e03a4
|
调整主页显示图片大小
|
2014-07-25 13:37:49 +08:00 |
|
z9hang
|
5a0d76c1e0
|
竞赛通知发布完成
|
2014-07-25 11:51:52 +08:00 |
|
z9hang
|
673ffb1819
|
提交次数刷新问题
|
2014-07-25 11:31:16 +08:00 |
|
nwb
|
2bfc7aa93f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 11:12:08 +08:00 |
|
sw
|
70003c8374
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/zipdown_controller.rb
|
2014-07-25 11:10:45 +08:00 |
|
sw
|
6d5f72326f
|
增加定时任务
|
2014-07-25 11:09:47 +08:00 |
|
z9hang
|
42f0c49093
|
作业打包下载错误提示页无导航问题
|
2014-07-25 11:08:16 +08:00 |