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

621 Commits

Author SHA1 Message Date
Tim 1658f78a7b Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/users/_user_resource_info.html.erb
 2016-07-05 15:38:56 +08:00
cxt 2956b08f40 分组作业：去掉组员“追加附件”的入口 2016-07-05 10:32:46 +08:00
yuanke a7ecfba23b Merge branch 'yuanke_org' into develop 2016-07-01 17:52:23 +08:00
yuanke 547d5409bb 组织中的课程字样改为班级 2016-07-01 17:43:38 +08:00
cxt bdaa9983e3 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 11:30:24 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
yuanke ab99645148 Merge branch 'yuanke' into develop 2016-06-27 15:52:01 +08:00
yuanke 5c2ac3e02f 修改删除组织成员跨域的BUG 2016-06-27 15:47:06 +08:00
Tim a3738c4cb2 新建组织，题库和资源库弹框样式检查 2016-06-24 15:42:42 +08:00
yuanke c6be37020f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_reply_to.html.erb
 2016-06-24 15:11:52 +08:00
yuanke c61c14fa97 Merge branch 'yuanke' into develop 2016-06-24 14:35:59 +08:00
yuanke 86a5eccae6 组织设置中添加成员BUG解决 2016-06-24 14:16:39 +08:00
yuanke 64d87b7398 修改组织添加成员的BUG 2016-06-24 13:50:28 +08:00
yuanke 2a971c3bc6 修改有的组织添加成员的BUG 2016-06-24 11:24:48 +08:00
Tim 8a6bbf50a9 css文件替换 2016-06-24 09:30:46 +08:00
cxt 3f8beaf97c 动态回复banner的代码重构 2016-06-21 16:53:31 +08:00
huang fce93de296 500问题 2016-06-17 18:03:58 +08:00
huang 6af0bf7b83 组织样式 2016-06-17 17:35:46 +08:00
yuanke 811afbdf33 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-17 14:43:25 +08:00
huang 7d68df79a0 组织合并凌彬代码500问题 2016-06-17 14:44:12 +08:00
yuanke d6d9a366f2 Merge branch 'develop' into yuanke 
Conflicts:
	public/stylesheets/new_user.css
 2016-06-17 14:36:12 +08:00
huang 0f17ac0e9e Merge branch 'lingbing' into develop 
Conflicts:
	app/views/organizations/_org_custom_header.html.erb
 2016-06-17 14:33:31 +08:00
yuanke c51c73f225 所有回复添加未登录提示 2016-06-17 14:31:14 +08:00
yuanke 3ae26a6530 组织配置页面 名师列表 热门项目 学霸 精品课程的右上角字样只对超级管理员显示,图片显示时如果已经带了链接则不增加点击弹框效果。 2016-06-17 11:23:49 +08:00
huang d75a8bc35a Merge branch 'hjq_beidou' into develop 2016-06-15 14:49:10 +08:00
yuanke 7b6e8fbc53 修改组织点击登录后可回复报500的BUG 2016-06-15 14:33:25 +08:00
Linda 01bd394a59 门户首页按照祎欣0613版本设计修改 2016-06-14 15:08:13 +08:00
huang d4d4e38c41 门户模式中含有三级域名的用户图像https问题 2016-06-12 16:48:35 +08:00
huang 9d3bb44682 简洁模式 2016-06-12 16:04:26 +08:00
huang 928d71500d 门户模式--组织栏目没有动态时显示位置 2016-06-12 13:45:22 +08:00
huang d18094cc92 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-12 13:36:53 +08:00
huang 78b445a7ae 组织历史数据迁移 模式术语修改， 配置页面域名长度问题 2016-06-12 13:36:35 +08:00
yuanke 7504b353c9 组织报500问题修复 2016-06-08 16:50:13 +08:00
huang 871a4d2d7b 组织设为首页500问题 2016-06-08 13:15:08 +08:00
huang 3e3c300273 Merge branch 'cxt_course' into develop 2016-06-08 11:37:58 +08:00
huang 6cdccc3b08 设置首页显示问题 2016-06-08 10:53:56 +08:00
huang 67f0cad331 组织网站动态新页面 2016-06-08 09:40:05 +08:00
huang e4f48f046b 子页面没有内容显示 2016-06-08 09:16:57 +08:00
huang 9c01bb63e7 配置页面管理员栏目权限控制 2016-06-07 17:36:33 +08:00
huang a8b68d64ee 导航权限控制 2016-06-07 17:19:19 +08:00
huang 09ff5954bd 字体过长演示问题（模式二子页面） 2016-06-07 16:56:20 +08:00
huang c3db6afd75 模式二导航栏 2016-06-07 16:42:33 +08:00
cxt 196c92f9c4 动态回复最多只加赞三条，点击展开更多时才加载余下的回复 2016-06-07 16:02:00 +08:00
huang 59988f17da 帖子目录界面 2016-06-07 14:48:43 +08:00
huang 793978f196 组织--名师、学霸：如图搜索结果有多页，翻页后建议输入的搜索条件仍显示在搜索框内 2016-06-06 16:15:35 +08:00
huang c6d36bd738 未登录留言判断 2016-06-06 14:21:58 +08:00
huang 7cce01872d 名字样式 2016-06-03 18:11:42 +08:00
huang 57f3cf713c 去掉搜索 2016-06-03 17:50:40 +08:00
huang acc808f003 样式问题 2016-06-03 17:24:45 +08:00
huang 429deefadf 右一线条样式问题 2016-06-03 17:14:28 +08:00
huang 65bf816ea4 帖子设为首页后，不在模式二中显示问题 2016-06-03 17:03:35 +08:00
huang ea19f19973 500问题 2016-06-03 16:30:20 +08:00
huang c7866af1e8 组织编辑成员的时候样式乱的问题 2016-06-03 16:14:45 +08:00
huang 43e586aa90 标题过长隐藏效果 2016-06-03 15:50:52 +08:00
huang 1e34a4f174 显示样式一级添加二级目录权限 2016-06-03 14:43:20 +08:00
huang 875a604780 热点项目描述内容的字数 2016-06-03 14:31:49 +08:00
huang fa2437cdf6 添加课程学期 2016-06-03 14:28:12 +08:00
huang 1f43ecb8ed 隐藏与配置界面一致， 2016-06-03 14:19:52 +08:00
huang 2d2e9c540a 默认图片及顺序 2016-06-03 14:14:50 +08:00
huang 7be18b80b4 组织链接 2016-06-03 13:45:53 +08:00
huang 3af115ee54 组织新版样式，及方法优化 2016-06-03 12:42:02 +08:00
huang a0f722837b 精品课程加入到左模式二 2016-06-03 10:47:57 +08:00
huang a1200a41b0 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-06-03 10:31:52 +08:00
huang ca3b072f85 热门项目按照项目得分排序及设置界面中默认设置 2016-06-03 10:31:29 +08:00
Tim 3c6c617d09 门户样式冲突问题 2016-06-03 10:08:54 +08:00
Tim 57bb2f69a4 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/organizations/_org_custom_right2.html.erb
 2016-06-03 09:12:36 +08:00
Tim bb9c9ddddf 添加链接鼠标覆盖蓝色效果 2016-06-03 09:11:49 +08:00
huang fa03867cc2 样式神略问题 2016-06-03 08:56:54 +08:00
huang 6fbad6d53d 右二优化 2016-06-03 08:45:43 +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 76732a3034 新模式有一 2016-06-02 13:17:38 +08:00
huang e5eeba90f6 组织精品课程，热门项目 2016-06-02 09:52:06 +08:00
huang 27a9170318 组织添加设为精品项目，热门课程 2016-06-01 17:38:41 +08:00
huang b1cb4e5f94 完成左一的配置 2016-06-01 14:31:42 +08:00
huang 2acc545896 完成组织左二模式 2016-06-01 10:24:50 +08:00
huang 5c27aee2bd 模式二课程模块 定义公共方法（显示描述内容以省略号结束） 2016-06-01 09:08:08 +08:00
huang 9ecdf0892b 完成左三模式的配置 2016-05-31 20:45:54 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
huang a96fafd704 模式三（未完） 2016-05-31 18:37:21 +08:00
huang 8d56d8556f 完成模式6 2016-05-31 16:03:48 +08:00
huang bb7204846f 新版资源类型定制模式6 2016-05-31 14:41:50 +08:00
huang 6bfe344cbf 组织模式一左侧权限控制 2016-05-31 13:59:29 +08:00
huang 8f897cbf89 组织管理员模式，二级目录局部刷新 2016-05-31 13:47:05 +08:00
huang c369b271a0 组织管理员配置后的权限控制及局部刷新 2016-05-31 11:24:47 +08:00
huang c333a0c55d 组织管理员提供学霸功能 2016-05-31 10:31:08 +08:00
huang c57c575c84 新版组织静态页面模板 2016-05-30 16:24:51 +08:00
huang 471ed7cbd2 组织logo获取，添加样式图片 2016-05-30 14:58:46 +08:00
huang 81ab73e286 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/organizations/_org_custom_header.html.erb
 2016-05-30 14:48:12 +08:00
huang 698e4bd7b3 header 2016-05-30 14:41:53 +08:00
Tim 9cc749bd57 门户样式统一，防止冲突 2016-05-30 14:38:57 +08:00
huang 46e4f2c143 组织新base框架 2016-05-30 14:23:52 +08:00
huang 12ac353de9 北斗新base 2016-05-27 17:08:50 +08:00
yuanke d08809bfbd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/project.css
 2016-05-27 15:34:55 +08:00
huang ff14809237 Merge branch 'cxt_course' into develop 2016-05-27 15:30:35 +08:00
yuanke cfc3751f6f Merge branch 'yuanke' into develop 2016-05-27 14:01:02 +08:00
cxt c8467a50a0 自己可以给自己点赞 2016-05-25 16:19:41 +08:00