Commit Graph

134 Commits

Author SHA1 Message Date
yuanke 65bd77f0ff 微信二维码过期问题修改 2016-09-18 10:50:40 +08:00
cxt 85cd113cf9 日志修改 2016-08-12 10:20:58 +08:00
cxt 322868f063 班级的课程id变为空时打印日志 2016-08-11 15:58:49 +08:00
guange 5c0468f8fd 二维码过期改为一个月有效期 2016-07-08 17:18:09 +08:00
guange 068c8967e1 新增班级时名称为1个字符时报错 2016-07-08 17:04:17 +08:00
guange 48fb02a2d6 管理课程 2016-07-04 17:04:06 +08:00
guange 60367415fa 新建课程功能完成 2016-07-04 16:19:05 +08:00
cxt bdaa9983e3 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-07-01 11:30:24 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
guange 222855ea79 越过course表的validate,以防save invitecode 失败 2016-06-28 19:19:59 +08:00
guange 3c425edc3c 修复邀请码会变的问题 2016-06-28 17:46:27 +08:00
guange 3b383dfa65 老师课程界面 2016-06-27 16:03:07 +08:00
guange c501af70ba . 2016-06-27 11:09:25 +08:00
cxt 260759e4db Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-24 15:36:03 +08:00
guange da09983f9e Merge branch 'weixin_guange' into cxt_course 2016-06-24 15:34:32 +08:00
cxt ac629440b1 课程邀请码 2016-06-24 15:33:45 +08:00
guange 16a9f017b6 error 2016-06-24 15:28:44 +08:00
guange 485d0e3743 ticket处理 2016-06-24 14:59:50 +08:00
guange d348981721 加入邀请码 2016-06-24 13:29:36 +08:00
guange 98c6548e39 重写登录和注册 2016-06-17 18:18:03 +08:00
guange 8fd4d518b2 添加邀请码 2016-06-15 13:44:28 +08:00
cxt 6100abe0da 课程大纲 2016-06-14 10:38:11 +08:00
huang e1a84de213 Merge branch 'cxt_course' into hjq_new_course
Conflicts:
	app/models/course.rb
	public/stylesheets/courses.css
2016-01-20 17:05:28 +08:00
huang 0db69e1ebf 解决课程导语时间和课程创建动态时间一致的问题 2016-01-20 16:32:47 +08:00
huang 18c3c23d2c 课程推荐 2016-01-20 15:43:33 +08:00
huang 610b54b27c 课程导语放置课程动态之后 2016-01-19 10:29:57 +08:00
huang b93b86b9a0 创建课程发送board 2016-01-18 17:16:33 +08:00
huang ef0a2a54c5 精品课程推荐 2016-01-18 15:48:26 +08:00
cxt 902cfdcbe9 课程/项目的创建动态不需要显示更新时间 2016-01-15 10:29:55 +08:00
cxt 27617044a1 课程项目报500 2016-01-14 10:58:11 +08:00
cxt b48a2848b0 首页、课程、项目、组织动态增加更新时间 2016-01-12 15:53:15 +08:00
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2015-12-11 15:00:35 +08:00
cxt a3715051b1 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 14:59:13 +08:00
lizanle 7f866a0b3a 课程被删除后不能被搜索 2015-12-10 10:00:14 +08:00
lizanle 2fbad38522 优化排序参数
用于排序的字段最好不要分词
不然就是多值字段的排序会浪费大量的内存
2015-12-09 12:57:25 +08:00
huang 916d99be82 课程删除功能 2015-12-08 16:45:26 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
ouyangxuhua cf41b13f3a 增加组织表和组织课程表的关联删除 2015-12-02 17:38:41 +08:00
lizanle b2bca65025 分片默认为5 2015-12-01 10:33:57 +08:00
lizanle 96290ad975 Merge branch 'szzh' into dev_zanle
Conflicts:
	app/models/attachment.rb
	db/schema.rb
2015-11-27 18:47:19 +08:00
lizanle 582cd6f5d4 Merge branch 'szzh' into dev_zanle
Conflicts:
	app/models/attachment.rb
	db/schema.rb
2015-11-27 18:47:02 +08:00
lizanle e710f443c2 全站搜索 2015-11-27 15:17:17 +08:00
lizanle 7cb39d1754 全站搜索 2015-11-27 10:40:58 +08:00
lizanle ee47187a61 全站搜索 2015-11-27 09:52:51 +08:00
lizanle dcd441a9db 全站搜索 2015-11-26 16:43:10 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
huang c8b1cae947 建立贡献榜表及相关关联
部分页面
按总分排序(英雄榜)
部分页面(未完成)
2015-11-25 15:16:33 +08:00
huang dd148fb7c5 Merge branch 'szzh' into sw_new_course
Conflicts:
	db/schema.rb
2015-11-20 20:25:17 +08:00
ouyangxuhua 71bf80c7a5 1.创建组织课程关联表,建立相应模型及控制器;
2.在课程设置中,添加加入组中功能;
3.解决添加项目后,组织列表的上一页和下一页链接问题。
2015-11-17 17:34:50 +08:00
sw 70c5b27a43 相关路由 2015-11-13 16:40:39 +08:00