 huang
|
69eb7fbd77
|
关注、加入项目样式，处理样式冲突
|
2015-03-20 15:02:20 +08:00 |
 z9hang
|
587a739c76
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-20 11:49:35 +08:00 |
whimlex
|
5924cd6432
|
commit
|
2015-03-20 11:37:57 +08:00 |
 sw
|
b6b479f6f9
|
1、增加开启关闭匿评时弹框
2、增加js调用是等待的样式
|
2015-03-20 11:37:56 +08:00 |
|
z9hang
|
5278d4dd2b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 11:37:22 +08:00 |
|
z9hang
|
4ca5687b3b
|
#2072测试版--项目--问题跟踪：成功新建问题后建议提示信息为“问题已创建”就好
|
2015-03-20 11:37:09 +08:00 |
|
whimlex
|
93838f604d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 11:35:18 +08:00 |
|
whimlex
|
3837e1fcf5
|
申请加入：附件上传
|
2015-03-20 11:34:59 +08:00 |
 lizanle
|
cdad43fdfc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-20 11:08:47 +08:00 |
|
lizanle
|
a4567396e4
|
如果没有上传图片就会报空指针
|
2015-03-20 11:08:27 +08:00 |
|
z9hang
|
0d8786f7dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 09:32:44 +08:00 |
|
z9hang
|
74d1ebed4e
|
课程资源中样式显示问题
|
2015-03-20 09:31:54 +08:00 |
|
z9hang
|
26feaba6e8
|
去掉旧的资源样式的引用
|
2015-03-20 09:12:20 +08:00 |
|
sw
|
3ee46bfe3f
|
Merge branch 'szzh' into develop
|
2015-03-19 17:50:33 +08:00 |
|
sw
|
a596662791
|
Merge branch 'guange_dev' into szzh
|
2015-03-19 17:50:06 +08:00 |
|
sw
|
7c9d007785
|
Merge branch 'szzh' into guange_dev
|
2015-03-19 17:49:41 +08:00 |
 guange
|
7decf34cc7
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
2015-03-19 17:48:40 +08:00 |
|
guange
|
92b72c995a
|
纠正合并
|
2015-03-19 17:47:51 +08:00 |
|
sw
|
8467a5dfc1
|
Merge branch 'szzh' into develop
|
2015-03-19 17:45:14 +08:00 |
|
sw
|
7085beb3ab
|
Merge branch 'guange_dev' into szzh
|
2015-03-19 17:44:32 +08:00 |
|
sw
|
0c4f88ca29
|
Merge branch 'szzh' into guange_dev
|
2015-03-19 17:43:56 +08:00 |
|
sw
|
69d1fdb699
|
111111111111111
|
2015-03-19 17:43:20 +08:00 |
|
guange
|
e007920cb6
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
Gemfile
app/views/attachments/_form.html.erb
|
2015-03-19 17:41:45 +08:00 |
|
sw
|
6edbb3c7ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 17:29:17 +08:00 |
|
whimlex
|
45475c3612
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 17:28:38 +08:00 |
|
sw
|
3418c9ccee
|
1、修改course/homewrok方法
2、修改course的作业列表显示
|
2015-03-19 17:28:36 +08:00 |
|
whimlex
|
6995ead66c
|
项目ID
|
2015-03-19 17:28:12 +08:00 |
 dingxu
|
f4dff55377
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 17:24:14 +08:00 |
|
dingxu
|
073cb07f70
|
邀请平台用户：角色、用户都为空添加提示、单一角色提示信息修改、
展开条样式修改
|
2015-03-19 17:23:53 +08:00 |
|
whimlex
|
b400c9bb11
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-03-19 17:22:25 +08:00 |
|
whimlex
|
b95852dfcd
|
附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改
|
2015-03-19 17:21:11 +08:00 |
|
dingxu
|
7b3af413cd
|
邮件邀请加入项目:如果邮箱已被注册或为空时给出提示
|
2015-03-19 16:51:07 +08:00 |
|
dingxu
|
79588489e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 16:25:38 +08:00 |
|
dingxu
|
440855c0e6
|
修改项目tag样式
|
2015-03-19 16:25:18 +08:00 |
|
sw
|
3bd0bf3c49
|
1、添加标签url修改
2、删除标签是js页面刷新
|
2015-03-19 16:20:32 +08:00 |
|
sw
|
46410c8e8d
|
1、修改删除TAG后js刷新页面
2、删除课程TAG时增加提示
|
2015-03-19 16:02:02 +08:00 |
|
sw
|
308568d668
|
未登录用户不容许给课程添加标签
|
2015-03-19 15:48:50 +08:00 |
|
sw
|
e4ea97486b
|
课程增加添加标签功能
|
2015-03-19 15:43:52 +08:00 |
|
sw
|
12be97eea5
|
修改配置、关闭、复制、加入课程、退出课程按钮样式不正确
|
2015-03-19 15:17:38 +08:00 |
|
sw
|
7541a83b16
|
改课程首页用新建问卷
|
2015-03-19 15:04:44 +08:00 |
|
sw
|
90df8056c8
|
1、修改分页控件中省略号颜色
2、更新样式文件
3、修改课程首页用新建问卷换行
|
2015-03-19 14:58:42 +08:00 |
|
z9hang
|
191261e47f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 14:42:28 +08:00 |
|
z9hang
|
2a3a70b7d5
|
app接口部分信息国际化
|
2015-03-19 14:41:31 +08:00 |
|
sw
|
258d9bf33a
|
1、调整分页控件显示样式
2、修改课程动态分页算法
3、更新样式文件
|
2015-03-19 14:30:06 +08:00 |
|
sw
|
b9ed34f86e
|
1、右边内容区域、增加js：最短为左侧长度
2、修改课程首页动态显示
3、修改course.css文件
|
2015-03-19 11:42:52 +08:00 |
|
lizanle
|
0424fc55db
|
项目资源数显示错误
|
2015-03-19 11:26:31 +08:00 |
|
lizanle
|
966f93012d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-19 11:16:11 +08:00 |
|
lizanle
|
c209bccba0
|
项目资源数显示错误
|
2015-03-19 11:15:58 +08:00 |
|
huang
|
f5b528dc4d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 10:44:24 +08:00 |
|
huang
|
371f25b61f
|
修改邀请页面分页异常（冲突引起）
|
2015-03-19 10:44:03 +08:00 |