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

466 Commits

Author SHA1 Message Date
cxt c8467a50a0 自己可以给自己点赞 2016-05-25 16:19:41 +08:00
cxt 5c9ec49457 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-25 15:27:00 +08:00
Tim 1c0a68e57b 组织配置成员tab，搜索结果太多导致换页断行问题 2016-05-24 15:47:22 +08:00
huang e10bc46361 Merge branch 'yuanke' into develop 2016-05-20 18:59:54 +08:00
yuanke bc8171501d 解决组织文章设为首页报500 2016-05-20 18:40:39 +08:00
huang d108f0a684 Merge branch 'yuanke' into develop 2016-05-20 15:37:44 +08:00
huang 5cefedd20a Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
 2016-05-20 15:35:08 +08:00
yuanke ded5f8f861 页面中显示KE内容的地方都加上自动识别网址的函数 2016-05-20 15:30:25 +08:00
huang 80f829c018 解决搜索不能用的问题 2016-05-20 10:48:17 +08:00
huang faf5e89cc2 Merge branch 'weixin_guange' into develop 
Conflicts:
	1234567
	app/views/blogs/_article.html.erb
	db/schema.rb
 2016-05-19 16:04:27 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
cxt 6517f23f03 首页不显示项目的创建动态 2016-05-19 15:26:23 +08:00
Tim 70ff3e2c19 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-17 11:24:42 +08:00
Tim 0b2fe1d88a 分组作业样式 2016-05-17 11:24:29 +08:00
huang 20e8627b02 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-17 09:52:51 +08:00
huang 326c3a84a0 还原域名问题 2016-05-17 09:52:26 +08:00
Tim 76d1251546 将组织门户登录栏挪到与logo同行 2016-05-17 09:36:55 +08:00
huang b0f9d0280f 0 2016-05-17 09:06:38 +08:00
huang 13cc5ceaa6 model中添加获取二级域名的方法 2016-05-17 09:02:17 +08:00
huang 5ee6c9e5d3 子域名添加成员问题 2016-05-16 18:08:05 +08:00
huang 6cca44df98 组织项目、课程动态问题 2016-05-16 14:53:40 +08:00
huang 2484d642a1 组织500问题 2016-05-16 14:19:04 +08:00
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