 huang
|
93e3247685
|
项目名称不能为空提示
|
2015-04-20 14:54:04 +08:00 |
|
huang
|
8dd0e985a0
|
完成
|
2015-04-20 10:48:36 +08:00 |
|
huang
|
7340ef793c
|
修改新建项目的显示样式
|
2015-04-17 16:26:05 +08:00 |
|
huang
|
7d87915413
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/homework_attach/_homework.html.erb
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-04-17 15:07:01 +08:00 |
 lizanle
|
17838acddb
|
提示信息数组 flatten
|
2015-04-17 14:39:30 +08:00 |
|
lizanle
|
5d627bf6f2
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-17 14:35:02 +08:00 |
|
lizanle
|
54f8079ba6
|
去掉html符号
|
2015-04-17 14:34:57 +08:00 |
whimlex
|
d35e5d649d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 14:29:33 +08:00 |
|
whimlex
|
0a97bbba9d
|
项目问题跟踪图片点击空白处关闭
|
2015-04-17 14:29:16 +08:00 |
|
lizanle
|
0ca96a5500
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-17 14:27:30 +08:00 |
|
lizanle
|
ade32aae02
|
列宽修改
|
2015-04-17 14:27:26 +08:00 |
 sw
|
3a8bfbf880
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 14:22:19 +08:00 |
|
lizanle
|
3c17492901
|
列宽
|
2015-04-17 14:22:08 +08:00 |
|
sw
|
7239f6a641
|
1、成员列表分页空间翻页不可用
2、当五输入时显示，无用户显示
|
2015-04-17 14:21:44 +08:00 |
|
lizanle
|
17f9ed52ce
|
Wiki列宽度
|
2015-04-17 14:21:43 +08:00 |
|
lizanle
|
15e54dd765
|
版本 输入名字不能为空
|
2015-04-17 14:21:18 +08:00 |
|
lizanle
|
b6db00643e
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-17 14:20:58 +08:00 |
|
lizanle
|
532a8cb5c3
|
返回的时候展开输入框
|
2015-04-17 14:20:53 +08:00 |
|
whimlex
|
1382f9a0cd
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 14:14:35 +08:00 |
|
whimlex
|
dc955c7e2d
|
编辑问题时，编辑问题状态，开始时间、计划完成时间右侧的时间选择器不见了
|
2015-04-17 14:14:13 +08:00 |
|
sw
|
9814a859c3
|
项目添加TAG页面不刷新
|
2015-04-17 14:09:58 +08:00 |
|
huang
|
14a0d885f0
|
settings
|
2015-04-17 13:49:40 +08:00 |
|
huang
|
04af919c77
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 12:57:48 +08:00 |
|
huang
|
fc8dacbd5f
|
引入资源列表界面调整
|
2015-04-17 12:56:54 +08:00 |
|
lizanle
|
f8951c0044
|
国际化
|
2015-04-17 12:55:07 +08:00 |
|
lizanle
|
5e8848f962
|
国际化
|
2015-04-17 12:44:27 +08:00 |
|
lizanle
|
3bba1f93b4
|
版本库名输入条件描述去掉换行符
|
2015-04-17 12:01:31 +08:00 |
|
lizanle
|
42b798e111
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-17 12:00:53 +08:00 |
|
lizanle
|
3620cd99b6
|
去掉错误的符号
|
2015-04-17 12:00:47 +08:00 |
|
sw
|
cdbe95f6ec
|
修改老师配置界面成员搜索
|
2015-04-17 11:48:47 +08:00 |
|
huang
|
0607cf326c
|
版本库里面页面验证
|
2015-04-17 11:42:23 +08:00 |
|
whimlex
|
7e0120e029
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 11:15:41 +08:00 |
|
huang
|
917701f09d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 11:15:43 +08:00 |
|
huang
|
c2c9660a46
|
项目得分界面调整
|
2015-04-17 11:15:27 +08:00 |
|
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 |