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

10953 Commits

Author SHA1 Message Date
cxt 19861ba8c6 超级管理员的组织可关联所有公开课程和项目 2016-04-14 12:30:33 +08:00
yuanke ef4b256313 Merge branch 'yuanke' into develop 
Conflicts:
	app/models/homework_common.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-14 11:32:35 +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
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表. 2016-04-14 11:29:22 +08:00
huang c87611dfec 动态中添加版本库统计 2016-04-14 11:18:17 +08:00
cxt d33f839b95 中文字符 2016-04-14 10:57:37 +08:00
cxt 76cfa83666 微信模板消息接口 2016-04-14 10:47:53 +08:00
huang ef28266225 曲线颜色 2016-04-14 10:37:38 +08:00
huang acf4e15f09 统计数左侧刷新 2016-04-14 10:26:25 +08:00
huang 12efc10759 图标曲线 总变更为+ 2016-04-14 10:10:31 +08:00
huang adf6cca435 完成代码行数的提交和统计 2016-04-13 20:39:20 +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 2889353844 作品列表中的“未参与”增加tip：“该作品未被匿评” 2016-04-13 16:27:20 +08:00
cxt 062af3c57a 作业积分出现负分 2016-04-13 16:11:57 +08:00
huang f9c4c4b86f 版本库不同分支之间的统计 2016-04-13 16:03:59 +08:00
cxt 42f960922a 个人主页的项目排序按更新时间排序 2016-04-13 15:39:05 +08:00
cxt a21ea98b37 个人主页中的课程列表出现重复课程 2016-04-13 15:14:35 +08:00
huang 426f5a76cc 提交列表中添加不分支的提交记录功能 2016-04-13 14:44:57 +08:00
huang f7cb451feb gitlab版本库添加提交信息统计接口 2016-04-13 14:36:43 +08:00
Tim deda05b048 作业下拉选择 2016-04-13 14:23:24 +08:00
cxt 4d581d07b8 作业发布默认选中禁用匿评 2016-04-13 14:14:41 +08:00
cxt fcd1684658 作业列表按更新时间排序 作业列表左上角添加作业的下拉列表 2016-04-13 11:20:38 +08:00
cxt 7fcd229f85 分组作业--作品列表中：点击关联的项目跳转至该项目主页 2016-04-13 10:09:54 +08:00
huang 04849659de 版本库统计 2016-04-12 16:00:54 +08:00
cxt 5a3b68816a 冲突 2016-04-12 15:57:18 +08:00
cxt e420be8ee9 Merge branch 'weixin_guange' into develop 
Conflicts:
	app/models/blog_comment.rb
 2016-04-12 15:56:08 +08:00
cxt 70afbb3323 姓名的判断、 2016-04-12 15:46:56 +08:00
cxt 1882cd8f4f 用户姓名不显示 2016-04-12 15:42:59 +08:00
cxt 2898805aa7 回复的模板消息 2016-04-12 15:12:40 +08:00
huang dc0b7defa1 版本库show页面简化及注释 2016-04-12 11:10:30 +08:00
cxt 275895f805 模板消息的重构 2016-04-12 11:00:47 +08:00
guange 055ba00de5 绑定成功后关闭页面 2016-04-09 23:20:24 +08:00
guange 7c5d62b8a8 头像url不显示 2016-04-09 23:16:22 +08:00
cxt 5e3e2e64a9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-09 18:35:07 +08:00
cxt 40dba4d463 Merge branch 'develop_new' into develop 2016-04-09 18:34:51 +08:00
guange beec2b3246 merge 2016-04-09 18:17:07 +08:00
huang a2a3d6b6b9 Merge remote-tracking branch 'remotes/origin/weixin_guange' into develop 
Conflicts:
	app/models/blog_comment.rb
 2016-04-09 17:01:20 +08:00
cxt c041f742c1 缺陷和留言的回复 2016-04-09 16:21:13 +08:00
guange 2d41d0a2f6 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-09 16:02:24 +08:00
cxt 007fee95bd 作业和留言回复的模板消息 2016-04-09 14:41:45 +08:00
cxt 3f365e75b5 讨论区的模板消息 2016-04-09 14:13:59 +08:00
cxt 930d95f8b5 私有动态不显示的问题 2016-04-09 13:29:26 +08:00
guange 96dfeead0f Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 21:46:56 +08:00
huang ab34fec172 资源导入的时候记数没有自动增加问题 2016-04-08 21:30:59 +08:00
huang 3f3048a51b 组织私有课程、项目关联提示 2016-04-08 21:04:06 +08:00
cxt 281fcf315f 点击模板消息页面为空 2016-04-08 21:01:15 +08:00
huang f951d22d56 发布博客500问题 2016-04-08 20:53:30 +08:00
huang cd9ad535f5 1、修改默认图片 
2、作品弹框问题
 2016-04-08 20:44:09 +08:00
guange 9ae030ed9e Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-04-08 20:02:40 +08:00
guange 3ff19364dc merge 2016-04-08 20:02:19 +08:00
cxt 845b1cdab8 模板 2016-04-08 19:54:33 +08:00
cxt 440ba27fa4 回复 2016-04-08 18:52:26 +08:00
huang cb9fd1d2ba Merge branch 'hjq_beidou' into develop 2016-04-08 18:20:58 +08:00
huang 9f44babff5 去掉作业提交附件中用户名 2016-04-08 18:20:06 +08:00
guange 3ba7372523 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-08 17:34:11 +08:00
guange 612b79410b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 17:33:41 +08:00
guange b627513bae 中文问题 2016-04-08 17:33:00 +08:00
cxt d6daa906b6 回复 2016-04-08 16:58:27 +08:00
huang 9fa50e0452 编码问题 2016-04-08 16:19:38 +08:00
cxt fcddaf403c 删除博客为空的数据 2016-04-08 15:59:23 +08:00
guange 8dc47c9bd3 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:51:46 +08:00
guange c5b1ffb42f 错误信息打印到日志 2016-04-08 14:50:49 +08:00
cxt c5048d7c72 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:46:49 +08:00
cxt e007ee58ef 博客动态 2016-04-08 14:46:42 +08:00
guange a35511195a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:42:39 +08:00
guange abf4a80942 错误信息打印到日志 2016-04-08 14:42:23 +08:00
cxt 15ce3ba7e9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:38:43 +08:00
cxt eee7b89388 项目动态 2016-04-08 14:38:35 +08:00
guange 5241dddca2 错误信息打印到日志 2016-04-08 14:38:23 +08:00
guange ce611bc725 merge 2016-04-08 14:17:56 +08:00
guange e9ab2a482b key3修改 2016-04-08 14:17:09 +08:00
cxt 51a61a52d4 activity.rb 2016-04-08 14:12:17 +08:00
cxt 4df5f3114d 模板消息 2016-04-08 14:00:01 +08:00
huang 57716e7efc 解决项目添加成员没选中而导致点击确定发消息的问题 2016-04-08 12:31:40 +08:00
cxt c870b92489 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 11:59:21 +08:00
cxt a3097c2752 truncate函数 2016-04-08 11:59:13 +08:00
guange 6baf0b46f7 模板消息修改 2016-04-08 11:37:58 +08:00
guange f62b393d7d 模板消息修改 2016-04-08 11:23:28 +08:00
guange 5cc0ac04e6 模板消息修改 2016-04-08 11:19:05 +08:00
guange 0731405828 重新再次进来的用户提示欢迎信息 2016-04-08 10:50:05 +08:00
guange aa9cb4e579 merge 2016-04-08 10:44:36 +08:00
huang 549ee9daa2 上传非图片格式的不显示问题 2016-04-08 10:41:11 +08:00
huang bed583b051 提示语 2016-04-08 10:01:54 +08:00
huang 320ed07b31 解决上传图片问题 2016-04-08 09:55:02 +08:00
huang 3501d6f1d6 完成组织模块的开发 2016-04-07 17:05:22 +08:00
cxt ae981cfb07 项目问答区改成项目讨论区 2016-04-07 16:57:40 +08:00
cxt 523a623f1b 作业详情页面的点赞 2016-04-07 16:53:37 +08:00
cxt c404d26ac5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-07 16:40:36 +08:00
cxt dc0bf4df30 传act_id、act_type到详情页面 2016-04-07 16:40:21 +08:00
txz 139a7931ee 点赞功能修改 2016-04-07 16:39:04 +08:00
cxt 60c8320f82 praise api的修改 2016-04-07 15:42:08 +08:00
huang 8d40950491 项目讨论区锁定后不能回复 2016-04-07 15:20:25 +08:00
cxt 2fe32fda61 点赞的js 2016-04-07 15:17:42 +08:00
cxt c8e769e05b 回复倒序排列 2016-04-07 15:09:17 +08:00
huang 23a4a29c76 关联项目、课程中过滤掉私有课程、项目 2016-04-07 14:12:24 +08:00
cxt edb18bd1b8 api提供has_praise 2016-04-07 11:16:38 +08:00
txz 8e1473a484 点赞代码优化等 2016-04-07 09:26:24 +08:00
huang 623114dc41 解决删除项目的私有资源显示在我的资源中的问题 2016-04-06 19:02:07 +08:00
cxt 8f7c6f49b7 api的修改 2016-04-06 14:56:09 +08:00
huang 378dfca006 组织图标只有管理员可以修改 2016-04-06 13:53:40 +08:00
cxt 6c527a9a54 点赞的api 2016-04-06 11:40:05 +08:00
huang a6f6f63d6d 图片上传添加提示 2016-04-06 11:05:13 +08:00
huang 2162d7d4b8 组织banner上传功能 2016-04-06 10:40:38 +08:00
huang c408185b40 Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new 
Conflicts:
	db/schema.rb
 2016-04-05 11:25:25 +08:00
cxt c3ee4dadfb 作品提交确认框的高度添加限制 2016-04-05 11:24:13 +08:00
guange 58c1b27600 加入openid传参 2016-04-02 08:13:52 +08:00
guange a6a0681b78 openid参数 2016-04-02 08:08:03 +08:00
guange e1f1c6fbc0 openid参数 2016-04-02 08:05:49 +08:00
guange ff93e9f79b 修改返回为json 2016-04-02 07:56:12 +08:00
guange 1926f0ba53 修改openid路由 2016-04-02 07:49:36 +08:00
guange a25fe6cef8 修改openid路由 2016-04-02 07:47:34 +08:00
guange 9c93b3f9a6 修改openid调用位置 2016-04-02 07:43:55 +08:00
guange 7d4de36521 修改openid调用位置 2016-04-02 07:39:46 +08:00
cxt 9da89ef5e2 课程通知的回复 2016-04-02 00:37:24 +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
cxt 790b452a9b issue回复 2016-04-01 23:22:39 +08:00
cxt cc2fe6108a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 22:38:57 +08:00
cxt 5e697e5367 作业的回复 2016-04-01 22:38:45 +08:00
txz 0d24de7198 详情页面回复 2016-04-01 22:35:44 +08:00
cxt 7dccb0d963 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 21:32:56 +08:00
cxt 88c39512b9 journal的修改 2016-04-01 21:32:33 +08:00
huang 0459856a2c 上线logo更换 2016-04-01 21:30:32 +08:00
txz 58e5fe85c3 issue 详情页面 2016-04-01 21:28:25 +08:00
txz 4902361b3f 冲突解决 2016-04-01 20:56:50 +08:00
txz 596bf641ac 最新动态各详情页面 2016-04-01 20:53:21 +08:00
cxt b3b0488bf5 动态点击更多 2016-04-01 20:46:38 +08:00
huang ac1b3338c5 logo图标替换 2016-04-01 20:10:28 +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 c00c674c34 Merge branch 'develop' into hjq_beidou 
Conflicts:
	app/controllers/organizations_controller.rb
 2016-04-01 19:24:41 +08:00
cxt 66e80d034f issue只取回复 2016-04-01 18:46:00 +08:00
huang 007419f9cc 精华样式问题 2016-04-01 18:38:05 +08:00
Yiang Gan 869810b3a0 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 18:23:21 +08:00
Yiang Gan af2bd66847 回复api 2016-04-01 18:23:12 +08:00
huang 94478829b6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-01 17:23:37 +08:00
huang 9e7c595e55 组织发送动态的显示 2016-04-01 17:23:15 +08:00
linchun 02ebaf23d1 修改管理员界面组织列表总组织的链接 2016-04-01 16:17:26 +08:00
linchun 0798046847 Merge branch 'develop' into linchun 2016-04-01 15:56:51 +08:00
linchun c1c19f6d60 修改管理员界面作业列表报500错误的bug 2016-04-01 15:54:59 +08:00
Yiang Gan 4088fb9cb4 课程作业详情页面 2016-04-01 14:58:41 +08:00
huang a9412b959e 动态一致问题 2016-04-01 11:54:58 +08:00
huang aee695e94d 组织动态添加poll、 2016-04-01 11:48:13 +08:00
huang 25da925497 课程列表显示内容统一 2016-04-01 11:38:20 +08:00
huang 638280a07e 样式问题 2016-04-01 10:31:16 +08:00
huang 8f4ff2bf91 列表样式问题 2016-04-01 10:20:31 +08:00
huang 92a08dc606 作业500问题 
admin组织编辑500问题
 2016-04-01 09:37:31 +08:00