 lizanle
|
c393a0ea01
|
个人中心 留言界面 编辑框 ie浏览器下报错
|
2015-09-09 14:00:44 +08:00 |
|
lizanle
|
b2afe18ccd
|
个人中心 留言界面 编辑框自适应高度
|
2015-09-09 13:44:23 +08:00 |
 ouyangxuhua
|
30efa6c8c7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-09 11:42:21 +08:00 |
|
ouyangxuhua
|
20bef515da
|
issue周报发送消息给所有管理员
|
2015-09-09 11:42:06 +08:00 |
|
lizanle
|
4ad139e6fd
|
添加一点注释
|
2015-09-09 11:38:08 +08:00 |
|
lizanle
|
4b1153d0a5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-09 11:28:40 +08:00 |
|
lizanle
|
1dd4700eb2
|
个人中心留言功能 编辑框自适应高度
|
2015-09-09 11:28:28 +08:00 |
 cxt
|
7474d19120
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-09 11:23:37 +08:00 |
|
cxt
|
040f3f588d
|
鼠标移到头像上方，才显示账户下拉菜单
|
2015-09-09 11:23:23 +08:00 |
|
lizanle
|
6adbceec7b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-09 10:55:48 +08:00 |
|
lizanle
|
95f66a304c
|
通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短
课程模块的通知，讨论区，留言都可以自动的长高，缩短
|
2015-09-09 10:55:32 +08:00 |
|
cxt
|
8fec99114a
|
"关于我们"的样式调整
|
2015-09-09 10:39:11 +08:00 |
|
cxt
|
6bf4a3dd13
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-09 10:21:57 +08:00 |
|
cxt
|
a991500e55
|
登录首页的样式修改
|
2015-09-09 10:21:44 +08:00 |
 huang
|
146d877254
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-09 10:15:38 +08:00 |
|
huang
|
1a6f81f302
|
用户申请，区分已读和未读
|
2015-09-09 10:15:05 +08:00 |
|
lizanle
|
faf5f1eab5
|
通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短
|
2015-09-09 09:52:39 +08:00 |
 sw
|
e040c20f08
|
admin界面，最后登录的用户列表报错
|
2015-09-09 09:36:44 +08:00 |
|
lizanle
|
169c56a58d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-09 09:22:08 +08:00 |
|
lizanle
|
3b9d1d6200
|
讨论区编辑框可以自动长高缩短
|
2015-09-09 09:22:01 +08:00 |
|
sw
|
1c91510ce2
|
Merge branch 'guange_homework' into szzh
|
2015-09-09 09:11:48 +08:00 |
|
sw
|
068b03cd8f
|
Merge branch 'guange_homework' of http://repository.trustie.net/xianbo/trustie2 into guange_homework
|
2015-09-09 09:11:30 +08:00 |
 guange
|
c413d66c44
|
程序作业打分
|
2015-09-09 00:43:54 +08:00 |
|
ouyangxuhua
|
71f8fca68b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-08 17:32:00 +08:00 |
|
ouyangxuhua
|
a7f2f0a6d2
|
项目版本库错误提示信息设置为flash.now[:error]
|
2015-09-08 17:31:16 +08:00 |
|
huang
|
51d964d371
|
点击消息链接定位到对应页面的某一点
|
2015-09-08 17:26:10 +08:00 |
|
huang
|
06753497bb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-08 16:56:36 +08:00 |
|
huang
|
0746408a9d
|
增加用户申请加入项目消息提醒功能（管理员收到消息提醒）
|
2015-09-08 16:55:36 +08:00 |
|
sw
|
2e59584031
|
作业编辑功能按钮、加入课程、项目等按钮样式
|
2015-09-08 16:36:50 +08:00 |
|
ouyangxuhua
|
966bd8f94c
|
admin配置界面编辑框样式修改
|
2015-09-08 16:31:19 +08:00 |
|
sw
|
137a0b16a0
|
1、文件的样式图片
2、点击编程弹框时，测试输入获取焦点
|
2015-09-08 15:40:25 +08:00 |
|
ouyangxuhua
|
bff50aa769
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-08 15:28:15 +08:00 |
|
ouyangxuhua
|
d01a529040
|
项目消息标题判断
|
2015-09-08 15:27:58 +08:00 |
|
guange
|
52c2719a46
|
去掉老式的编程作业提交
|
2015-09-08 14:48:02 +08:00 |
|
sw
|
48cb07c453
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-08 14:44:50 +08:00 |
|
sw
|
1cbda41997
|
11
|
2015-09-08 14:43:59 +08:00 |
|
huang
|
ae2aa2fedd
|
完成消息所有逻辑功能
|
2015-09-08 14:14:49 +08:00 |
|
cxt
|
6f64152ec7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-08 11:56:04 +08:00 |
|
cxt
|
cdca8dea4d
|
去掉缺陷描述的图片点击显示大图后的蓝色边框
|
2015-09-08 11:55:52 +08:00 |
|
lizanle
|
23e60bf007
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-08 11:18:10 +08:00 |
|
lizanle
|
de822daf44
|
个人动态编辑框高度自动变高缩短
其他编辑框自动长高缩短
|
2015-09-08 11:18:02 +08:00 |
|
sw
|
e4209007b1
|
Merge branch 'guange_homework' into szzh
|
2015-09-08 10:28:21 +08:00 |
|
huang
|
4c73e00eaf
|
作品消息状态更新
|
2015-09-08 09:43:41 +08:00 |
|
huang
|
8d72a9a539
|
去掉项目base冗余代码
|
2015-09-08 09:22:15 +08:00 |
|
ouyangxuhua
|
550b263c2c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-08 09:11:17 +08:00 |
|
sw
|
3b24bb375a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-08 08:50:00 +08:00 |
|
sw
|
a29d004fdc
|
没有加入课程的用户进入作业列表报错
|
2015-09-08 08:45:29 +08:00 |
|
guange
|
be29bcc8bd
|
模拟答题记入数据库
|
2015-09-07 23:47:14 +08:00 |
|
guange
|
9e9f373a76
|
发布作业优化
|
2015-09-07 23:09:19 +08:00 |
|
guange
|
04dffb2f89
|
模拟回答界面调整
|
2015-09-07 18:29:25 +08:00 |