Commit Graph

14536 Commits

Author SHA1 Message Date
Tim 709ceca1a8 托代码改动 2016-06-03 08:41:14 +08:00
huang 0eb6dbe48a Merge branch 'huang_temp2' into develop
Conflicts:
	app/views/layouts/base_org2.html.erb
2016-06-03 08:30:31 +08:00
huang 257165dbaf 模式二中添加课程定配 2016-06-02 21:32:56 +08:00
huang e2848f4dec 创建栏目时默认状态 2016-06-02 21:10:07 +08:00
huang dc4f927c39 完成右二模式 2016-06-02 21:01:39 +08:00
huang 52bc4aab81 右二(未完) 2016-06-02 18:46:15 +08:00
huang 0b3ec0322f 右一模式 2016-06-02 18:41:00 +08:00
huang e05e6ba53d 样式对齐问题 2016-06-02 18:04:00 +08:00
huang 5d880db18e 详情页面没登陆可以回复 2016-06-02 17:54:12 +08:00
huang fb1a13a522 隐藏版本库功能 2016-06-02 17:05:51 +08:00
huang d047409d31 项目动态 2016-06-02 16:01:58 +08:00
huang 74ee3205bd 淘宝源 2016-06-02 15:47:17 +08:00
cxt 184c17d52f “显示明码”弹出undefined 2016-06-02 15:34:43 +08:00
yuanke c3c639aa77 超链接颜色修改 2016-06-02 15:27:16 +08:00
cxt 04764a0e4f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-02 15:26:30 +08:00
huang ba344a86b5 颜色 2016-06-02 14:59:32 +08:00
huang d532cd3c6c 权限 2016-06-02 14:58:13 +08:00
huang e374b1679f 权限 2016-06-02 14:54:54 +08:00
huang 135e50b2e7 链接 2016-06-02 14:54:04 +08:00
huang 1f073c19ae 域名问题 2016-06-02 13:57:07 +08:00
cxt 3d9b7aedb1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-02 13:56:29 +08:00
cxt 2431ef6986 模板消息引起的问题 2016-06-02 13:56:11 +08:00
yuanke 0d38fa53a2 1.issue编辑器定下最高高度到了改为滚动条
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别? 和cn等
5.KE缩进修改等
2016-06-02 13:55:40 +08:00
Tim ed46ca0735 可拖拽作业列表 2016-06-02 13:45:06 +08:00
huang 22cafdbd05 二级目录弹出 2016-06-02 13:43:30 +08:00
huang 31f3d74b0f 组织栏目中,匿名用户可以回复 2016-06-02 13:37:38 +08:00
huang eecf12eda6 添加链接 2016-06-02 13:32:50 +08:00
huang 76732a3034 新模式有一 2016-06-02 13:17:38 +08:00
cxt b6c4c6a68c Merge branch 'cxt_course' into develop 2016-06-02 11:01:00 +08:00
cxt b20dc06e23 微信测试版配置修改 2016-06-02 10:56:04 +08:00
cxt 747128750c Merge branch 'weixin_guange' into cxt_course 2016-06-02 10:42:04 +08:00
cxt b72ad364db 微信模板消息:用户绑定成功、作业消息、个人留言、班级通知 2016-06-02 10:39:11 +08:00
huang e5eeba90f6 组织精品课程,热门项目 2016-06-02 09:52:06 +08:00
huang 27a9170318 组织添加设为精品项目,热门课程 2016-06-01 17:38:41 +08:00
Tim 308f247c71 可拖拽调整 2016-06-01 16:09:01 +08:00
cxt 32dca93b59 统一项目反馈、课程留言、讨论区的回复显示:显示留言者姓名 2016-06-01 15:35:26 +08:00
cxt fa73171818 点击“课程活跃度”和“课程英雄榜”跳到学生列表,并分别以“活跃度”、“英雄榜”倒序排列 2016-06-01 14:58:59 +08:00
huang b1cb4e5f94 完成左一的配置 2016-06-01 14:31:42 +08:00
cxt 5097abbe1e Merge branch 'develop' into cxt_course 2016-06-01 14:22:43 +08:00
cxt cba5b246bc 微信动态的返回不刷新 2016-06-01 14:14:24 +08:00
Tim 3b55e9e39b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	app/views/student_work/_evaluation_un_title.html.erb
	app/views/student_work/_evaluation_un_work.html.erb
2016-06-01 13:59:01 +08:00
Tim 513fe1a93d 作品列表可拖拽 2016-06-01 13:46:05 +08:00
huang 2acc545896 完成组织左二模式 2016-06-01 10:24:50 +08:00
huang 5c27aee2bd 模式二课程模块 定义公共方法(显示描述内容以省略号结束) 2016-06-01 09:08:08 +08:00
cxt 0cc8cb9928 刚提交的回复时间显示为“刚刚” 2016-06-01 08:57:27 +08:00
guange 51d3fc3aad 更多修复 2016-05-31 21:31:36 +08:00
guange ceffa6c2c8 更多修复 2016-05-31 21:27:00 +08:00
guange 03357388bd 更多修复 2016-05-31 21:26:31 +08:00
guange 553a02c89d 更多修复 2016-05-31 21:22:44 +08:00
guange c26d544772 更多修复 2016-05-31 21:15:31 +08:00