 lizanle
|
d8a4977c4d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 11:14:28 +08:00 |
|
lizanle
|
871623b7c8
|
commit
|
2015-04-16 11:14:12 +08:00 |
 huang
|
c1d997379f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 11:08:53 +08:00 |
|
lizanle
|
a4d6eaa46c
|
跳转回来自动选择tab页
|
2015-04-16 11:08:00 +08:00 |
|
huang
|
284e4938f6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 11:07:55 +08:00 |
|
lizanle
|
38672458b0
|
新建版本 更改页面
|
2015-04-16 11:07:38 +08:00 |
|
huang
|
dc81db1d8b
|
处理讨论区、缺陷列表样式显示异常
|
2015-04-16 11:07:37 +08:00 |
|
lizanle
|
86b05b8e6a
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-16 10:51:09 +08:00 |
|
lizanle
|
fe94efeb39
|
新建版本更改页面
|
2015-04-16 10:50:53 +08:00 |
|
huang
|
e2f7da5b99
|
修改里程碑代码
|
2015-04-16 10:31:42 +08:00 |
|
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-04-16 10:26:03 +08:00 |
|
huang
|
bd800a53e4
|
项目简介显示
|
2015-04-16 10:00:36 +08:00 |
whimlex
|
7ce8ae0261
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 09:54:27 +08:00 |
|
whimlex
|
9c07976751
|
展开和收起更多信息图片样式修改；跟踪者样式修改
|
2015-04-16 09:54:10 +08:00 |
|
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
2015-04-16 09:49:03 +08:00 |
|
huang
|
bc6ff57de2
|
修改开发组、朋友圈、研发组切换js
|
2015-04-16 09:30:06 +08:00 |
|
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 |
|
sw
|
be08a9afbb
|
修改application.css中错误css
|
2015-04-15 11:42:23 +08:00 |