Commit Graph

14491 Commits

Author SHA1 Message Date
huang 7e44eb1577 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-08 10:02:24 +08:00
huang 49406681ef 详情页面留言为空的问题 2016-06-08 10:02:10 +08:00
yuanke 41efa6456a Merge branch 'yuanke' into develop 2016-06-08 09:41:41 +08:00
yuanke ec39c16c66 Merge branch 'develop' into yuanke 2016-06-08 09:41:18 +08:00
huang 67f0cad331 组织网站动态新页面 2016-06-08 09:40:05 +08:00
huang e4f48f046b 子页面没有内容显示 2016-06-08 09:16:57 +08:00
txz 24a17d719e Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-08 09:15:41 +08:00
txz 9b4a3a704d 锁定帖子不能回复 2016-06-08 09:15:35 +08:00
yuanke 5999189f3a 1.视频根据http还是https分类显示。
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
2016-06-08 09:02:00 +08:00
guange b965698fdf merge 2016-06-07 17:45:19 +08:00
guange 8b05b33e38 不刷新返回 2016-06-07 17:38:38 +08:00
huang fdb1846f75 Merge branch 'hjq_beidou' into develop 2016-06-07 17:37:38 +08:00
huang 9c01bb63e7 配置页面管理员栏目权限控制 2016-06-07 17:36:33 +08:00
guange 1251e31061 不刷新返回 2016-06-07 17:36:11 +08:00
guange 37975552c9 base 2016-06-07 17:27:17 +08:00
guange 5b34f498c9 base 2016-06-07 17:23:56 +08:00
guange fbfb382d78 base 2016-06-07 17:22:57 +08:00
huang a8b68d64ee 导航权限控制 2016-06-07 17:19:19 +08:00
guange f993fa87ff base 2016-06-07 17:18:28 +08:00
guange 8fb88dfdea base 2016-06-07 17:17:14 +08:00
guange 5fe41d80e9 base 2016-06-07 17:06:13 +08:00
guange b01a671fb4 base 2016-06-07 16:59:26 +08:00
huang 09ff5954bd 字体过长演示问题(模式二子页面) 2016-06-07 16:56:20 +08:00
guange 81e35de2b6 base 2016-06-07 16:47:06 +08:00
guange 90ac57ed6a base 2016-06-07 16:46:10 +08:00
guange eee8a8adb6 fix 2016-06-07 16:43:37 +08:00
huang c3db6afd75 模式二导航栏 2016-06-07 16:42:33 +08:00
guange 33780759a9 修改为html5mode 2016-06-07 16:39:42 +08:00
huang 3e2810129b 课程留言动态过滤掉 2016-06-07 16:24:02 +08:00
cxt 385ff03c88 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-07 16:15:31 +08:00
cxt 768d91278d 微信提示信息的修改 2016-06-07 16:15:25 +08:00
huang c5bccf1adb 组织动态按更新时间排序 2016-06-07 16:02:46 +08:00
Tim c5e6514c18 作品列表排序图标float消除 2016-06-07 16:02:20 +08:00
cxt de58cfb5e5 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-07 16:02:08 +08:00
cxt 196c92f9c4 动态回复最多只加赞三条,点击展开更多时才加载余下的回复 2016-06-07 16:02:00 +08:00
huang acf4a64e6a 二级帖子子页面 2016-06-07 15:40:28 +08:00
guange f5da2ba5f6 将current page提前 2016-06-07 15:40:16 +08:00
Tim 1d44116841 作品列表可拖拽 2016-06-07 15:30:17 +08:00
huang 59988f17da 帖子目录界面 2016-06-07 14:48:43 +08:00
huang 1553eadc58 宽度改成1000二级目录模式二样式调整 2016-06-07 10:17:16 +08:00
Tim 253d9da345 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-07 09:01:53 +08:00
huang d191792894 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-06-06 18:24:34 +08:00
huang b8d49f0079 0 2016-06-06 18:24:12 +08:00
Tim a96470ad66 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-06-06 16:42:53 +08:00
Tim 5b2c22d264 历史版本名称过长导致折行 2016-06-06 16:42:41 +08:00
cxt 9594edd45e Merge branch 'develop' into cxt_course 2016-06-06 16:35:41 +08:00
huang 793978f196 组织--名师、学霸:如图搜索结果有多页,翻页后建议输入的搜索条件仍显示在搜索框内 2016-06-06 16:15:35 +08:00
huang 21197c95b3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-06 15:11:59 +08:00
huang 28c67d42cb Merge branch 'hjq_beidou' into develop 2016-06-06 15:11:37 +08:00
huang bfa447c195 未登录状态下anonymos改为未登录 2016-06-06 15:11:07 +08:00