jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,210 Commits 98 Branches 0 Tags 0 B
Commit Graph

6497 Commits

Author SHA1 Message Date
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
Tim 0d85fb3c5f 导航栏链接在变色范围内都可点击 2015-10-10 11:07:29 +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
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
sw 7c825baf19 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 14:19:25 +08:00
huang 2187595b6c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 14:12:44 +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 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
huang 530d101024 项目邀请--姓名、长度JS验证 2015-10-09 11:25:21 +08:00
ouyangxuhua 97a6487eeb 增加开启匿评失败的原因说明 2015-10-09 10:58:51 +08:00
huang 2768317d08 Merge branch 'szzh' into dev_hjq 2015-10-09 10:34:53 +08:00
huang 7b18c14aa3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 10:34:18 +08:00
huang 654ebfca46 项目邀请添加：姓、名、性别 2015-10-09 10:33:10 +08:00
ouyangxuhua 28bbbb1508 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 09:09:21 +08:00
ouyangxuhua 8841b5221b 消息显示内容修改 2015-10-09 09:08:58 +08:00
lizanle b51066694e 全部 按钮 2015-10-09 09:06:01 +08:00
cxt c5133997fa 项目缺陷改为项目问题 2015-10-09 08:42:18 +08:00
lizanle b8be9c6425 批量修改tag 2015-10-08 17:42:48 +08:00
huang 0064aa4278 系统消息不消失 
系统消息和普通消息一致，按照时间排序
待优化点：数组排序
 2015-10-08 16:10:33 +08:00
cxt 0ef84d9691 个人主页的“项目缺陷”改为“项目进展” 2015-10-08 14:41:55 +08:00
lizanle 4a1df8c15a Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-08 14:34:11 +08:00
lizanle 418e7e379d 编辑室不能移动光标 2015-10-08 14:33:58 +08:00
lizanle 9291758ef4 鼠标移到tag上变手型 2015-10-08 14:24:51 +08:00
huang 6179e455d2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-08 14:23:49 +08:00
huang e054f8045c 去掉Git的中英文说明 
新的提交代码指定入口
 2015-10-08 14:23:32 +08:00
lizanle e76f9a169e 注释 2015-10-08 14:14:28 +08:00
lizanle c8357a6364 批量修改tag 2015-10-08 13:51:55 +08:00
lizanle 912fdf480a Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-08 11:34:20 +08:00
lizanle 0cd96f579e 批量修改tag 2015-10-08 11:34:12 +08:00
huang d22234dfe4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-08 11:13:52 +08:00
huang e563354c85 项目删除 2015-10-08 11:13:17 +08:00
lizanle 56db8b4232 批量修改tag的bug 2015-10-08 11:08:26 +08:00
sw fed1a99bec 课程动态报500 2015-09-30 10:49:04 +08:00
sw af892fa7ef Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:44:00 +08:00
sw 11314a5366 第二个人打分之后，评分结果的样式 2015-09-30 10:43:40 +08:00
huang 548a18d1fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:32:16 +08:00
huang edf6f8e1f0 消息提示，显示新消息数目 2015-09-30 10:31:47 +08:00
sw 1acadd1edf 1、测试时间显示不正确 
2、作品列表时间增加判断
 2015-09-30 09:50:14 +08:00
sw 52eabd5c0a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 18:03:00 +08:00
sw 87e4bfdd3f 课程内导入作业却将作业发布到被导入的课程 2015-09-29 18:02:11 +08:00
lizanle ecbf1ca692 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 17:54:47 +08:00
lizanle 4f8e9ea2cd 编辑按钮被注释了 2015-09-29 17:54:33 +08:00
sw f2b8e01aee Merge branch 'develop' into szzh 2015-09-29 17:33:57 +08:00
Tim b6a8a69be8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 17:30:02 +08:00
Tim 4c5b59ebc8 作业动态图标替换 2015-09-29 17:28:45 +08:00
lizanle 9f9b68ef2a 帮助中心报500的问题 2015-09-29 17:16:53 +08:00
sw 9569bda67c 上传图片功能不可 用 2015-09-29 16:51:22 +08:00
lizanle b798c6747b 删除贴吧 函数名重复了 2015-09-29 16:40:55 +08:00
lizanle 9d122886a9 删除帖子会删除贴吧 2015-09-29 16:10:43 +08:00
Tim 74dc276383 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 16:01:18 +08:00
Tim f2b2062b9c 贴吧点赞位置再调整 2015-09-29 16:01:01 +08:00
ouyangxuhua 17cfa10dca Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:46:04 +08:00
ouyangxuhua b29546cd13 评论了项目新闻消息，其内容应该为新闻题目，而非评论内容。 2015-09-29 15:45:52 +08:00
Tim 852435d708 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:44:23 +08:00
Tim 1613f41e77 点赞判断 2015-09-29 15:44:04 +08:00
cxt fe339e6a8f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:38:06 +08:00
cxt 03436bca2a 贴吧的用户链接可点击 2015-09-29 15:37:52 +08:00
Tim 0fdf10649c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:25:01 +08:00
Tim a0f4cabcf2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:24:30 +08:00
Tim 971ff1e692 贴吧点赞位置调整 2015-09-29 15:24:15 +08:00
sw 9beaba0aac Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:21:11 +08:00
ouyangxuhua 9f5c3ec05c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:15:20 +08:00
ouyangxuhua ab82fff1a0 课程消息中，修改“评论了通知”的内容和tips 2015-09-29 15:15:00 +08:00
lizanle 9e4896fc7b Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 15:13:14 +08:00
lizanle 138b24b34c oschina模式的代码插入 2015-09-29 15:13:05 +08:00
cxt ce5579c14d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:02:57 +08:00
cxt e2a5819d74 课程动态首页的图片可点击 2015-09-29 15:02:36 +08:00
sw b22669e36f 课程上传图片按钮 2015-09-29 14:50:29 +08:00
Tim 21408f3843 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 14:35:02 +08:00
Tim cc99120f25 贴吧样式更改 2015-09-29 14:34:39 +08:00
lizanle c75487fcf5 防止论坛名字太长 2015-09-29 14:27:53 +08:00
ouyangxuhua d9c6d9239c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 14:16:50 +08:00
ouyangxuhua 1f77b05879 如果是自己发布的作业消息，提示语改为“您”,而非某某老师 2015-09-29 14:16:27 +08:00
lizanle 6d74867150 清除浮动 2015-09-29 13:58:39 +08:00
lizanle de62798d4d 点赞按钮位置调整 2015-09-29 13:54:54 +08:00
lizanle ea3900b50a Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 12:05:40 +08:00
lizanle a8bb7ca2bc 导航 2015-09-29 12:05:30 +08:00
cxt e0b8b7195f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 11:05:46 +08:00
cxt 7f8acf55b8 个人首页作业列表配置菜单的隐藏 2015-09-29 11:05:31 +08:00
huang f9b3f2a1c3 删除版本库部分报错代码 2015-09-29 11:02:54 +08:00
huang 18d028bb7e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 10:52:39 +08:00
ouyangxuhua be4b5d94b0 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-29 10:50:39 +08:00
ouyangxuhua 4624e26999 启动作业匿评失败的信息提醒，判断是本人还是其他人 2015-09-29 10:50:16 +08:00
sw 3c0a497d4e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 10:49:04 +08:00
cxt 0ecfb7b935 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 10:49:18 +08:00
sw f2d3ec980a 点击发布作业，作业列表标题栏自动获得焦点 2015-09-29 10:48:50 +08:00
huang da4b00e56c Merge branch 'szzh' into dev_hjq 2015-09-29 10:46:19 +08:00
huang d75155e04a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-29 10:43:06 +08:00
huang 61061573a7 去掉版本库git操作指南 2015-09-29 10:42:17 +08:00
sw 22b9c6a866 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/courses.css
 2015-09-29 10:40:11 +08:00
sw 8585748a92 课程内作业列表界面样式调整 2015-09-29 10:38:14 +08:00
ouyangxuhua 073761781d Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-29 10:28:37 +08:00
cxt 4f20bb2969 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 10:26:41 +08:00
cxt dea03a4d9f 首页动态描述和回复的图片大小的调整和可点击 2015-09-29 10:26:22 +08:00
sw ad4fc50fbb 1、引入资源到作业移除部分css 
2、课程内点击作业列表加载更多
 2015-09-29 10:20:13 +08:00
ouyangxuhua 769a4a1bcf 1.增加issue截止日期提醒消息； 
2.修改相应rake代码
 2015-09-29 10:15:35 +08:00
lizanle b4cf2f87af Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 10:13:37 +08:00
lizanle eacd37d986 帖子的创建和编辑用编辑器 2015-09-29 10:13:25 +08:00
huang 5b0738a4cb 匿评启动失败邮件通知:实现程序及界面 2015-09-29 09:45:41 +08:00
sw 9a5dba7773 课程内发布、修改、删除作业后跳转仍在课程内的作业列表 2015-09-28 17:27:01 +08:00
sw 6194be8933 界面样式调整。js修改 
在课程内发布作业时无课程id
 2015-09-28 17:09:07 +08:00
ouyangxuhua b19007f56a 修改判断用户是老师的方法 2015-09-28 16:42:20 +08:00
huang 030f9e945e 优化消息整个界面代码 2015-09-28 16:14:53 +08:00
sw 35b1bc8069 课程内作业列表界面修改 2015-09-28 15:52:30 +08:00
huang 0a1798eb0b Merge branch 'szzh' into dev_hjq 2015-09-28 15:44:32 +08:00
huang c3422460ce 匿评失败邮件发送框架 2015-09-28 15:38:19 +08:00
huang 2873412d1a 修改邮件--每天发送-》内容为空的问题 2015-09-28 15:06:23 +08:00
ouyangxuhua afbfc9f8b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 14:46:23 +08:00
ouyangxuhua b58fcb58de 作业消息的内容更新； 
更改样式
 2015-09-28 14:45:59 +08:00
lizanle 41a6b8ab06 文件名称尽可能的显示完全 2015-09-28 14:35:55 +08:00
lizanle 08c2b9395e Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-28 14:20:33 +08:00
lizanle 4e7b0c5bdf 文件名称尽可能的显示完全 2015-09-28 14:20:23 +08:00
cxt ea18098a9d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 14:15:35 +08:00
cxt 5909df1f69 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 14:11:56 +08:00
lizanle 5e0ae3a6bb 编辑贴吧描述匡样式修改 2015-09-28 14:11:46 +08:00
cxt f5a6d5d349 首页的作业动态添加编辑菜单 2015-09-28 14:09:27 +08:00
lizanle ea515cbb5d Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-28 13:36:05 +08:00
lizanle f340941e3e 贴吧描述（历史数据）显示存在html代码 2015-09-28 13:35:59 +08:00
ouyangxuhua e4140ac411 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 13:29:17 +08:00
ouyangxuhua ab0013d659 1.项目问题中，问题类型为“周报”时，消息提示应为“发布了周报”； 
2.stylesheet_link_tag 中，prettify应该加上引号，否则报错。
 2015-09-28 13:29:02 +08:00
lizanle 5174e6eeb8 添加删除确认 2015-09-28 12:02:38 +08:00
lizanle 0b5b643a8e 附件与内容距离太大 2015-09-28 11:48:57 +08:00
lizanle f2dd69f9b6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-28 11:42:50 +08:00
lizanle 62bf136bea 标题内容 如果换行，那么就换行显示 2015-09-28 11:42:32 +08:00
ouyangxuhua f5de071191 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 11:22:18 +08:00
ouyangxuhua f8d7c61065 修改作业消息显示内容及样式 2015-09-28 11:22:00 +08:00
cxt 3254abf67f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 10:51:58 +08:00
cxt 6a3089bb9b 动态的回复图片超出边框 2015-09-28 10:51:24 +08:00
ouyangxuhua 29b4e174fd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 10:20:27 +08:00
ouyangxuhua f73865b771 1.修改作业消息的样式； 
2.解决系统消息时间显示问题。
 2015-09-28 10:20:14 +08:00
cxt 9190f0515d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 08:46:20 +08:00
huang c250945422 修改消息500问题 2015-09-25 18:19:23 +08:00
lizanle e092b6c36e Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 17:38:25 +08:00
lizanle 4845435aa3 帖子的编辑长度限制 2015-09-25 17:38:19 +08:00
sw aa07c3408f 项目资源增加TAG后点击报错 2015-09-25 17:18:01 +08:00
sw b84ec1360a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 16:58:57 +08:00
lizanle 745a32b684 资源库tag修改问题 2015-09-25 16:58:36 +08:00
sw 9b5a362e24 查看附件样式不正确 2015-09-25 16:57:36 +08:00
lizanle 9a5b83c898 如果没有大于两条回复。那么展开回复就要隐藏 2015-09-25 16:34:01 +08:00
cxt be932e3b1b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 16:32:41 +08:00
cxt c81e07d588 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-09-25 16:32:25 +08:00
lizanle 39c5571d73 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 16:32:07 +08:00
lizanle c3d829a68f 名称检查 2015-09-25 16:32:02 +08:00
ouyangxuhua 6857b62f00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 16:30:22 +08:00
ouyangxuhua 31c5cf2163 1.将作品评论、回复作品评论等加入至作业消息列表 2015-09-25 16:30:00 +08:00
cxt 223bac373f 课程动态的数据迁移 2015-09-25 16:29:47 +08:00
lizanle e0c338b497 限制字符长度 2015-09-25 16:20:51 +08:00
sw fd4a2b19c8 课程界面老师数量 2015-09-25 16:11:59 +08:00
lizanle a8812dd48e Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 16:11:20 +08:00
lizanle 959d3f1a93 万一长度过大，阻止提交 2015-09-25 16:11:12 +08:00
ouyangxuhua c906c7ee1d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 16:05:36 +08:00
ouyangxuhua 272bd2730a 消息中，更新了问题为留言时，去掉“留言内容”几个字； 
内容显示主题
 2015-09-25 16:05:19 +08:00
lizanle c8cbab2d50 火狐浏览器 和 ie浏览器的event获得 和 阻止 方式不同 2015-09-25 15:55:29 +08:00
lizanle 926bdd81e8 论坛名换行问题 2015-09-25 15:52:28 +08:00
lizanle a61e60d1b9 帖子内容会超出边框 2015-09-25 15:46:40 +08:00
lizanle 93542448e2 如果字符够了删除键 不能被屏蔽 2015-09-25 15:26:48 +08:00
lizanle 66ea9e3052 删除贴吧 取消也会被删除 2015-09-25 15:23:12 +08:00
lizanle 1ee00fcae4 论坛描述自动换行 2015-09-25 15:17:14 +08:00
lizanle fc1ec7135d Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 15:12:08 +08:00
lizanle b525f12a32 文件上传问题 2015-09-25 15:12:01 +08:00
sw 6c62b44b59 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:06:06 +08:00
lizanle befd8d66f6 编辑名称检查 2015-09-25 15:05:32 +08:00
sw 29fd5b41e2 调整用户搜索界面样式 2015-09-25 14:55:58 +08:00
sw 709e099770 增加部分作业关联表的判断 2015-09-25 14:33:33 +08:00
lizanle 35dd56d51c Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 12:32:03 +08:00
lizanle 7ef48f3fa3 标签修改的问题 2015-09-25 12:31:52 +08:00
ouyangxuhua b265b20753 1.消息中，回复了项目帖子，显示主题； 
2.回复了消息帖子的tips中，“内容”改为“回复内容”，并调整样式
 2015-09-25 12:01:21 +08:00
huang fa88e50bcd Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-25 11:47:13 +08:00
huang 8886bda790 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 11:46:15 +08:00
huang 44c097dbaf 1、issue回复添加新的编辑器 
2、解决issue回复含有html问题
3、解决项目动态中含有html问题
 2015-09-25 11:45:57 +08:00
ouyangxuhua c466ac876e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 11:22:50 +08:00
ouyangxuhua 123a6c862d 匿名用户评阅，修改样式 2015-09-25 11:22:35 +08:00
lizanle a763fc4860 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 11:17:38 +08:00
lizanle e4e1a0818e 论坛样式问题 2015-09-25 11:17:31 +08:00