 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
|
2dacc882df
|
test
|
2015-09-08 10:33:40 +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 |
|
sw
|
ef53278369
|
Merge branch 'szzh' into develop
|
2015-09-08 09:41:35 +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 |
|
cxt
|
a86d2aaadd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-07 17:38:41 +08:00 |
|
cxt
|
32b2d4f874
|
点击动态中的图片即显示大图
|
2015-09-07 17:38:31 +08:00 |
|
ouyangxuhua
|
fb6688265c
|
wiki删除后跳转
|
2015-09-07 17:16:25 +08:00 |
|
huang
|
0a45e08488
|
1、消息为0的时候不显示 消息数和“全部设置已读”。
2、消息不为空，未读消息为空的时候不显示“全部设为已读”
|
2015-09-07 16:14:34 +08:00 |
|
huang
|
402c0b5173
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-07 16:08:51 +08:00 |
|
huang
|
103d61056d
|
完成功能：
1、添加“新的消息”分类
2、新注册用户默认点击时间
|
2015-09-07 16:08:04 +08:00 |
|
lizanle
|
e8c5627c41
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-07 16:01:33 +08:00 |
|
lizanle
|
6bcaf01fe2
|
课程弹出框样式不对
|
2015-09-07 16:01:19 +08:00 |
|
cxt
|
4e1169a021
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-07 15:30:24 +08:00 |
|
cxt
|
61281af497
|
管理员页面的最近登录用户列表的登录时间精确到分秒
|
2015-09-07 15:30:11 +08:00 |
|
ouyangxuhua
|
8c66adec1b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-07 15:24:10 +08:00 |
|
ouyangxuhua
|
ef011ad473
|
项目--邀请--发送邮件邀请用户,对输入的邮箱名进行判断，同时，修改提示样式
|
2015-09-07 15:23:34 +08:00 |
|
ouyangxuhua
|
5569dacc6c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-07 15:20:37 +08:00 |
|
ouyangxuhua
|
a159af8139
|
项目--邀请--发送邮件邀请用户对输入的邮箱进行判断，同时修改提示样式
|
2015-09-07 15:20:18 +08:00 |
|
cxt
|
aa0c0dab83
|
添加“我的动态”
|
2015-09-07 15:01:08 +08:00 |
|
sw
|
2dad88d7d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-07 14:21:10 +08:00 |
|
huang
|
ecd0056f0a
|
1、完成消息点击记后图标不显示红点的功能。
2、首次登陆以“最后登录时间”为准，后面以点击时间为准
|
2015-09-07 11:13:15 +08:00 |
|
cxt
|
d667e6359c
|
切换
|
2015-09-07 11:12:04 +08:00 |
|
guange
|
53cea36329
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-06 22:59:40 +08:00 |
|
guange
|
216bc7f70f
|
动态中作业的提交状态修改
|
2015-09-06 22:59:27 +08:00 |
|
cxt
|
0dc47279de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-06 17:47:50 +08:00 |
|
sw
|
c23976354b
|
Merge branch 'szzh' into develop
|
2015-09-06 17:43:31 +08:00 |
|
sw
|
d0f7f89db3
|
迁移文件修改
|
2015-09-06 17:42:55 +08:00 |