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

12986 Commits

Author SHA1 Message Date
daiao 758aaca12a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-25 15:29:19 +08:00
daiao a466fdd64e 强制修改基本资料：申请单位点击确定后，进入主页面；提问按钮不可用 2016-08-25 15:29:04 +08:00
cxt 60beb2abab 首页左侧班级和项目列表的收藏功能 2016-08-25 11:30:47 +08:00
yuanke 6abdb47ec5 模版消息标点 2016-08-25 11:25:51 +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
yuanke 4932b9fad8 班级留言不显示 2016-08-25 10:55:22 +08:00
huang 3778871f58 issue在项目动态、列表、用户动态中删除回复添加提示 2016-08-25 10:39:16 +08:00
huang 69301a1120 Pull reques登录提示（权限控制） 2016-08-25 10:04:51 +08:00
yuanke f35c3e8528 微信新闻、issue增加二级回复等 2016-08-25 09:45:23 +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
huang 0cc59260cd modified sonar list form of language 2016-08-24 17:35:04 +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
cxt ea7f65308e at所有人后不应带有用户登录名 2016-08-24 16:02:02 +08:00
cxt 7d89f69981 班级和项目收藏夹 2016-08-24 15:58:23 +08:00
daiao a3ec35c008 个人主页报500 2016-08-24 15:56:03 +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
daiao 90803fbb2a Merge branch 'dev_shcool' into develop 2016-08-24 14:53:31 +08:00
daiao 8b0c0925dd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-08-24 14:52:10 +08:00
daiao 078900088a 修复：新建组织关联trustie-forge项目，点击组织动态的论坛动态报500 2016-08-24 14:41:26 +08:00
cxt 6af43070c7 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-24 13:56:53 +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
Tim bb2b51aa8d 收藏按钮增加title 2016-08-24 10:30:20 +08:00
Tim 57ecffc130 班级新增收藏功能 2016-08-24 10:28:09 +08:00
yuanke 0eb1c1a392 微信审核链接修改 2016-08-24 09:45:18 +08:00
yuanke 2e1e9391b6 微信审核链接路径修改 2016-08-24 09:39:41 +08:00
cxt 5d5bd88c88 个人主页：用户不应有修改他人头像的权限 2016-08-24 09:30:57 +08:00
yuanke e0ab93b739 微信审核路径修改 2016-08-24 09:30:28 +08:00
yuanke 3af5bc5813 微信审核修改 2016-08-23 17:42:48 +08:00
yuanke c5cedbfcc2 修改班级和项目审核模版消息地址 2016-08-23 17:37:23 +08:00
cxt 74b15229fb at所有人 2016-08-23 17:15:51 +08:00
yuanke c612104fab 微信增加发帖功能 2016-08-23 16:52:35 +08:00
daiao 5088770214 修复：文章附件和资源栏目下载权限一致 2016-08-23 16:34:11 +08:00
cxt 461912bec2 班级作业，上传附件提交作品，重试后直接提交，提交页面附件不显示但验证弹框中被删除的附件又显示了 2016-08-23 10:50:51 +08:00
yuanke 965d8930dc 班级增加动态 2016-08-23 10:23:46 +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
cxt 572ad5a162 个人主页的课程和项目展开出现重复数据 2016-08-22 10:49:46 +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 38a58cd3fc Merge branch 'weixin_guange' into develop 2016-08-14 13:47:22 +08:00
yuanke 2f8b459a6f 微信用户激活修改 2016-08-14 13:35:00 +08:00
yuanke 22e4e56029 微信自动激活修改 2016-08-14 13:24:07 +08:00
yuanke e17683d3d5 自动激活微信帐号 2016-08-14 12:42:39 +08:00
yuanke f50cfe159c 微信用户合并修改 2016-08-14 12:35:03 +08:00
yuanke 0fc6b84584 自动激活修改 2016-08-14 12:32:47 +08:00
yuanke 6eca6253db 微信注册自动激活 2016-08-14 12:29:10 +08:00
yuanke 94777a42c4 修改重新获取refresh_token 2016-08-14 12:16:30 +08:00
yuanke 962a62577b 测试测试 2016-08-14 12:13:04 +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 577aa40ea1 time for nil 2016-08-14 11:27:49 +08:00
yuanke 3be75c8633 微信BUG修改 2016-08-14 11:18:23 +08:00
huang d7177713ff 勾选游客后，游客能够下载资源 2016-08-14 11:16:43 +08:00
guange 1d53af36cd merge 2016-08-14 11:16:20 +08:00
guange dc7ff8f90f . 2016-08-14 11:15:37 +08:00
yuanke 6cea0bfb67 . 2016-08-14 10:56:38 +08:00
yuanke 91a64a67c5 微信注册和绑定判断BUG修改 2016-08-14 10:46:17 +08:00
huang 7c28f97208 get quality analisys update time 2016-08-14 10:45:01 +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
yuanke 7c222373dc 修改获取用户关注公众号结果 2016-08-14 09:55:02 +08:00
yuanke 4eec1f5d4e 获取未关注修改 2016-08-14 09:50:43 +08:00
yuanke 8ab003d5ee 分享页提交回复未关注公众号会跳到二维码界面 2016-08-14 09:38:47 +08:00
guange ea85c0c608 . 2016-08-13 21:57:22 +08:00
yuanke 61680c6343 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-13 18:35:21 +08:00
yuanke 85b3df889c 修改微信获取课程大纲的代码 2016-08-13 18:35:11 +08:00
huang 1f4f03d8ed 修改项目列表中的资源链接 2016-08-13 17:31:09 +08:00
cxt a4a0ef139b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 17:04:16 +08:00
cxt 1374444ec1 左侧项目列表的展开 2016-08-13 17:04:09 +08:00
huang 3ce088002a 留言和已关闭流程修改 2016-08-13 16:53:56 +08:00
huang 896e301b33 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 16:43:14 +08:00
huang 966722b920 关闭和打开的时候显示root问题 2016-08-13 16:43:00 +08:00
Tim f67336fbe5 课程信息单词折行 2016-08-13 16:27:29 +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
guange c9d32ca69b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-13 15:25:07 +08:00
guange 70d58ccf85 恢复授权页 2016-08-13 15:24:52 +08:00
huang 9003040d6a 版本库获取动态API修改 2016-08-13 14:42:24 +08:00
yuanke e06f09406c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-13 14:41:46 +08:00
guange dde0fbb3c1 迁移用户 2016-08-13 14:39:15 +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 3a83b40a64 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-13 14:04:05 +08:00
yuanke a979bd3d54 微信修改绑定成功的模版消息内容 2016-08-13 14:03:53 +08:00
guange 7b28d2d183 . 2016-08-13 13:57:27 +08:00
guange fc74e714ee . 2016-08-13 13:53:21 +08:00
huang 00f032816c 版本库获取方式修改 2016-08-13 13:48:23 +08:00
guange a761bfe3f8 . 2016-08-13 11:37:37 +08:00
huang 37df983009 项目列表 2016-08-13 11:13:11 +08:00
guange b9cf2527a4 merge 2016-08-13 11:11:24 +08:00
guange 3130296e69 修改微信个人信息获取实现 2016-08-13 11:09:48 +08:00
yuanke 852c7929b6 修改审批通知链接 2016-08-13 10:39:32 +08:00
huang 1b19d227f9 项目列表样式及连接 2016-08-13 10:17:38 +08:00
yuanke 88e23dca80 微信回复自动注册及获取微信昵称修改 2016-08-12 18:19:21 +08:00
yuanke 3051b82ac2 调试 2016-08-12 18:03:58 +08:00
yuanke 697e857806 调试 2016-08-12 18:00:09 +08:00
yuanke e21f7a34bd 调试 2016-08-12 17:46:44 +08:00
yuanke 1a835a25db 调试 2016-08-12 17:38:24 +08:00
yuanke 9b52c1504e 调试 2016-08-12 17:33:45 +08:00
yuanke 2ff83aff81 调试 2016-08-12 17:30:48 +08:00
huang ce9c2d3d06 搜索的时候分页刷新 2016-08-12 17:25:20 +08:00
huang 75971120f7 Merge branch 'develop' into rep_quality 2016-08-12 17:14:18 +08:00
huang 047eea125d 课程资源分页及局部刷新 2016-08-12 17:05:46 +08:00
yuanke bd12ea169d 调试 2016-08-12 16:58:48 +08:00
yuanke 5b208202a0 调试 2016-08-12 15:38:17 +08:00
yuanke ae437912d8 调试 2016-08-12 15:06:28 +08:00
yuanke ae13435de6 调试 2016-08-12 14:47:54 +08:00
yuanke d60857eaea 调试 2016-08-12 14:41:56 +08:00
yuanke 9fcb43b949 调试 2016-08-12 14:29:19 +08:00
yuanke 1f8ea39765 调试 2016-08-12 14:25:45 +08:00
yuanke 2cfd876f2f 调试 2016-08-12 14:17:50 +08:00
yuanke c307f7769f 调试 2016-08-12 14:13:53 +08:00
huang 7efc8ccac6 新建项目，增加项目名称输入例 2016-08-12 14:11:15 +08:00
yuanke ded55ca022 调试 2016-08-12 14:08:27 +08:00
yuanke fd036d758e 调试 2016-08-12 13:50:44 +08:00
yuanke bce3513424 分享修改 2016-08-12 12:09:20 +08:00