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

443 Commits

Author SHA1 Message Date
huang a31ffbf8fb 教师栏目不能添加二级域名 2016-05-13 18:10:33 +08:00
huang 79e57e2b7f 代码和并冲突处理及连接参数 2016-05-13 17:00:25 +08:00
huang e8afcf9157 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/helpers/organizations_helper.rb
	app/views/organizations/_org_subfield_rightM2.html.erb
 2016-05-13 16:56:02 +08:00
huang 6ccb79a210 教师列表颜色 2016-05-13 16:47:56 +08:00
huang 6d484e15fd Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 16:30:57 +08:00
huang 39d014355b 科大名师，和名师列表添加标题 2016-05-13 16:30:45 +08:00
Tim d384d1e2b4 名师榜样式调整 2016-05-13 16:28:16 +08:00
Tim afbe5317cb Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 16:11:35 +08:00
Tim a88ab59489 名师榜添加右侧banner 2016-05-13 16:11:10 +08:00
huang 467ee60657 名师默认显示5个，没有则不显示 2016-05-13 15:37:04 +08:00
huang 33a3b22430 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/org2.css
 2016-05-13 15:12:26 +08:00
huang 5ae580aab0 添加用户连接 2016-05-13 15:10:34 +08:00
huang 660cf7ef73 名师列表局部搜索 2016-05-13 14:52:33 +08:00
huang 91f3fddb16 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 14:23:48 +08:00
huang 0feb1280fd 名师更多列表 
及相关入口路由
 2016-05-13 14:23:36 +08:00
Tim 4ea7d5ed57 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 14:08:48 +08:00
Tim dc92e821a3 名师榜样式调整 2016-05-13 14:08:34 +08:00
huang e90da9d812 teachers页面 2016-05-13 14:00:05 +08:00
huang 3853d5b7ad 右三模式定制 2016-05-13 13:39:44 +08:00
huang 457bac0b9d 0 2016-05-13 11:30:49 +08:00
huang 7bd047f7e4 组织模式二中名师榜样式 2016-05-13 11:25:05 +08:00
huang f7a888ac3d 名师默认创建 2016-05-13 11:11:09 +08:00
huang 1673ae451b 名师榜新增一个后就不能再新增 2016-05-13 10:50:34 +08:00
huang 83ac35cc94 不同的组织定制是否允许设置名师榜 2016-05-13 10:29:22 +08:00
huang 37ee03374e 完成设置名师功能 2016-05-13 09:53:22 +08:00
cxt 0f61994252 点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品 2016-05-12 17:49:07 +08:00
huang 2be8e64748 内容和查看更多重复问题 2016-05-12 16:00:23 +08:00
huang ad2f12c9d0 名师列表搜索功能 2016-05-12 15:02:23 +08:00
cxt 7481d96166 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/admin_controller.rb
	config/routes.rb
	lib/redmine.rb
 2016-05-12 10:40:35 +08:00
huang 52c8593b09 组织教师列表sql优化 2016-05-11 16:20:55 +08:00
cxt 9bc8ccbb9e 教辅可只评语不评分 2016-05-11 09:18:55 +08:00
huang cabac5914c 学生统计数 2016-05-10 13:41:21 +08:00
huang e99aa2f199 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-10 11:33:19 +08:00
huang 99d9a28828 名师榜sql查询 2016-05-10 11:33:02 +08:00
Tim c8e0ffbdae 左二和右二文字隐藏时的更多显示 2016-05-10 10:30:28 +08:00
huang ccc4ddc325 组织编辑问题 2016-05-10 10:18:47 +08:00
huang 5880a12290 sql查询 2016-05-10 10:00:28 +08:00
huang fc36e4c01e 教师列表 2016-05-09 18:10:22 +08:00
cxt 1eb41478b2 课程动态和首页动态中的作业动态实现二级回复 2016-05-09 17:06:10 +08:00
huang a98678e001 列表中类型显示方法封装 2016-05-09 15:00:50 +08:00
huang 878bcc8cf1 栏目创建类型添加老师、学生类型 2016-05-09 14:43:28 +08:00
huang 7a0d86228a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-06 22:57:29 +08:00
huang 635d49cc25 course->课程动态 
project->项目动态
 2016-05-06 22:57:05 +08:00
cxt e03bc42c53 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/words_controller.rb
 2016-05-06 22:53:16 +08:00
huang 96ce1d8d40 | 及更多问题 2016-05-06 22:35:17 +08:00
huang 6401afb850 二级目录排序同步 2016-05-06 22:30:44 +08:00
huang 9a80ff0597 右一添加“更多”链接 2016-05-06 22:21:52 +08:00
cxt 90809ea350 首页报500 2016-05-06 22:18:31 +08:00
cxt b8f7672424 项目动态的更新时间更新到作业动态中 2016-05-06 22:02:45 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-06 22:02:22 +08:00