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

195 Commits

Author SHA1 Message Date
cxt aaefd8b4aa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_news_replies.html.erb
 2016-09-02 15:24:55 +08:00
daiao 27ad94eac2 组织配置界面，成员列表分页 2016-09-02 13:25:01 +08:00
huang 52a8a64a69 项目隐藏 项目讨论区发送中去掉课程 2016-09-01 10:48:13 +08:00
cxt a8575f2a15 暂时隐藏个人名片 2016-08-31 14:08:19 +08:00
cxt 6eb518c465 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	app/views/at/show.json.erb
	app/views/layouts/new_base_user.html.erb
 2016-08-26 16:23:07 +08:00
Tim a8f30fe85f 个人主页，课程，项目头像、logo增加编辑按钮 2016-08-26 11:31:54 +08:00
yuanke 82779c99ea 字符串去掉空白时，空格不去掉。 2016-08-26 09:59:00 +08:00
Tim 083d5453d4 加入课程、项目弹框，在内容部分不能拖拽 2016-08-13 10:00:31 +08:00
cxt 0ed508a887 题库预览弹窗的调整 2016-08-09 17:09:36 +08:00
cxt 9594aada50 Merge branch 'cxt_course' into develop 
Conflicts:
	public/javascripts/application.js
 2016-08-09 16:42:23 +08:00
cxt fc3df1c26f 题库预览弹框的样式调整 2016-08-09 16:38:17 +08:00
Tim cd30f94d72 题库发送预览弹框位置及可拖拽js更新 2016-08-05 18:01:11 +08:00
cxt e7e873e0df Merge branch 'dev_shcool' into develop 
Conflicts:
	app/helpers/users_helper.rb
 2016-08-05 16:32:10 +08:00
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
cxt 0d86a28c54 我的作业 2016-08-05 16:12:53 +08:00
Tim 82644bcd81 加入班级、项目弹框可拖拽 2016-08-05 14:36:01 +08:00
Tim 28a29fa724 拖拽删除 2016-08-04 16:50:33 +08:00
daiao 5f969c6593 单位审核相关Bug修复 2016-08-03 10:36:03 +08:00
Tim 08b8e3f1cb 加入班级，项目弹框定位js重写 2016-08-01 15:21:23 +08:00
daiao 39478eb4e4 Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool 
Conflicts:
	app/views/admin/applied_schools.html.erb
	app/views/admin/has_applied_schools.html.erb
 2016-07-29 21:50:19 +08:00
yuanke 1f47eb5ea8 单位申请列表修改 2016-07-29 21:19:09 +08:00
huang c07677ef99 项目邀请框架 拒绝消息 2016-07-29 14:49:37 +08:00
huang 4a9eec0cce 完成项目邀请及公共弹框的封装 2016-07-28 14:42:36 +08:00
huang 463c09f02c 项目邀请弹框 2016-07-26 08:55:07 +08:00
cxt 60bbe89c0d 博客的自动保存 2016-07-21 14:05:15 +08:00
cxt fdf925a0b8 个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了 2016-07-18 16:40:04 +08:00
cxt e19efc1c8a 博客的二级回复 2016-07-14 14:44:47 +08:00
cxt 5d9bde3c95 课程发送资源到课程 2016-07-11 15:10:55 +08:00
huang ef8b127225 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
 2016-07-08 11:33:51 +08:00
yuanke 06f7594680 Merge branch 'yuanke' into develop 2016-07-08 09:15:55 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
 2016-07-07 15:14:11 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-05 16:49:50 +08:00
yuanke da19bbd3a0 优化了下修改资料界面的代码 2016-07-05 09:02:34 +08:00
cxt cc649ae64b 课程讨论区、项目讨论区、帖子详情页面的二级回复 2016-07-04 14:14:51 +08:00
cxt e834d09469 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 17:52:29 +08:00
cxt 0ff8f0a774 课程大纲的删除和课程大纲描述的删除 2016-07-01 16:25:52 +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
cxt ac4218bfb0 课程大纲列表 2016-06-30 15:36:46 +08:00
yuanke ab99645148 Merge branch 'yuanke' into develop 2016-06-27 15:52:01 +08:00
yuanke dd397a060b 修改删除组织成员跨域的BUG 2016-06-27 15:48:33 +08:00
cxt 4f342142e6 组织文章的展开更多 2016-06-24 17:58:50 +08:00
cxt 0611ddcc43 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_reply_to.html.erb
 2016-06-24 16:54:19 +08:00
cxt eab000306c 动态回复的展开更多、收起，组织文章回复不可用 2016-06-24 16:38:36 +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 86a5eccae6 组织设置中添加成员BUG解决 2016-06-24 14:16:39 +08:00
cxt 126bf9c195 个人留言、课程留言的二级回复 2016-06-23 14:47:22 +08:00
yuanke 3ae26a6530 组织配置页面 名师列表 热门项目 学霸 精品课程的右上角字样只对超级管理员显示,图片显示时如果已经带了链接则不增加点击弹框效果。 2016-06-17 11:23:49 +08:00
yuanke 2781605670 课程资源描述增加可编辑 2016-06-16 14:04:12 +08:00
huang 3e3c300273 Merge branch 'cxt_course' into develop 2016-06-08 11:37:58 +08:00
yuanke 5999189f3a 1.视频根据http还是https分类显示。 
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
 2016-06-08 09:02:00 +08:00
cxt 196c92f9c4 动态回复最多只加赞三条，点击展开更多时才加载余下的回复 2016-06-07 16:02:00 +08:00
yuanke 4c92e73cf1 根据http和https显示视频 2016-06-06 09:34:45 +08:00
yuanke c3c639aa77 超链接颜色修改 2016-06-02 15:27:16 +08:00
yuanke 0d38fa53a2 1.issue编辑器定下最高高度到了改为滚动条 
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别？ 和cn等
5.KE缩进修改等
 2016-06-02 13:55:40 +08:00
yuanke 5b7011e07b Merge branch 'develop' into yuanke 2016-05-27 15:37:11 +08:00
yuanke 9d9e2ff613 自动识别URL正则匹配修改 2016-05-27 15:31:13 +08:00
yuanke cfc3751f6f Merge branch 'yuanke' into develop 2016-05-27 14:01:02 +08:00
huang ab4aa0f06f 公共资源多个资源发送功能 2016-05-27 09:32:24 +08:00
huang 0a7d1f1efc 公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug 2016-05-25 17:54:53 +08:00
yuanke fcaa9666e2 KE内容自动识别网址加上超链接时把颜色也加上 2016-05-25 10:37:35 +08:00
yuanke 6d7eca487f 将KE的newlineTag：'br' 改为'p',方便识别网址 2016-05-20 17:02:43 +08:00
yuanke ded5f8f861 页面中显示KE内容的地方都加上自动识别网址的函数 2016-05-20 15:30:25 +08:00
yuanke 6e749f49e4 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke 2016-05-19 16:29:33 +08:00
yuanke 7da1418069 自动识别URL 2016-05-19 16:24:57 +08:00
huang fe54a19940 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke 
Conflicts:
	app/views/blogs/_article.html.erb
	app/views/users/_project_boardlist.html.erb
	public/stylesheets/new_user.css
 2016-05-19 16:10:18 +08:00
yuanke 025d07e6a4 代码测试编译信息长度限制不小心注释了 2016-05-16 17:02:18 +08:00
yuanke 708cb35fd2 增加一个弹框的通用接口pop_up_box 2016-05-16 16:57:18 +08:00
huang 0cc9a9e4c5 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke 2016-05-13 20:02:32 +08:00
huang 55c9faaf7b Merge branch 'yuanke' into develop 2016-05-13 18:26:01 +08:00
yuanke 2c7a964470 复制粘贴图片相关 2016-05-13 16:59:59 +08:00
yuanke be97675aed 没带图片类型的图片不让点击放大看! 2016-05-13 16:09:26 +08:00
huang 6ba4b9dfa2 Merge branch 'yuanke' into develop 2016-05-06 18:07:24 +08:00
yuanke 34ea7662b2 将内容省略显示的固定字数改为传参 2016-05-06 17:59:27 +08:00
huang d212d4f4c5 Merge branch 'cxt_course' into develop 2016-05-03 18:17:54 +08:00
cxt bcb02e49d3 课程问答区的名片显示 2016-05-03 17:23:56 +08:00
huang a602a6aa63 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_course_message.html.erb
 2016-05-03 17:12:38 +08:00
cxt ada4407e63 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
yuanke 789f3906a5 课程列表，列表描述内容去掉空格 2016-04-29 15:07:46 +08:00
yuanke 1da8288fe7 列表显示修改 2016-04-29 13:42:58 +08:00
ouyangxuhua 9e599da365 组织动态，点击展开更多没有反应问题解决 2016-03-29 15:47:05 +08:00
ouyangxuhua 1a1d5b4c49 解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题 2016-03-28 19:20:09 +08:00
yuanke dea947e9ce Merge branch 'develop' into yuanke 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
	public/javascripts/homework.js
	public/stylesheets/new_user.css
 2016-03-25 14:58:17 +08:00
yuanke c6361406b5 代码评测超时优化 2016-03-25 14:43:51 +08:00
cxt d72aa3a93c Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/homework_common_controller.rb
	app/views/student_work/show.js.erb
	public/javascripts/application.js
	public/stylesheets/base.css
	public/stylesheets/public_new.css
 2016-03-17 15:27:52 +08:00
cxt a8780be9b4 提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子 2016-03-17 15:03:34 +08:00
yuanke 27a2aad3d6 修改KE贴吧回复添加视频图片不能显示的BUG 2016-03-14 18:19:23 +08:00
yuanke 465a236049 修改KE贴吧等地图片显示不出来的问题 2016-03-14 17:16:11 +08:00
luoquan 270a290df9 修改视频不能播放问题。 2016-03-14 15:18:56 +08:00
ouyangxuhua 8784c7cec6 超链接不能正常显示的问题 2016-02-26 16:13:14 +08:00
ouyangxuhua c857fb734b 快捷回复中，设置回复框的高度和宽度 2016-01-28 10:16:45 +08:00
ouyangxuhua 89a919163c 一旦组织私有，就disabled掉允许游客下载选项 2016-01-26 15:25:25 +08:00
ouyangxuhua b8ae62db84 Merge branch 'szzh' into dev_hjq 2016-01-21 15:32:18 +08:00
ouyangxuhua c303f7ff3f 将分享的js方法统一，分享文件、通知等均可复用 2016-01-21 14:33:31 +08:00
cxt 247924af26 动态内容显示不全 2016-01-21 11:24:26 +08:00
cxt 7d663ce66f 动态内容统一高度 2016-01-08 14:53:12 +08:00
guange d2c7d12cd9 merge 2016-01-04 15:53:56 +08:00
guange 8ea9430318 at链接问题修改 2016-01-04 15:51:24 +08:00
lizanle abb19422ff 发送资源到组织功能。同时个人资源库也要添加这个功能 2015-12-29 17:13:01 +08:00