 huang
|
61ce44af76
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 05:01:58 +08:00 |
|
huang
|
c11fdc7273
|
版本库调整：未完成
|
2015-04-16 05:01:09 +08:00 |
whimlex
|
1d8dee15f4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 04:59:18 +08:00 |
|
whimlex
|
04698c3e53
|
项目描述展开信息和收起信息
|
2015-04-16 04:53:09 +08:00 |
|
whimlex
|
d23ac832ca
|
项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整
|
2015-04-16 04:12:26 +08:00 |
|
huang
|
fec751608a
|
完成里程碑界面
|
2015-04-16 03:54:07 +08:00 |
|
huang
|
8e7b4868ca
|
wiki页面调整
|
2015-04-16 00:30:23 +08:00 |
|
huang
|
6229acac71
|
完成wiki新建界面
|
2015-04-15 21:44:19 +08:00 |
|
whimlex
|
d79de0a354
|
课程日期控件样式冲突
|
2015-04-15 20:27:09 +08:00 |
 sw
|
94580ba040
|
11
|
2015-04-15 20:26:54 +08:00 |
|
whimlex
|
596e89a14f
|
缺陷更新页面
|
2015-04-15 20:05:21 +08:00 |
|
sw
|
62c0e136db
|
Merge branch 'develop' into szzh
|
2015-04-15 19:57:39 +08:00 |
|
sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
2015-04-15 19:57:16 +08:00 |
|
huang
|
45c234bf9c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-15 18:14:10 +08:00 |
|
huang
|
aff58dd3a7
|
添加关注者
|
2015-04-15 18:13:51 +08:00 |
|
sw
|
73ed8b9558
|
全站搜索是不输入条件搜索结果为空
|
2015-04-15 17:43:08 +08:00 |
|
sw
|
0f6d2676e5
|
tag云显示搜索结果的TAG云
|
2015-04-15 17:31:15 +08:00 |
|
whimlex
|
30dae089c6
|
新建缺陷页面主题不能为空
|
2015-04-15 17:28:53 +08:00 |
|
whimlex
|
521e000c74
|
commmit
|
2015-04-15 17:17:03 +08:00 |
|
sw
|
2e3294a341
|
1、增加根据资源列表，获取其TAG与每个TAG数量的hash的方法
2、增加课程资源列表的TAG云的显示
|
2015-04-15 17:16:28 +08:00 |
|
whimlex
|
d68b0283eb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-15 17:06:56 +08:00 |
|
whimlex
|
a10ced61ec
|
缺陷跟踪者
|
2015-04-15 17:06:40 +08:00 |
|
huang
|
3825252327
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-15 16:38:58 +08:00 |
|
huang
|
104075b3fd
|
修改缺陷留言方式
|
2015-04-15 16:38:39 +08:00 |
|
whimlex
|
7fa2338ce6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-15 16:34:52 +08:00 |
|
whimlex
|
ba0535e127
|
完成新建缺陷页面
|
2015-04-15 16:34:34 +08:00 |
|
sw
|
676cf8f180
|
课程上传资源是根据上传的类型，对资源添加默认的TAG
|
2015-04-15 16:00:45 +08:00 |
|
huang
|
4d0a9bd35c
|
部分描述增加强制换行
|
2015-04-15 15:30:33 +08:00 |
|
huang
|
0023d0610b
|
缺陷主题、描述强制换行
跟踪按钮样式
引用样式修改
|
2015-04-15 15:15:51 +08:00 |
|
sw
|
1dc8190aa0
|
1、修改无跳转的href链接为javascript:void(0)
2、增加课程资源库的界面
|
2015-04-15 14:53:07 +08:00 |
|
sw
|
898d15aa7a
|
更新course.css文件
|
2015-04-15 14:41:48 +08:00 |
|
sw
|
e579157604
|
更新public.css
课程讨论区文件按钮和editor靠的太近
|
2015-04-15 14:29:35 +08:00 |
|
huang
|
c607bd5cbf
|
定义缺陷中样式
|
2015-04-15 12:50:27 +08:00 |
 alanlong9278
|
b704555628
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/controllers/discuss_demos_controller.rb
app/models/user.rb
app/views/bids/_bid_homework_show.html.erb
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/poll/publish_poll.js.erb
app/views/poll/republish_poll.js.erb
public/javascripts/application.js
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-04-15 12:36:19 +08:00 |
|
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-04-15 12:30:37 +08:00 |
|
sw
|
be08a9afbb
|
修改application.css中错误css
|
2015-04-15 11:42:23 +08:00 |
|
sw
|
9079eaa4f9
|
Merge branch 'szzh' into develop
|
2015-04-15 11:28:02 +08:00 |
|
sw
|
a093346822
|
Merge branch 'guange_dev' into szzh
|
2015-04-15 11:27:13 +08:00 |
|
sw
|
2b1990a5b7
|
Merge branch 'develop' into guange_dev
|
2015-04-15 11:26:07 +08:00 |
 guange
|
11c1bbb525
|
解决打包时文件过多插库错误
|
2015-04-15 11:24:15 +08:00 |
|
huang
|
afa5c3a4f9
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-15 11:15:44 +08:00 |
|
huang
|
bfe0176b74
|
修改附件显示样式
|
2015-04-15 11:15:25 +08:00 |
 lizanle
|
b13d30bf20
|
自动更改
|
2015-04-15 10:52:50 +08:00 |
|
lizanle
|
c42a63ea4e
|
添加判空
|
2015-04-15 10:52:10 +08:00 |
|
lizanle
|
c2ccf6a1f8
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-15 10:31:09 +08:00 |
|
lizanle
|
a7f1026828
|
current_user判空
|
2015-04-15 10:30:56 +08:00 |
|
sw
|
a362ace9eb
|
Merge branch 'szzh' into develop
|
2015-04-15 10:29:49 +08:00 |
|
sw
|
7dbd20e5eb
|
修复刷新页面时只评论未评分表的作品在已评列表中
|
2015-04-15 10:27:17 +08:00 |
|
sw
|
ed5911eab5
|
Merge branch 'develop' into szzh
|
2015-04-15 10:22:10 +08:00 |
|
sw
|
61df6e144d
|
修复学生作业列表QQ浏览器显示超出边框
|
2015-04-15 10:06:52 +08:00 |