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

1921 Commits

Author SHA1 Message Date
cxt 3ccdf7f9ae 课程问答区，项目讨论区的帖子消息通知应直接打开对应的帖子详情界面 2016-07-05 15:00:41 +08:00
cxt 17a2686d42 班级左侧头部信息的样式调整 2016-07-05 11:22:58 +08:00
cxt 23eefc2b7f 班级主页：建议将如图所示适当往上调一点，与左侧头像对齐 2016-07-05 10:15:24 +08:00
yuanke 447e624f36 课程大纲bug修复 2016-07-01 21:38:37 +08:00
cxt e834d09469 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 17:52:29 +08:00
cxt 5a1090c0e1 bug修复 2016-07-01 17:27:34 +08:00
cxt 6867a88a94 课程大纲样式调整 2016-07-01 16:41:13 +08:00
cxt 0ff8f0a774 课程大纲的删除和课程大纲描述的删除 2016-07-01 16:25:52 +08:00
cxt 25b5d74a42 课程大纲的修改 2016-07-01 15:25:30 +08:00
cxt 18d677c5eb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/courses.css
 2016-07-01 11:31:51 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
yuanke 397c4cc2a5 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +08:00
Tim ba1db91a1e css优化调整 2016-06-30 15:38:00 +08:00
cxt ac4218bfb0 课程大纲列表 2016-06-30 15:36:46 +08:00
cxt ebb697a49f 班级列表、课程大纲的编辑、回复、课程列表 2016-06-30 10:44:11 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
cxt 383483de26 课程大纲的左侧栏base，新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
cxt 76e7c50bf4 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_reply_to.html.erb
 2016-06-24 16:52:00 +08:00
cxt afc8fad7fd 通过邀请码加入课程 2016-06-24 16:12:24 +08:00
cxt ac629440b1 课程邀请码 2016-06-24 15:33:45 +08:00
Tim 8a6bbf50a9 css文件替换 2016-06-24 09:30:46 +08:00
cxt 44334913ee 未读消息弹窗漏了一条消息 2016-06-21 14:28:26 +08:00
cxt c4cea93a44 消息列表的“展开更多”指针手势修改 2016-06-21 13:58:17 +08:00
cxt 4f80e259e8 消息弹窗的延时显示 2016-06-21 11:16:45 +08:00
cxt f4d67bc027 未读消息弹窗“点击展开”显示10条未读消息 2016-06-20 16:03:57 +08:00
cxt 048bb7fed5 头像下拉菜单、未读消息的延时 2016-06-20 15:38:43 +08:00
cxt b26a6b5195 消息弹窗的链接无效 2016-06-20 11:24:34 +08:00
huang 8741917823 访问统计 （自2016年5月） 2016-06-17 14:31:42 +08:00
cxt 1dac05c6d1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-17 11:26:58 +08:00
huang d127c6e12c 访问添加自某年某月 2016-06-17 09:45:10 +08:00
huang 5e3df51ad9 完成新版登录注册 2016-06-16 10:21:21 +08:00
Tim 9cd1630651 优化css添加，将课程，项目，个人主页，组织首页样式替换，登录与个人主页详细css替换 2016-06-16 08:52:13 +08:00
huang 06f97d5cb7 注册页面（未完） 2016-06-15 17:24:46 +08:00
cxt 03b92f8570 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-15 17:23:23 +08:00
huang a2c5cc6da1 登录界面base及新页面 2016-06-15 15:41:13 +08:00
yuanke 44c9265fee 个人主页个性签名增加自动识别url 2016-06-13 15:29:15 +08:00
cxt 24f5e245df 鼠标经过消息通知时弹窗显示最新的5条未读消息 2016-06-12 14:20:55 +08:00
huang fdb1846f75 Merge branch 'hjq_beidou' into develop 2016-06-07 17:37:38 +08:00
huang 1553eadc58 宽度改成1000二级目录模式二样式调整 2016-06-07 10:17:16 +08:00
cxt 0bf46f2ecd 帮助中心的弹框 2016-06-06 15:03:21 +08:00
cxt ee12b3540b 消息弹窗的还原、微信配置修改 2016-06-06 11:05:25 +08:00
cxt ffe447e5bc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 16:28:23 +08:00
cxt d27a050ffa 消息弹窗的显示 2016-06-03 16:28:11 +08:00
huang b128ba5257 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-06-03 14:58:37 +08:00
huang 3af115ee54 组织新版样式，及方法优化 2016-06-03 12:42:02 +08:00
cxt b833c1f0a4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 09:13:19 +08:00
cxt 1396cae14c 消息弹框 2016-06-03 08:59:17 +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 d047409d31 项目动态 2016-06-02 16:01:58 +08:00
huang ba344a86b5 颜色 2016-06-02 14:59:32 +08:00
huang d532cd3c6c 权限 2016-06-02 14:58:13 +08:00
huang 135e50b2e7 链接 2016-06-02 14:54:04 +08:00
huang 1f073c19ae 域名问题 2016-06-02 13:57:07 +08:00
huang 22cafdbd05 二级目录弹出 2016-06-02 13:43:30 +08:00
huang eecf12eda6 添加链接 2016-06-02 13:32:50 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
huang c57c575c84 新版组织静态页面模板 2016-05-30 16:24:51 +08:00
cxt d4c0e9754a 课程描述展开后应显示“收起描述信息” 2016-05-30 14:51:54 +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
cxt 5c9ec49457 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-25 15:27:00 +08:00
huang 2abb68c00c 组织代码公共部分整理 2016-05-25 10:54:49 +08:00
Tim 65c7719ed2 设置大纲图标在讨论区换行显示问题 2016-05-24 15:18:11 +08:00
huang 0e03798f6e 组织框架结构（yeild）修改 2016-05-23 16:24:32 +08:00
huang e9c35ae20f 组织未登录情况默认图片展示 2016-05-17 10:13:03 +08:00
Tim 15ea9a9659 组织门户自动播放禁用 2016-05-17 10:04:23 +08:00
Tim 1402ae190d 组织头像 2016-05-17 10:03:26 +08:00
Tim 76d1251546 将组织门户登录栏挪到与logo同行 2016-05-17 09:36:55 +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 7bd047f7e4 组织模式二中名师榜样式 2016-05-13 11:25:05 +08:00
cxt d303a06377 首页列表的排序 2016-05-10 11:32:20 +08:00
Tim 2461a5c918 组织门户二级目录位置重新设置 2016-05-09 19:40:53 +08:00
Tim c2e7a77150 组织门户二级菜单延迟隐藏 2016-05-09 19:23:33 +08:00
Tim cf1cf58bab 组织门户二级目录添加分栏"|"以及登录未登录位置控制 2016-05-09 18:44:20 +08:00
huang 967a76af67 图片变大的问题 2016-05-06 20:20:48 +08:00
huang 3469d928d8 图片变的很大问题 2016-05-06 20:17:11 +08:00
huang 23a23fd085 组织logo上传图片 2016-05-06 19:53:13 +08:00
huang 86b0470b76 隐藏掉搜索功能 2016-05-06 19:02:43 +08:00
huang a267c75ec7 首页的隐藏可见 2016-05-06 18:50:57 +08:00
huang d9b0c654aa 组织门户二级目录显隐 2016-05-06 17:14:53 +08:00
huang 5133338923 组织门户二级目录显隐 2016-05-06 17:11:08 +08:00
huang 572a051b04 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/users_controller.rb
	app/views/blogs/_article.html.erb
	app/views/layouts/new_base_user.html.erb
 2016-05-06 11:35:27 +08:00
huang 42814feab8 js问题 2016-05-06 11:29:30 +08:00
huang 9e0176bc55 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/controllers/organizations_controller.rb
	app/helpers/organizations_helper.rb
	db/schema.rb
	public/images/homepage_icon.png
	public/stylesheets/new_user.css
 2016-05-06 10:16:56 +08:00
Tim 4bf1883ba2 组织门户导航栏二级显隐 2016-05-06 10:02:31 +08:00
huang 6057ea15e1 一级目录新界面鼠标经过显示子目录 2016-05-06 09:18:26 +08:00
huang 231f8f3526 二级目录中设置了隐藏，鼠标经过的时候不显示内容及 框框 2016-05-05 21:23:34 +08:00
huang cd6124895d 鼠标经过一级目录的时候显示二级目录 2016-05-05 21:09:02 +08:00
huang aaf97ac81c 新版块3和板块2合并，板块3取前四个 2016-05-05 09:45:34 +08:00
yuanke 9dc92fe817 列表优化 2016-05-04 16:28:40 +08:00
huang 65a907bc99 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
 2016-05-04 15:06:20 +08:00
huang 8a14ce004f 以弹框模式显示二级目录 2016-05-04 15:05:54 +08:00
Linda cbec7cc8f8 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
 2016-05-04 14:41:54 +08:00
Linda 0fc142d822 组织配置logo样式 2016-05-04 14:40:25 +08:00
Tim 80ff421853 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-04 14:09:20 +08:00
Tim 714deebe21 二级导航调整 2016-05-04 14:08:57 +08:00
huang efb91abfb0 分页不跳转问题 2016-05-04 14:03:18 +08:00
huang c0acaab404 首页logo上传图片 2016-05-04 13:55:27 +08:00
huang f8ba77dc20 banner点击添加图片 2016-05-04 11:32:11 +08:00
huang daa154db02 鼠标经过字母录显示结构 2016-05-04 11:16:25 +08:00
yuanke 411ae6f89e 1.修改贴吧分页显示问题2列表优化 2016-05-04 11:03:08 +08:00
yuanke afd176b805 课程项目按更新时间排序 2016-05-03 19:10:04 +08:00
huang 5e8ff06140 Merge branch 'yuanke' into develop 2016-05-03 17:15:46 +08:00
huang 6635ded1e8 组织base中添加二级域名 2016-05-03 14:55:08 +08:00
yuanke 2468010125 课程、项目列表修改 2016-05-03 14:30:35 +08:00
cxt 3f7a391214 课程和项目的排序 2016-04-29 20:45:14 +08:00
huang 0bd34c2099 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
 2016-04-29 16:15:10 +08:00
huang f6c3e89454 二级目录帖子详细页面 2016-04-29 16:14:08 +08:00
cxt 1dc0f9dd95 主页的项目和课程排序 2016-04-29 15:55:29 +08:00
Tim 5f1b335cfb 北斗二级菜单显隐 2016-04-29 15:38:38 +08:00
huang d8480ea3c6 二级目录内容页面 2016-04-29 11:33:56 +08:00
huang 1685449381 二级目录框架及结构 2016-04-28 17:36:29 +08:00
yuanke 647e6a7f92 Merge branch 'yuanke' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 10:45:57 +08:00
huang e48189ae97 项目获取数 2016-04-28 10:24:53 +08:00
Tim 5d7c8c0b61 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-04-27 15:18:50 +08:00
Tim 5d44dc5bba 滚动栏js效果修改 2016-04-27 15:16:23 +08:00
yuanke 4258790453 Merge branch 'hjq_beidou' into yuanke_1 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
 2016-04-27 14:30:28 +08:00
yuanke dac717bd97 列表左边菜单收缩 2016-04-27 14:12:56 +08:00
huang 811c3a065e 完成左中一模块定制 2016-04-27 14:09:15 +08:00
huang ddf1e6f2db 组织模式3完成 2016-04-27 11:29:01 +08:00
huang cded1802cc 右上模块定制完成 2016-04-27 10:41:05 +08:00
cxt 78c7db1150 Merge branch 'weixin_guange' into develop 2016-04-27 10:36:24 +08:00
cxt 0222038899 缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息 2016-04-27 10:28:36 +08:00
yuanke 23f48b7189 项目列表、项目讨论区列表 2016-04-27 09:54:49 +08:00
huang b6f5bfc450 右下版本模块定制 2016-04-27 09:45:56 +08:00
huang b589d5b2ff 末班六定配完成 2016-04-26 18:27:01 +08:00
huang 17b2e82963 banner类型 2016-04-26 16:23:08 +08:00
yuanke 43c1120b19 课程问答区 项目讨论区列表 2016-04-26 15:10:47 +08:00
huang 32d7927eb9 组织新界面 2016-04-26 11:06:18 +08:00
huang 76f93a54c6 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/helpers/organizations_helper.rb
	app/views/layouts/base_org2.html.erb
	app/views/organizations/_org_content.html.erb
 2016-04-26 11:03:21 +08:00
huang d8f71da1fb 完成模块8配置 2016-04-26 11:01:12 +08:00
Tim 53e6b41d93 北斗登录效果调整 2016-04-26 10:02:16 +08:00
huang 255d7e07bc 北斗新界面样式 2016-04-25 18:54:21 +08:00
huang dae6a5ecae 配置八种类型更新 2016-04-25 16:00:52 +08:00
huang 81210fd475 顶部导航及样式 2016-04-25 15:35:32 +08:00
huang 5b763927cc 顶部用户路由 2016-04-25 14:14:26 +08:00
huang c1437bb75b 北斗界面 2016-04-24 14:39:33 +08:00
yuanke f6d09e0554 配置中增加一个 隐藏课程信息的功能 2016-04-24 14:23:08 +08:00
huang cccc2a7eb7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-21 16:21:49 +08:00
huang ab8c1a0bad Merge branch 'hjq_beidou' into develop 2016-04-21 16:21:39 +08:00
cxt 0cc5eca34b 个人主页的项目列表有重复的项目 2016-04-19 09:58:51 +08:00
huang 200307ec9f 组织模块访问统计修改 2016-04-19 09:18:58 +08:00
cxt 829399b8af 个人主页的课程列表和项目列表排序 2016-04-14 16:59:25 +08:00
cxt e5b07c6c12 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 12:33:11 +08:00
cxt 5e1284605f Merge branch 'hjq_beidou' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 11:29:26 +08:00
huang acf4e15f09 统计数左侧刷新 2016-04-14 10:26:25 +08:00
huang 12efc10759 图标曲线 总变更为+ 2016-04-14 10:10:31 +08:00
cxt f97699037b 冲突解决 2016-04-13 16:58:44 +08:00
cxt 2befcd6634 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-13 16:52:52 +08:00
cxt 42f960922a 个人主页的项目排序按更新时间排序 2016-04-13 15:39:05 +08:00
cxt a21ea98b37 个人主页中的课程列表出现重复课程 2016-04-13 15:14:35 +08:00
guange aa9cb4e579 merge 2016-04-08 10:44:36 +08:00
huang 320ed07b31 解决上传图片问题 2016-04-08 09:55:02 +08:00
huang 3501d6f1d6 完成组织模块的开发 2016-04-07 17:05:22 +08:00
huang 623114dc41 解决删除项目的私有资源显示在我的资源中的问题 2016-04-06 19:02:07 +08:00
huang 378dfca006 组织图标只有管理员可以修改 2016-04-06 13:53:40 +08:00
huang 2162d7d4b8 组织banner上传功能 2016-04-06 10:40:38 +08:00
huang 73297230d1 权限控制 2016-04-02 00:31:36 +08:00
huang e4b5a4df05 500wenti 2016-04-02 00:14:48 +08:00
huang 0bcd2ddcf8 0 2016-04-02 00:02:09 +08:00
huang 0dc7b1f621 上传图片 2016-04-02 00:00:36 +08:00
huang 86aecd21b9 上传图片 2016-04-01 23:56:05 +08:00
huang 0459856a2c 上线logo更换 2016-04-01 21:30:32 +08:00
huang 218a6b9358 Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-01 19:25:01 +08:00
huang 9e7c595e55 组织发送动态的显示 2016-04-01 17:23:15 +08:00
huang 10371e8bdd 添加附件图片功能 2016-04-01 00:27:34 +08:00
huang 12c3de6dc9 500问题 2016-03-31 21:14:07 +08:00
huang d71035159a 修改more链接 2016-03-31 20:54:01 +08:00
huang ba658e44c0 组织more权限 2016-03-31 20:46:55 +08:00
huang 5866dfb7ff 登录 
没内容more
logo不加链接
 2016-03-31 20:12:20 +08:00
huang 1fdd562bd3 修改组织一些功能jibug 2016-03-31 19:33:43 +08:00
huang 756a2db4aa 组织配置样式问题 
链接more空白问题
 2016-03-31 19:04:31 +08:00
huang 45343a44b8 修改链接 2016-03-31 17:13:40 +08:00
huang f662bfa40b 组织科配置 2016-03-31 17:06:00 +08:00
huang c431658333 setting中后台编辑 2016-03-31 16:19:59 +08:00
huang c6f6030e10 组织新样式 2016-03-31 15:25:02 +08:00
huang 3465a39285 添加配置 
隐藏不显示
 2016-03-31 13:07:12 +08:00
huang 8f43341f81 新建组织为空的情况 2016-03-30 19:17:29 +08:00
huang b64e8a5f9e 完成所有图片自动适应转换 2016-03-30 19:02:41 +08:00
huang 7c55356ace 组织新界面修改 2016-03-30 17:22:23 +08:00
huang f2106d0045 more链接添加，区分两种模式 2016-03-29 20:33:16 +08:00
huang 8a6a1b94ee 组织资源的统计与权限 2016-03-29 20:09:47 +08:00
huang 961a264e05 创建时间统一date 2016-03-29 19:04:51 +08:00
huang 65e80b1978 用户图像样式 2016-03-29 18:25:16 +08:00
huang 7c9e20c9bf 登录注册样式 2016-03-29 16:51:50 +08:00
huang d28a46c48a 北斗资源库板块 2016-03-29 16:45:14 +08:00
huang 80cd5089a4 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-03-29 13:51:46 +08:00
huang 2b9ddf3594 组织新版 2016-03-29 13:43:28 +08:00
huang b80bc98fcb 组织首页 2016-03-29 11:31:58 +08:00
huang b8463fcca5 北斗 2016-03-28 16:51:58 +08:00
cxt 33c9331c7b 课程设置为私有/公开 课程头部未刷新 2016-03-28 15:35:24 +08:00
huang 4b6b5504ca 北斗框架（未完） 2016-03-28 14:11:40 +08:00
huang 326730f6b1 北斗框架 2016-03-28 10:39:09 +08:00
huang 1bf494f661 课程推荐资源统计数 2016-03-25 20:11:26 +08:00
huang ba25f41bcb 添加教师统计数、学生统计数 2016-03-25 19:20:36 +08:00
alan 6862480632 修改当用户没有项目时，报错 2016-03-25 17:16:45 +08:00
alan 4587e728d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:07:42 +08:00
alan 05d66f41f9 fix bug when user don't have courses or projects 2016-03-25 17:07:30 +08:00
huang dea1c13a64 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/migrate/20160324074942_add_index_to_forge_activities.rb
 2016-03-25 16:33:22 +08:00
alan 46951f7af9 Merge branch 'develop' into alan_develop 
Conflicts:
	app/views/student_work/_student_work_list.html.erb
	app/views/users/_user_activities.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-25 16:16:55 +08:00
huang 9ce39d2f4a Issue模块动态优化 2016-03-25 15:46:40 +08:00
huang 9549d695f6 讨论区局部优化 2016-03-25 14:29:58 +08:00
huang ff2340baf9 课程统计信息优化 2016-03-25 10:42:26 +08:00
huang cb4b26762d 课程base优化 2016-03-25 09:56:45 +08:00
ouyangxuhua 2d4f5284df 删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题 2016-03-24 17:03:51 +08:00
huang 1330f02db8 项目创建的动态以多态形式存入forge_activities 2016-03-24 12:59:03 +08:00
alan 0d049bbe1f refactor new_base_user 2016-03-24 10:07:39 +08:00
alan 13e265b7d2 优化 layouts/_user_projects 和 layouts/_user_courses页面 2016-03-23 18:25:50 +08:00
huang 70d594659e 课程英雄榜代码封装 2016-03-21 16:50:24 +08:00
huang e06695b56b 课程活跃度代码封装 2016-03-21 16:45:49 +08:00
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +08:00
ouyangxuhua 5c22b23f3a Merge branch 'develop' into ouyangxuhua 2016-03-18 14:52:51 +08:00
ouyangxuhua 1eafad6468 鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息 2016-03-18 10:05:31 +08:00
cxt b8b34f7861 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-17 16:23:47 +08:00
cxt 1489c8d924 课程简介没有内容就不要显示 2016-03-17 16:22:29 +08:00
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-03-17 16:18:30 +08:00
cxt 602864bd71 个人主页课程列表: 1、增加学期信息 2、排序不对 2016-03-17 16:17:33 +08:00
huang 7ff946e488 课程资源库提供历史版本下载 2016-03-17 12:37:05 +08:00
ouyangxuhua b716e593b5 组织下的链接问题 2016-03-15 13:49:44 +08:00
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/organizations/_org_course_news.html.erb
	app/views/organizations/_org_project_issue.html.erb
	app/views/organizations/_project_message.html.erb
	app/views/organizations/_show_org_document.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-15 13:40:33 +08:00
huang 5681d329d6 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/controllers/news_controller.rb
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-15 11:12:24 +08:00
ouyangxuhua 15dfaf67b2 测试版环境，登陆注册改成https://test.forge. 2016-03-14 18:29:50 +08:00
ouyangxuhua c0edd91c3d 登陆注册链接改为www. 2016-03-14 18:20:19 +08:00
ouyangxuhua a2e6f0ee5f 1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示 2016-03-14 15:39:45 +08:00
ouyangxuhua f496761325 将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名 2016-03-14 11:00:55 +08:00
cxt 7f302305ff Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-11 19:31:22 +08:00
cxt 1d93c6c56b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-11 16:18:10 +08:00
huang 97a7694778 访问统计数--views 2016-03-11 15:58:16 +08:00
Tim 53c281103c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-11 15:49:54 +08:00
Tim de3a4718ab 个人，课程，项目，组织访问量添加 2016-03-11 15:49:24 +08:00
cxt dcd13b9d6b 点击个人主页的课程和项目在新的tab页中打开 2016-03-11 11:34:16 +08:00
huang c947121e2b 消息不显示问题（未完） 2016-03-10 14:52:49 +08:00
ouyangxuhua f917e96a12 组织栏目中的链接的url更新 2016-03-10 12:47:10 +08:00
huang 2a1eac02a9 Merge branch 'hjq_new_course' into szzh 2016-03-09 15:28:28 +08:00
huang f469e51202 课程模块/通知、作业、留言、发帖，删除的时候统计数字递减 2016-03-08 17:38:38 +08:00
Tim 56372fbdd5 积分规则显示样式调整 2016-03-07 16:50:30 +08:00
cxt fcae91ecc1 “课程通知”改为“通知” 2016-03-07 11:27:47 +08:00
huang d30e73795d 积分规则 2016-03-06 12:15:57 +08:00
huang 4f2937e1a2 英雄榜 2016-03-05 10:38:21 +08:00
huang a079a61c82 回复数 2016-03-05 04:29:10 +08:00
huang d54609075b 区分新闻和新闻回复得分 2016-03-05 04:01:10 +08:00
huang bafa151c0d 0 2016-03-05 03:16:04 +08:00
huang e4d669251f 英雄榜得分 2016-03-04 21:13:24 +08:00
huang 6ce947667d 课程英雄榜提示 2016-03-04 21:10:45 +08:00
cxt 4f3055c990 讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。 2016-03-04 17:11:52 +08:00
huang 97e6299a2b Merge branch 'hjq_new_course' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-03-04 09:33:38 +08:00
huang 95346bb419 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
	public/stylesheets/public.css
 2016-03-04 09:32:49 +08:00