Commit Graph

10042 Commits

Author SHA1 Message Date
ouyangxuhua 3957ca5dc2 邮件中,让用户留言以html格式显示 2015-10-10 14:30:23 +08:00
huang a7b14e973d Merge branch 'szzh' into dev_hjq 2015-10-10 14:21:31 +08:00
ouyangxuhua a9456ca82f 让项目留言的内容以html形式显示 2015-10-10 14:14:36 +08:00
ouyangxuhua 2752512471 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-10-10 14:00:37 +08:00
ouyangxuhua c365f32a17 修改邮件中,有些邮件内容不能正常显示的问题。 2015-10-10 14:00:12 +08:00
huang e5c64fc43a 去掉系统消息判断 2015-10-10 11:49:25 +08:00
huang 47de084a6c Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-10-10 11:44:40 +08:00
huang 5c285b26ed Merge branch 'szzh' into dev_hjq 2015-10-10 11:44:27 +08:00
huang d63a049593 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-10 11:43:55 +08:00
huang a0f0ecf86d 修改未读消息500问题 2015-10-10 11:43:41 +08:00
lizanle 485208f3ab Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-10 11:38:04 +08:00
lizanle 94bffb5458 插入头像 , 粘贴图片 ,插入图片,都要加入域名。防止邮件中出现图片不显示的问题 2015-10-10 11:37:58 +08:00
Tim 0d85fb3c5f 导航栏链接在变色范围内都可点击 2015-10-10 11:07:29 +08:00
Tim 9e91429b1e 鼠标在侧导航左侧文字颜色不变修复 2015-10-10 10:32:08 +08:00
Tim 99e19c51f9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-10 10:24:12 +08:00
Tim 48bd70b9f6 个人动态编辑图片显示 2015-10-10 10:23:52 +08:00
lizanle 11abbca1cf tag_list代码的公用问题 2015-10-10 10:16:50 +08:00
lizanle 24a3327304 Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-10 10:05:15 +08:00
lizanle 1de6e24bfb tag数目的显示方式的更改 2015-10-10 10:04:32 +08:00
huang 8729399925 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-10 10:01:19 +08:00
huang ddac70c9b8 项目成员角色Gitlab一致,单选
添加成员按钮样式调整
2015-10-10 10:00:11 +08:00
lizanle f5949ce04f Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-10 09:54:20 +08:00
lizanle 467a6c4fba 项目tag显示问题 2015-10-10 09:54:13 +08:00
whimlex a2814a8d98 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-10 09:02:33 +08:00
whimlex 171d30e112 项目缺陷改为项目问题 2015-10-10 09:02:09 +08:00
huang ebe1afd489 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 16:12:31 +08:00
huang 2518305959 项目删除跳转修改;项目删除提示修改 2015-10-09 16:12:02 +08:00
ouyangxuhua 6ad1ee36e2 将“项目讨论区”简化为“项目讨论”,与其他列表一致 2015-10-09 15:56:14 +08:00
ouyangxuhua 77581d46eb 1.将所有类型的消息都列出来;
2.修复当消息为空时,浏览器端报错的问题。
2015-10-09 15:50:40 +08:00
lizanle 724abee12a 缩进问题 2015-10-09 15:49:50 +08:00
cxt c6cca9f17e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 14:40:49 +08:00
cxt 0f6ea47792 课程讨论区的列表显示 2015-10-09 14:39:40 +08:00
ouyangxuhua d20368aa38 将消息列表由一行分至两行 2015-10-09 14:33:26 +08:00
lizanle 5f8d21f1cb 暂时去掉 工具栏聚焦和不聚焦的时候 的隐藏和显示控制 2015-10-09 14:26:27 +08:00
lizanle 98ba28ab3d Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-09 14:25:50 +08:00
lizanle b04e20ed7d 工具栏聚焦和不聚焦的时候 的隐藏和显示控制 2015-10-09 14:25:40 +08:00
sw 7c825baf19 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 14:19:25 +08:00
whimlex c01466b419 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 14:15:36 +08:00
huang 2187595b6c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 14:12:44 +08:00
huang c6d9d0adc9 Merge branch 'dev_hjq' into szzh 2015-10-09 14:12:22 +08:00
ouyangxuhua f4b92e110f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-10-09 14:11:40 +08:00
lizanle ba3ce6eca4 Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-09 14:08:20 +08:00
lizanle 357a5d4139 添加点赞人数 2015-10-09 14:08:12 +08:00
huang b26ddb8315 Merge branch 'szzh' into dev_hjq 2015-10-09 14:07:20 +08:00
huang dab8aa98db Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 14:05:08 +08:00
huang 6a3312230a 邮箱验证不允许中文输入
姓名允许中文输入
2015-10-09 14:04:47 +08:00
sw ff5e167e3c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 14:02:23 +08:00
sw 829e94c563 enter可修改tag name并且只修改一次 2015-10-09 14:02:02 +08:00
lizanle 7e4f75f92e Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-09 13:39:00 +08:00
lizanle dc3cb3a26b _logined_header.html头像 鼠标移入就要有效果 2015-10-09 13:38:35 +08:00