whimlex
|
51e0217eb8
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 11:15:15 +08:00 |
|
whimlex
|
eb1f8acbd3
|
版本库样式修改
|
2015-04-17 11:14:55 +08:00 |
 lizanle
|
8290741746
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-17 11:13:40 +08:00 |
|
lizanle
|
d2b0eae119
|
格式修改
|
2015-04-17 11:13:36 +08:00 |
 sw
|
9f862ad7a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-17 11:11:03 +08:00 |
 huang
|
1ffa447767
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 10:58:54 +08:00 |
|
huang
|
640f6a1ca7
|
邮件发送框距离
去掉讨论区不必要的*
|
2015-04-17 10:58:40 +08:00 |
|
lizanle
|
1902d557c0
|
有日期label
|
2015-04-17 10:48:40 +08:00 |
|
lizanle
|
43442d6f62
|
字符截断
|
2015-04-17 10:45:49 +08:00 |
|
lizanle
|
8cee159cb7
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-17 10:38:54 +08:00 |
|
lizanle
|
e4abc86093
|
版本和版本库bug修改
|
2015-04-17 10:38:39 +08:00 |
|
huang
|
1961768031
|
新建问题前去掉不必要的*
去掉跟踪功能
|
2015-04-17 10:37:40 +08:00 |
|
sw
|
a8b1ca10b3
|
1、学生作业 --> 作品
2、学生交了作品之后显示修改作品
|
2015-04-17 10:36:32 +08:00 |
|
huang
|
f1e86ace25
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 10:14:03 +08:00 |
|
huang
|
54b81bdfb3
|
项目类型图标
|
2015-04-17 10:13:47 +08:00 |
|
whimlex
|
54e63cf4d9
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/issues/_history.html.erb
public/stylesheets/project.css
|
2015-04-17 08:48:17 +08:00 |
|
huang
|
258a023abd
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 08:44:16 +08:00 |
|
huang
|
fec0a7472d
|
新闻换行处理
|
2015-04-17 08:43:58 +08:00 |
|
huang
|
fbcd9f9a96
|
wiki页面调整
|
2015-04-17 08:28:07 +08:00 |
|
huang
|
0ea683e1b4
|
修改issue中图片附件的缩略图显示方式
|
2015-04-17 07:45:37 +08:00 |
|
whimlex
|
8633ba3325
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 20:11:49 +08:00 |
|
whimlex
|
8babe384fd
|
缺陷历史记录调整
|
2015-04-16 20:11:33 +08:00 |
|
huang
|
d1e7777040
|
关注列表样式
|
2015-04-16 20:00:07 +08:00 |
|
huang
|
63a457674a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 19:08:34 +08:00 |
|
huang
|
440eb8dc7f
|
1、修改项目成员一排显示
2、项目动态显示强制换行
3、讨论区提示用语
|
2015-04-16 19:08:16 +08:00 |
|
whimlex
|
fc106fef49
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 17:56:52 +08:00 |
|
huang
|
fb06571918
|
项目讨论区引用强制换行
|
2015-04-16 17:56:45 +08:00 |
|
whimlex
|
e9cf61e0f4
|
缺陷状态根据完成度调整
|
2015-04-16 17:56:19 +08:00 |
|
huang
|
ce5b2d9996
|
项目讨论区回复按钮
|
2015-04-16 17:29:04 +08:00 |
 z9hang
|
47e6d5c909
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-16 17:28:36 +08:00 |
|
z9hang
|
8a26fd4343
|
课程配置：成员配置处添加搜素成员功能
|
2015-04-16 17:28:08 +08:00 |
|
sw
|
b040981c22
|
调整course.css
|
2015-04-16 17:07:43 +08:00 |
|
sw
|
11a4febecb
|
调整course.css
|
2015-04-16 17:01:47 +08:00 |
|
sw
|
daef2c455a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-16 16:55:44 +08:00 |
|
sw
|
57a5191fe5
|
课程资源列表样式调整
|
2015-04-16 16:55:24 +08:00 |
|
whimlex
|
8b89110e41
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-16 16:40:11 +08:00 |
|
sw
|
65bcaef911
|
修改TAG云样式
|
2015-04-16 16:39:58 +08:00 |
|
whimlex
|
ca1e902a8f
|
#2279 搜索课程进入结果页面，如图，建议将“授课时间”与“课程简介”与上面的“课程名称”等信息对齐
|
2015-04-16 16:39:52 +08:00 |
|
huang
|
c852e72e36
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 16:36:51 +08:00 |
|
huang
|
611952eb05
|
新建项目时候设定默认项目类型
新建项目样式异常调整
|
2015-04-16 16:36:34 +08:00 |
|
sw
|
a0c6a09e7d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 16:10:48 +08:00 |
|
sw
|
332a9b45fb
|
修改项目上传资源弹框样式
|
2015-04-16 16:10:24 +08:00 |
|
huang
|
be97e4732d
|
目标版本为空的不显示
|
2015-04-16 15:58:38 +08:00 |
|
sw
|
9819e1ce45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-16 15:54:47 +08:00 |
|
lizanle
|
61a938ef39
|
添加真名
|
2015-04-16 15:48:53 +08:00 |
|
lizanle
|
e4597f9ccc
|
添加真名
|
2015-04-16 15:48:34 +08:00 |
|
lizanle
|
45d5f9e58b
|
课程搜索按时间倒序排序
|
2015-04-16 15:48:15 +08:00 |
|
huang
|
bfc83d1a8c
|
解决项目图片不能上传
|
2015-04-16 15:48:13 +08:00 |
|
sw
|
6983764c44
|
修改课程名称过长时的样式
|
2015-04-16 15:41:50 +08:00 |
|
huang
|
9fa7b04ce5
|
组织不需要必填
|
2015-04-16 15:30:24 +08:00 |