 huang
|
9fa7b04ce5
|
组织不需要必填
|
2015-04-16 15:30:24 +08:00 |
 sw
|
146022b6e8
|
Merge branch 'develop' into szzh
|
2015-04-16 15:28:07 +08:00 |
|
sw
|
4202ec4bad
|
个人主页样式
|
2015-04-16 15:27:49 +08:00 |
|
huang
|
b92767bbb5
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 15:16:54 +08:00 |
|
huang
|
b80251a247
|
链接空白处改成不能点击
修复项目标题过长，布局变形
|
2015-04-16 15:16:15 +08:00 |
 lizanle
|
9621c35e8b
|
项目 版本 和 版本库 标签改动
|
2015-04-16 15:08:46 +08:00 |
|
sw
|
174be73bd1
|
Merge branch 'szzh' into develop
|
2015-04-16 15:02:16 +08:00 |
|
sw
|
05c74960a8
|
1、增加当前选择的TAG云的样式
2、当选择TAG云过滤之后，对TAG进行添加、删除操作时继续选中该TAG
|
2015-04-16 15:01:37 +08:00 |
|
lizanle
|
10bd7c2855
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-16 14:59:11 +08:00 |
|
lizanle
|
17f495e77b
|
项目 版本 和 版本库 标签改动
|
2015-04-16 14:59:05 +08:00 |
|
huang
|
3c563eaecb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 14:34:21 +08:00 |
|
huang
|
bb7904b32f
|
引入JS文件
|
2015-04-16 14:34:08 +08:00 |
whimlex
|
19cbc34b2b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 14:25:19 +08:00 |
|
whimlex
|
19dd5a9879
|
项目邀请功能和项目更多功能点击事件
|
2015-04-16 14:25:02 +08:00 |
|
sw
|
5649f4c5a1
|
过滤之后现在所有的TAG云
|
2015-04-16 14:21:05 +08:00 |
|
huang
|
890f36a2d5
|
优化缺陷
|
2015-04-16 14:13:12 +08:00 |
|
sw
|
a2b529b38b
|
课程添加TAG后删除TAG按钮消失
|
2015-04-16 14:12:37 +08:00 |
|
sw
|
b7e9442800
|
添加、删除TAG云时TAG云列表刷新
|
2015-04-16 14:01:58 +08:00 |
|
huang
|
4afd9afd08
|
解决冲突。修改版本页面
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
public/stylesheets/project.css
|
2015-04-16 13:42:45 +08:00 |
|
huang
|
08fb04aff4
|
修改版本库样式
|
2015-04-16 13:40:46 +08:00 |
|
whimlex
|
20b17f5503
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-16 12:15:55 +08:00 |
|
whimlex
|
301e44c695
|
修改附件上传功能无效
|
2015-04-16 12:15:36 +08:00 |
|
huang
|
8803942a02
|
项目讨论区，引用样式调整
|
2015-04-16 11:35:38 +08:00 |
|
huang
|
e34a00f66e
|
讨论区列表样式冲突
|
2015-04-16 11:17:44 +08:00 |
|
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 |
|
sw
|
e334dd69f8
|
上传课件后TAG云消失
|
2015-04-16 11:14:06 +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 |
|
sw
|
2db3ab9d13
|
修改课程时增加密码与课时的验证
|
2015-04-16 10:56:48 +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 |
|
sw
|
94ca6cd2f9
|
新建课程时增加密码与课时的验证
|
2015-04-16 10:49:58 +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 |
|
sw
|
9905f91228
|
修改TAG云的显示样式
|
2015-04-16 09:46:22 +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 |