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

706 Commits

Author SHA1 Message Date
cxt eb3694dbe6 消息报500 2016-06-17 14:45:07 +08:00
cxt e3ee99b486 消息通知中过滤掉已删除的课程消息、 
at消息不显示
 2016-06-16 15:46:16 +08:00
cxt 196c92f9c4 动态回复最多只加赞三条，点击展开更多时才加载余下的回复 2016-06-07 16:02:00 +08:00
cxt fe22cfa5c5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 18:02:41 +08:00
huang e4ff4ad156 Merge branch 'cxt_course' into develop 2016-06-03 17:55:42 +08:00
cxt 07941233d8 题库点击发送到后，先输入一个不存在的课程ID，点击确定，在出现请先选择课程的提示后删除输入的ID，此时会显示出该用户所有的课程，包括已经删除的 2016-06-03 17:03:53 +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 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
huang ff14809237 Merge branch 'cxt_course' into develop 2016-05-27 15:30:35 +08:00
huang ab4aa0f06f 公共资源多个资源发送功能 2016-05-27 09:32:24 +08:00
huang 0a7d1f1efc 公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug 2016-05-25 17:54:53 +08:00
huang 72ae31b7f9 作业导出资源代码回复 2016-05-25 11:23:19 +08:00
huang b6de2dbd2d 发布作业导入资源 2016-05-25 09:44:30 +08:00
huang 4280d79eab Merge branch 'develop' into hjq_beidou 2016-05-25 09:11:55 +08:00
huang 197f054c18 注释掉申请私有资源功能 2016-05-25 09:10:41 +08:00
huang d1e11d4260 代码审查后代码简化 2016-05-25 08:58:58 +08:00
huang b38bd0c1e5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-24 20:13:42 +08:00
cxt ed2f413949 代码还原 2016-05-24 20:04:06 +08:00
huang 909d40b4eb 默认显示公共资源 2016-05-24 17:14:01 +08:00
huang a7a2be6a4b 作业导入资源问题 2016-05-24 16:01:02 +08:00
huang bc0e24d39e 资源引用代码注释 2016-05-24 10:28:17 +08:00
cxt 820e594fec 题库的私有作业显示作业详情 2016-05-23 10:53:49 +08:00
huang eead7962cf 资源申请权限控制 2016-05-21 11:39:50 +08:00
huang 18054dd96d 私有资源不能下载 2016-05-20 17:04:20 +08:00
huang 5cefedd20a Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
 2016-05-20 15:35:08 +08:00
huang b1e0618742 导入资源不能用的问题 2016-05-20 15:05:04 +08:00
huang 352b40dd96 默认为“公共资源” 2016-05-20 13:52:39 +08:00
huang 92f55e0dc1 公共资源库，点击底部不能发送的问题 2016-05-20 10:02:59 +08:00
huang f806dbf587 资源发送至组织和课程 2016-05-19 17:12:33 +08:00
huang e0370e3e32 私有资源中发送文件 2016-05-19 17:04:46 +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
huang 0b2f6c9a53 私有资源的搜索和排序 2016-05-19 14:28:13 +08:00
huang 99cbf0b54e 资源引用消息通知 2016-05-19 11:32:58 +08:00
huang f3f75a57bd 申请资源消息资源发布这收到消息 2016-05-18 17:37:48 +08:00
cxt 31d94dc052 发布可引用的作业至课程，作业的原作者不应收到微信消息提醒 2016-05-18 16:28:43 +08:00
huang 09c462ebad 资源代码还原 2016-05-15 08:50:10 +08:00
huang aef178183c 我的资源附件不能删的问题 2016-05-13 19:41:07 +08:00
huang 561f1b0572 Merge branch 'cxt_course' into develop 2016-05-13 18:25:15 +08:00
huang b9e5c77b91 资源500问题 2016-05-13 18:02:06 +08:00
huang 519ed365cc 导入资源按钮点击没反应问题 2016-05-13 17:24:12 +08:00
cxt 66c410884f 作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。 2016-05-13 17:11:53 +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
cxt 8af0459519 首页动态中不应出现已删除的课程动态 2016-05-12 16:56:50 +08:00
cxt 582c305a47 申请引用过的作业在课程删除后不应该在申请题库中显示 2016-05-12 16:29:39 +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
yuanke 629591ad00 课程、项目列表更新时间取动态表中的 2016-05-10 12:55:42 +08:00
cxt d303a06377 首页列表的排序 2016-05-10 11:32:20 +08:00
huang 6474444cc7 用户连接 id变成用户名 2016-05-10 09:00:59 +08:00
cxt 1eb41478b2 课程动态和首页动态中的作业动态实现二级回复 2016-05-09 17:06:10 +08:00
huang 0a989daf31 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	public/stylesheets/courses.css
	public/stylesheets/new_user.css
 2016-05-06 18:12:08 +08:00
cxt 620cc83d4b "从题库选用作业"暂时只提供公共作业和我的作业 2016-05-06 17:56:56 +08:00
cxt 10d26f89d9 作业列表的二级回复 2016-05-06 17:36:28 +08:00
huang df1c70880a Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_homework_repository.html.erb
	public/stylesheets/new_user.css
 2016-05-06 12:22:43 +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
yuanke 9dc92fe817 列表优化 2016-05-04 16:28:40 +08:00
cxt 6c184b9248 题库的分享请求 2016-05-04 16:17:37 +08:00
cxt 467af47386 私有题库的作业详情页面不显示 2016-05-04 11:13:52 +08:00
yuanke 411ae6f89e 1.修改贴吧分页显示问题2列表优化 2016-05-04 11:03:08 +08:00
cxt 70910c5238 “我的作业”中不应出现已删除课程的作业 2016-05-04 09:40:18 +08:00
huang 4489bc13d7 课程列表按创建时间排序 2016-05-03 18:17:03 +08:00
yuanke 8b672cc7c3 项目、课程列表增加更新时间 2016-05-03 17:57:24 +08:00
huang 5e8ff06140 Merge branch 'yuanke' into develop 2016-05-03 17:15:46 +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
yuanke d5805e8103 课程、项目列表不显示已删除的 2016-05-03 11:24:16 +08:00
cxt 39c2365338 已拒绝的私有作业不可引用 2016-05-03 10:15:09 +08:00
cxt 3f7a391214 课程和项目的排序 2016-04-29 20:45:14 +08:00
yuanke b199a6b8b2 列表人气排序修改 2016-04-29 19:24:20 +08:00
cxt 0bb6d42c80 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-29 19:22:08 +08:00
cxt a9cb556a20 题库的切换报500 2016-04-29 19:21:54 +08:00
cxt b0988dc950 Merge branch 'cxt_course' into develop 2016-04-29 17:57:32 +08:00
cxt 389b75f7ab 申请引用私有作业时发送消息 2016-04-29 17:55:57 +08:00
cxt 341927506a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-04-29 15:58:05 +08:00
yuanke 1353c27f64 Merge branch 'yuanke' into develop 
Conflicts:
	app/helpers/application_helper.rb
 2016-04-29 15:54:37 +08:00
yuanke f8abd46ae9 列表修改 2016-04-29 15:52:44 +08:00
cxt 53bf0dcd7a 题库加入所有私有作业、并可通过提交申请来导入私有作业 2016-04-29 15:46:26 +08:00
yuanke 1da8288fe7 列表显示修改 2016-04-29 13:42:58 +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
yuanke dac717bd97 列表左边菜单收缩 2016-04-27 14:12:56 +08:00
yuanke 23f48b7189 项目列表、项目讨论区列表 2016-04-27 09:54:49 +08:00
yuanke 43c1120b19 课程问答区 项目讨论区列表 2016-04-26 15:10:47 +08:00
yuanke d34b3780c8 课程列表修改 2016-04-25 10:44:46 +08:00
yuanke c8eaf293e7 课程列表 2016-04-24 10:49:33 +08:00
cxt 16348654a5 启用匿评和禁用匿评时修改评分设置 2016-04-21 17:00:30 +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
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 a21ea98b37 个人主页中的课程列表出现重复课程 2016-04-13 15:14:35 +08:00
huang ab34fec172 资源导入的时候记数没有自动增加问题 2016-04-08 21:30:59 +08:00
huang 623114dc41 解决删除项目的私有资源显示在我的资源中的问题 2016-04-06 19:02:07 +08:00
alan 200561da92 修改《私有资源公共资源中不显示》 2016-03-29 16:43:14 +08:00
alan 90fd52970b fix bugger on 资源区 2016-03-29 10:15:18 +08:00
alan 395fb8fae6 修改pagination,资源区bug 2016-03-28 22:37:01 +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
alan 4f5e083707 优化个人主页，缓存设置 2016-03-25 16:06:14 +08:00
cxt 46a05d1000 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 15:37:15 +08:00
alan 7108e6d763 减少数据库查询字段 2016-03-25 09:22:05 +08:00
huang f1ffd3852f Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-24 09:37:06 +08:00