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

4830 Commits

Author SHA1 Message Date
huang 2e36cf6d6a 课程资源库添加资源提示及 2016-09-02 12:12:26 +08:00
huang fa25a78f62 项目资源库 添加私有资源提示及局部过滤刷新 2016-09-02 11:27:35 +08:00
cxt f78595bbbb 管理员界面中的学校列表支持按用户数排序 2016-09-01 17:11:39 +08:00
huang 17440ca5dc Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-01 16:04:00 +08:00
huang 79e30862e9 change sonar method into restart and cancel push events 2016-09-01 15:58:53 +08:00
cxt 1e740525b4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-01 14:31:45 +08:00
cxt e61cf5dd4f 多重身份的成员：教师模拟答题和学生答题作为两条记录 2016-09-01 14:21:19 +08:00
yuanke 11ed1ea345 Merge branch 'weixin_guange' into develop 2016-09-01 14:11:20 +08:00
huang 52a8a64a69 项目隐藏 项目讨论区发送中去掉课程 2016-09-01 10:48:13 +08:00
daiao 548a263f0f 1.修复项目新闻发送至其他项目后，位于讨论区下的bug 
2.资料未完善情况下，“修改资料”可操作
3.组织成员列表增加分页功能（配置成员页面分页为完成）
4.修复回复表情显示不对
 2016-08-31 17:09:02 +08:00
cxt 9b3e1e0275 Merge branch 'develop' into cxt_course 2016-08-31 15:02:13 +08:00
cxt 6e36418201 admin界面的留言列表过滤掉新用户的留言 2016-08-31 09:47:51 +08:00
cxt f4632c432f 消息列表中的at消息报500 2016-08-30 17:11:22 +08:00
yuanke b9e9892257 微信issue指向BUG修改，issue@功能修改 2016-08-30 15:01:26 +08:00
yuanke 8a6ad89973 issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等 2016-08-30 14:08:10 +08:00
huang bbe44b3957 Merge branch 'develop' into rep_quality 2016-08-30 11:18:49 +08:00
huang ee2ae456ac unresolved issues for sonar 2016-08-30 10:43:47 +08:00
cxt 45f0234ff7 组织logo点击可编辑 2016-08-29 16:19:06 +08:00
cxt 4ff45c15a3 还原质量分析的代码 2016-08-29 15:43:32 +08:00
huang 0551c450b5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 10:21:59 +08:00
huang a6f9c3375e 代码质量分析加入“未解决质量问题数” 2016-08-29 10:21:42 +08:00
cxt 885cc820a8 批量添加学生 2016-08-26 19:50:47 +08:00
huang 8c4f943f83 注释掉资源提示 2016-08-26 19:33:18 +08:00
huang 16dfae4415 0 2016-08-26 18:47:17 +08:00
cxt 816a480991 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-26 18:34:44 +08:00
cxt ff95567926 基本资料中从业者的身份判断 2016-08-26 18:34:35 +08:00
huang 803bd9819a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/css/public.css
 2016-08-26 17:55:51 +08:00
huang 9b86661f4a <ul class=contribute-list> 2016-08-26 17:49:31 +08:00
huang 420a17a7e4 资源提示统计数字及权限修改 2016-08-26 17:34:17 +08:00
cxt 5fbb9f56a6 Merge branch 'dev_shcool' into develop 2016-08-26 17:10:15 +08:00
huang a71f948f41 项目、课程资源库添加私有资源提示 2016-08-26 16:26:12 +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
cxt 0ce61bfee8 学生删除作品时将作品还原为初始状态 2016-08-26 16:20:14 +08:00
huang a434942b6d Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-26 15:14:07 +08:00
huang 60a76e64a5 贡献列表 2016-08-26 15:13:07 +08:00
cxt 774b5eca89 课程和项目的头像点击可编辑 2016-08-26 14:31:14 +08:00
daiao d37cbaad61 1.完善资料流程优化；2.基本资料从业者单位保存丢失问题 2016-08-26 10:14:48 +08:00
cxt 60beb2abab 首页左侧班级和项目列表的收藏功能 2016-08-25 11:30:47 +08:00
yuanke aa11f39b2d Merge branch 'develop' into weixin_guange 
Conflicts:
	public/assets/wechat/class.html
	public/javascripts/wechat/controllers/class.js
 2016-08-25 11:24:27 +08:00
huang 69301a1120 Pull reques登录提示（权限控制） 2016-08-25 10:04:51 +08:00
huang 799c451921 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-25 09:20:46 +08:00
cxt 21c48ea383 at所有人 2016-08-24 17:46:18 +08:00
huang 80c6132ba5 Merge branch 'rep_quality' into develop 2016-08-24 17:39:44 +08:00
huang 7493de1334 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-24 17:38:40 +08:00
cxt 56b74b755b 取消收藏 2016-08-24 17:30:30 +08:00
huang 8cc60ef1e8 delete some language of quality_analysis 2016-08-24 17:28:55 +08:00
huang f0ed380002 Merge branch 'rep_quality' into develop 2016-08-24 15:13:37 +08:00
huang ba6d0e6926 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-24 15:13:00 +08:00
huang bafb3e98a7 tip for sonar results 2016-08-24 15:05:10 +08:00
yuanke e0957113d8 项目issue模版消息提醒 2016-08-24 11:28:50 +08:00
yuanke bd3911c072 . 2016-08-24 11:22:34 +08:00
yuanke f8dfe85156 项目issue增加模版消息 2016-08-24 11:03:38 +08:00
yuanke 0eb1c1a392 微信审核链接修改 2016-08-24 09:45:18 +08:00
yuanke e0ab93b739 微信审核路径修改 2016-08-24 09:30:28 +08:00
yuanke c5cedbfcc2 修改班级和项目审核模版消息地址 2016-08-23 17:37:23 +08:00
cxt 461912bec2 班级作业，上传附件提交作品，重试后直接提交，提交页面附件不显示但验证弹框中被删除的附件又显示了 2016-08-23 10:50:51 +08:00
cxt b8dc444cc7 普通作业和编程作业在题库发送后，编辑并进行发布，没有自动创建作品列表 
复制班级功能里，勾选“作业”，同上

对应方法：在作业的发布时间点（不用考虑作业是通过何种途径生成的），除了发布作业外，应该为该作业自动创建完整的作品列表（分组作业除外）
 2016-08-23 10:17:08 +08:00
daiao 7e34062435 Merge branch 'dev_shcool' into develop 2016-08-23 09:43:38 +08:00
huang ea6b928188 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-22 17:19:48 +08:00
yuanke 864c6c821f Merge branch 'weixin_guange' into develop 2016-08-22 16:50:13 +08:00
huang 5e98884801 tip for sonar 2016-08-22 16:32:32 +08:00
yuanke c275557fa7 调试 2016-08-22 15:44:20 +08:00
cxt f5cbdf11bc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-22 15:24:18 +08:00
cxt 06361246c7 作品列表中的已提交人数无法自动刷新 2016-08-22 15:24:12 +08:00
yuanke 7f8a6f931b 调试 2016-08-22 15:23:34 +08:00
yuanke d5a7d10f5d 调试 2016-08-22 14:59:50 +08:00
yuanke 9e4aaa767c 调试 2016-08-22 14:57:28 +08:00
yuanke 0c381ad53d 调试 2016-08-22 14:42:04 +08:00
yuanke d9e031c314 调试 2016-08-22 14:34:42 +08:00
huang f8fc656920 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-22 14:22:31 +08:00
huang 300dab5fa1 版本库更新时间提交 2016-08-22 14:20:59 +08:00
yuanke 53bca5c006 调试 2016-08-22 13:52:40 +08:00
yuanke 0412009182 调试 2016-08-22 11:13:14 +08:00
yuanke a38d4f15a6 调试 2016-08-22 10:50:22 +08:00
yuanke 2e86738fd2 调试 2016-08-22 10:42:40 +08:00
yuanke 42c6e4c5c5 调试 2016-08-22 10:26:57 +08:00
yuanke be95b3990d 调试 2016-08-22 10:04:31 +08:00
yuanke 96ce09ede3 Merge branch 'weixin_guange' into develop 2016-08-14 16:32:28 +08:00
yuanke 8a94d205f4 . 2016-08-14 16:20:53 +08:00
yuanke a7ef293356 . 2016-08-14 15:33:24 +08:00
yuanke 7e40c2447f 修改用户帐号显示， 2016-08-14 15:25:46 +08:00
yuanke c16ea6d8be Merge branch 'weixin_guange' into develop 2016-08-14 12:06:52 +08:00
yuanke ba0d32bd09 修改判断绑定代码 2016-08-14 11:59:26 +08:00
yuanke 9d867aa224 修改微信BUG 2016-08-14 11:50:31 +08:00
huang ea3ba1f71e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-14 11:30:54 +08:00
huang ff592c106e sonar最新触发时间获取 2016-08-14 10:29:52 +08:00
yuanke 56da43221d 修改绑定登录的地址 2016-08-14 10:28:46 +08:00
yuanke 9446760258 Merge branch 'weixin_guange' into develop 
Conflicts:
	db/schema.rb
 2016-08-14 09:56:17 +08:00
huang 966722b920 关闭和打开的时候显示root问题 2016-08-13 16:43:00 +08:00
huang d7faed7f6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 15:39:06 +08:00
cxt 35260f2f6d Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-08-13 15:36:48 +08:00
cxt f4e965c9fb Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-13 15:35:10 +08:00
cxt 2759d562ac 首页项目列表 2016-08-13 15:35:03 +08:00
daiao 4a9967674a 1. 强制编辑基本资料，在删除单位时给出消息通知 
2. 单位名称申请提示一直显示
3. 申请单位的消息通知显示申请人头像，并连接到申请人主页
 2016-08-13 14:29:33 +08:00
huang 93f8ac31f1 项目资源库新分页及ajax刷新 2016-08-13 14:17:50 +08:00
yuanke a979bd3d54 微信修改绑定成功的模版消息内容 2016-08-13 14:03:53 +08:00
huang 37df983009 项目列表 2016-08-13 11:13:11 +08:00
yuanke 9b52c1504e 调试 2016-08-12 17:33:45 +08:00
yuanke 2ff83aff81 调试 2016-08-12 17:30:48 +08:00
huang 75971120f7 Merge branch 'develop' into rep_quality 2016-08-12 17:14:18 +08:00