 huang
|
b98a67f50d
|
完成项目配置-成员模块
|
2015-04-14 11:47:47 +08:00 |
 sw
|
ead0ffb2f4
|
Merge branch 'develop' into szzh
|
2015-04-14 10:50:30 +08:00 |
|
sw
|
679620fa51
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-14 10:46:52 +08:00 |
|
sw
|
8c122a35f7
|
项目类型切换到其他类型后，再切回开发组，更多按钮不可用
|
2015-04-14 10:46:31 +08:00 |
|
huang
|
b3c3693d72
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-14 10:24:07 +08:00 |
|
huang
|
845794675a
|
配置-成员界面休整
|
2015-04-14 10:23:49 +08:00 |
|
sw
|
aee81e8e44
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-04-14 10:19:17 +08:00 |
|
sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
2015-04-14 10:17:42 +08:00 |
|
huang
|
6b8022cb23
|
清除不需要的子模块
|
2015-04-14 09:10:14 +08:00 |
|
huang
|
f3ba393bd4
|
去掉代码审查
修改配置-“版本库”样式
|
2015-04-13 23:39:56 +08:00 |
|
huang
|
48f096178c
|
修改配置modoule模块
|
2015-04-13 21:53:52 +08:00 |
|
huang
|
2b063db0cc
|
修改版本界面
未完成部分，隔行换色
|
2015-04-13 21:08:26 +08:00 |
 guange
|
eb4d9a4ffc
|
1. 将session改为跨子域。 2. 将session的存储改到files/cache_store下，用于nfs
|
2015-04-13 20:44:46 +08:00 |
whimlex
|
a65a2ab090
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-13 18:35:03 +08:00 |
|
whimlex
|
cf4451e998
|
pre标签换行；contest主页样式调整
|
2015-04-13 18:34:44 +08:00 |
|
huang
|
6ce998bb54
|
去掉新版本库中冗余代码
|
2015-04-13 18:30:20 +08:00 |
|
huang
|
5d249823df
|
修改配置版本库页面
|
2015-04-13 18:27:05 +08:00 |
|
sw
|
a0f01469a0
|
Merge branch 'develop' into szzh
|
2015-04-13 10:56:49 +08:00 |
|
sw
|
39579331e7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-13 10:51:33 +08:00 |
|
sw
|
cd7d425320
|
Merge branch 'szzh' into develop
|
2015-04-12 14:48:39 +08:00 |
|
sw
|
19edc8f586
|
1、忽略logo文件夹
2、忽略editor上传图片文件夹
|
2015-04-12 14:24:09 +08:00 |
|
sw
|
01f56a761f
|
完成配置---模块
|
2015-04-11 17:28:18 +08:00 |
|
whimlex
|
5c96a5322a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-11 17:11:25 +08:00 |
|
whimlex
|
1d8c2d2a3a
|
commit
|
2015-04-11 17:10:26 +08:00 |
|
sw
|
fb935f124c
|
完成修改项目界面
|
2015-04-11 17:04:48 +08:00 |
|
huang
|
534bd46008
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-11 16:34:17 +08:00 |
|
huang
|
36d76cfa07
|
缺陷列表代码整理
|
2015-04-11 16:33:25 +08:00 |
|
sw
|
b19bfa5c0a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-11 16:18:01 +08:00 |
|
sw
|
7ad3c2d578
|
修改项目配置js
增加项目配置相关子界面
|
2015-04-11 16:17:36 +08:00 |
 lizanle
|
76d7bd267c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-11 15:54:12 +08:00 |
|
lizanle
|
68a54b9368
|
app评论
|
2015-04-11 15:52:48 +08:00 |
|
huang
|
d2a77b3d41
|
添加issues回复统计
|
2015-04-11 15:34:59 +08:00 |
|
sw
|
7b60998952
|
修改点击课程名称，url连接错误
|
2015-04-11 15:34:08 +08:00 |
|
sw
|
c623f7ba8d
|
Merge branch 'szzh' into develop
|
2015-04-11 15:14:18 +08:00 |
|
sw
|
b3d6ab6d80
|
Merge branch 'guange_dev' into szzh
|
2015-04-11 15:13:31 +08:00 |
|
huang
|
78868b34f0
|
修改缺陷中四中颜色按钮会折断换行的bug
区别新闻和通知
|
2015-04-11 15:12:06 +08:00 |
|
sw
|
6c32e073ed
|
Merge branch 'szzh' into develop
|
2015-04-11 14:58:01 +08:00 |
|
sw
|
44cb4a8e56
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-11 14:57:15 +08:00 |
|
guange
|
af6db916d9
|
将files文件夹忽略
|
2015-04-11 14:49:44 +08:00 |
|
huang
|
4adfec5640
|
解决样式冲突
添加新闻展示页面
|
2015-04-11 14:49:26 +08:00 |
|
huang
|
e3d815b51d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-11 14:26:03 +08:00 |
|
huang
|
0c90f2361d
|
项目用户反馈页面调整
|
2015-04-11 14:25:47 +08:00 |
|
sw
|
b06e9ce468
|
干掉重复样式
|
2015-04-11 14:22:50 +08:00 |
|
sw
|
837fe88545
|
还原冲突，增加项目配置切换js
|
2015-04-11 14:19:52 +08:00 |
|
sw
|
633a53d1d4
|
更新css文件
|
2015-04-11 14:17:51 +08:00 |
|
whimlex
|
ccff6c27b0
|
#2170项目--新闻：评论新闻返回异常undefined method `split' for nil:NilClass
|
2015-04-11 14:14:47 +08:00 |
|
whimlex
|
f79132e9be
|
项目新闻评论不显示无评论的查看
|
2015-04-11 14:01:51 +08:00 |
|
whimlex
|
7e46885f3d
|
修改上传附件数目限制
|
2015-04-11 13:46:49 +08:00 |
|
sw
|
db0cc88142
|
静态页面添加
|
2015-04-11 13:32:39 +08:00 |
|
whimlex
|
5936d8d8e9
|
评论显示
|
2015-04-11 11:52:11 +08:00 |