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

12844 Commits

Author SHA1 Message Date
cxt 5b8883960b Merge branch 'cxt_course' into develop 2016-08-05 18:52:09 +08:00
Tim 0200590a70 待处理合并无更新内容时，页尾显示偏移bug 2016-08-05 18:42:14 +08:00
cxt d3db6719eb “我的作业”中编辑作业不跳转到“题库”，而是返回到“我的作业” 2016-08-05 18:41:32 +08:00
huang 910fe0f48c css 2016-08-05 18:23:03 +08:00
huang f54eafce76 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 18:12:29 +08:00
huang a46aba1491 样式调整 2016-08-05 18:12:08 +08:00
cxt 55637808ff 班级作品：两种角色的成员，先学生身份提交作品，再教辅身份评阅自己的作品，评阅结果不能自动刷新 2016-08-05 18:07:54 +08:00
Tim ee1d30b277 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 18:01:23 +08:00
Tim cd30f94d72 题库发送预览弹框位置及可拖拽js更新 2016-08-05 18:01:11 +08:00
huang 42e616bdea Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 18:00:32 +08:00
huang 7c484b4f4a 页面显示问题 2016-08-05 18:00:10 +08:00
Tim 920e470f6d pull request列表省略号显示 2016-08-05 17:51:39 +08:00
cxt f5a2d6acdb 班级作品：学生提交作品弹出作品校验框，点击重试后，作品列表中默认生成的作品记录就没有了 2016-08-05 17:33:31 +08:00
Tim d4f08f6498 课程logo替换，邀请码样式更改，班级路径显示主讲教师 2016-08-05 17:30:13 +08:00
cxt ea4f0d7d9d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 16:52:01 +08:00
cxt aaaeb4b8da 子域名申请消息报错 2016-08-05 16:51:51 +08:00
huang 3afdeda4d3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 16:42:44 +08:00
huang af7e507279 合并权限 2016-08-05 16:42:06 +08:00
huang 3ef2509d27 报告人员加入项目不用提醒 2016-08-05 16:35:22 +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 fb5a969fd3 消息弹窗 2016-08-05 16:30:08 +08:00
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
daiao 7fbca5f260 单位审查消息及其BUG修复 2016-08-05 16:14:26 +08:00
cxt 0d86a28c54 我的作业 2016-08-05 16:12:53 +08:00
huang dd768c2913 Merge branch 'cs_optimize_txz' into develop 
Conflicts:
	public/stylesheets/css/common.css
 2016-08-05 15:30:03 +08:00
huang 81ce93e88b Merge branch 'rep_quality' into develop 2016-08-05 15:28:39 +08:00
huang 43a4e0a2bf fork成功不跳转提示 2016-08-05 15:23:52 +08:00
huang 308b050612 link to路由问题 2016-08-05 14:43:44 +08:00
huang b62ac02c15 自身分支创建PR修改 2016-08-05 14:19:09 +08:00
Tim 56452d69f4 侧导航字体大小，颜色更改 2016-08-05 14:11:35 +08:00
huang 4ec8cc9a50 PR新建相关功能完善 2016-08-05 11:19:36 +08:00
huang f3c0c25d76 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-05 11:10:59 +08:00
huang b86b2299a7 fork分支选择 js 2016-08-05 11:10:39 +08:00
Tim c679b986d6 侧导航新增请求快捷链接 2016-08-05 11:07:44 +08:00
huang b297446778 select选择框 2016-08-05 10:42:06 +08:00
cxt f9bfe278c0 多重身份的学生匿评变为了教辅评分 2016-08-05 10:03:47 +08:00
huang ab6acb460e forke项目发送pull request API 2016-08-04 19:32:44 +08:00
huang f4bda16469 fork分支PR 2016-08-04 18:30:04 +08:00
yuanke bb46aa4745 微信点击已审批模版消息进入界面显示修改 2016-08-04 18:09:54 +08:00
huang 5419103268 修改API(gitlab中创建所有pullrequest为Admin的问题) 2016-08-04 17:01:19 +08:00
cxt b7c05fed4a 首页样式和js调整 2016-08-04 16:33:51 +08:00
huang 99fa39371d 接受请求ajax刷新 2016-08-04 15:36:02 +08:00
yuanke 55afb84aef 模版消息标题加上句号，审核模版消息再次点击显示修改 2016-08-04 15:32:25 +08:00
huang 9eb084c3bd Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/pull_requests/_show.html.erb
 2016-08-04 15:08:05 +08:00
huang 515649beb6 接受PR局部刷新及跳转 2016-08-04 15:07:15 +08:00
Tim 33467d3152 已处理页面样式；新建时选择项目刷新分支js 2016-08-04 15:04:27 +08:00
yuanke ee019cd364 修改测试版微信加入项目审核通知 2016-08-04 14:47:39 +08:00
huang 54a9fadbd1 判断合并和未合并的pr 2016-08-04 14:24:32 +08:00
huang 362e95d103 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-04 14:11:53 +08:00
huang 7084a3fed9 新建pull request的时候JS控制标题不能为空 2016-08-04 14:11:24 +08:00
yuanke 12a9c95c01 微信项目及班级邀请码相关BUG修改 2016-08-04 14:07:35 +08:00
Tim 6f1b7f827e Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-04 14:05:07 +08:00
Tim b8a40862ce 改变行代码格式化，不折行 2016-08-04 14:04:55 +08:00
huang 1f5c4a800f 代码没有改动时候提示 2016-08-04 11:35:04 +08:00
huang 0b3e1f558c Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/pull_requests/show.html.erb
 2016-08-04 11:15:38 +08:00
huang 21747d02a2 新建PR成功后JS跳转HTML跳转，相关页面局部刷新，及错误提示 2016-08-04 11:13:31 +08:00
cxt 6c7b53f7d4 首页左侧栏 2016-08-04 11:05:34 +08:00
yuanke aaa1c01eed 微信动态分享图片修改 2016-08-04 10:47:35 +08:00
Tim f444d6fab0 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/pull_requests/_form.html.erb
 2016-08-04 10:46:18 +08:00
Tim cedff021ad 分支下拉框样式；改动样式；无合并内容提示 2016-08-04 10:44:48 +08:00
huang a62ede1a33 先建pull request及局部刷新 2016-08-04 10:08:13 +08:00
yuanke c0579de57d 微信分享内容修改 2016-08-04 10:00:55 +08:00
yuanke 17c98eb9fe 微信分享修改 2016-08-04 09:08:18 +08:00
huang 2e91da4f28 项目分支获取 2016-08-03 17:37:37 +08:00
daiao 7f62de59e1 优化周二代码审查的代码 2016-08-03 17:36:04 +08:00
huang c20b679c22 PR new调整 2016-08-03 17:04:02 +08:00
huang f8b53b8dfc Pull request列表页面分类 2016-08-03 16:54:37 +08:00
yuanke 29e707a88d 微信加入项目修改、二级回复三个回复时多了个边框BUG修改等 2016-08-03 16:31:33 +08:00
huang 9f9eed2e27 隐藏编辑功能 2016-08-03 16:05:29 +08:00
huang 22a8adb64e 添加统计数目 2016-08-03 16:02:42 +08:00
huang b8cccdffda 完成changes数据获取及展示 2016-08-03 15:56:07 +08:00
huang 8e329db4d8 pull request commits样式调整 2016-08-03 15:16:28 +08:00
huang 27e755a0a9 数据获取及展示 2016-08-03 15:06:10 +08:00
cxt f262447ff1 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/user_homeworks.html.erb
 2016-08-03 15:01:43 +08:00
cxt cecf917764 从题库选用作业时增加提示：“您选中的题是“我收到的作业”，不能选用” 2016-08-03 15:00:16 +08:00
Tim a5fe620452 题库翻页居中对齐 2016-08-03 14:57:02 +08:00
yuanke a34272027e 微信菜单及项目班级审核修改 2016-08-03 14:55:54 +08:00
huang 0a9224d036 每次请求提交的代码 2016-08-03 14:43:27 +08:00
cxt bae775ec34 题库的搜索调整 2016-08-03 14:06:47 +08:00
huang be081f5c66 添加Api（提交内容，改动）及相关方法路由 2016-08-03 13:57:59 +08:00
cxt acc3ba121f 测试集的显示、新版分页 2016-08-03 13:46:59 +08:00
cxt 718b13e6c1 新版题库 2016-08-03 11:12:55 +08:00
huang 1cb6809bdf Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/pull_requests/new.html.erb
 2016-08-03 11:09:14 +08:00
huang 182c861b30 创建pull request 2016-08-03 11:07:49 +08:00
Tim e7fa38e52c pull request show页面 2016-08-03 11:00:31 +08:00
yuanke 6ee6cdf28f 微信项目加入审核修改 2016-08-03 10:56:55 +08:00
daiao 5f969c6593 单位审核相关Bug修复 2016-08-03 10:36:03 +08:00
yuanke 65719add19 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-03 09:37:36 +08:00
yuanke 4ab2427827 微信项目及课程申请审核相关功能 2016-08-03 09:37:24 +08:00
guange 6f2b84570f 去除调试模式 2016-08-02 17:48:51 +08:00
guange 2a67ec5407 配置登录页菜单 2016-08-02 17:27:40 +08:00
guange 2632f7aa59 引入wechat js sdk 2016-08-02 17:01:10 +08:00
huang 5e9c27b63d 代码封装 2016-08-02 16:38:56 +08:00
Tim b91bb1f0d2 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-02 16:37:41 +08:00
Tim c8dce2c2fc 请求处理页面 2016-08-02 16:37:30 +08:00
huang 56a444dac0 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-02 16:34:31 +08:00
huang 3ce1ac80b4 pull_request ---> new 2016-08-02 16:34:20 +08:00
Tim 09f25588a8 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-02 16:10:34 +08:00
Tim 7e440596ab 新建请求，js效果 2016-08-02 16:10:25 +08:00
huang 20bdd23665 pull requtst show 2016-08-02 16:06:51 +08:00
yuanke a4281b4934 Merge branch 'develop' into weixin_guange 2016-08-02 15:51:29 +08:00
yuanke 614e877e6e 微信项目和班级加入修改 2016-08-02 15:50:15 +08:00
huang d286d3fe06 pullrequest头部 2016-08-02 15:44:25 +08:00
Tim 3e95b070d0 合并请求代码 2016-08-02 15:00:05 +08:00
huang 7658844a28 鼠标经过弹框消息提示 2016-08-02 14:53:33 +08:00
huang 94b36e227c 申请加入项目消息刷新，同时更新其它管理员的消息状态 2016-08-02 13:03:33 +08:00
huang 0b113bb985 项目邀请码识别小写 2016-08-02 11:25:19 +08:00
Tim 65d4af1307 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-02 10:03:57 +08:00
Tim 9af8757ceb 项目合并请求 2016-08-02 10:03:42 +08:00
huang 3660f8cbce gitlab相关方法的封装 2016-08-01 17:38:37 +08:00
Tim 1fc617d5fa pull request页面删除 2016-08-01 16:57:55 +08:00
Tim e33bbfff3f Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-01 16:53:44 +08:00
huang b718803bd9 修改控制器名称及控制器查询访问权限 2016-08-01 16:54:31 +08:00
Tim be36755d95 代码合并页面 2016-08-01 16:53:33 +08:00
huang 685f9d8090 项目左侧权限控制 2016-08-01 16:19:15 +08:00
daiao 24783705b5 Merge branch 'dev_shcool' into develop 2016-08-01 16:11:47 +08:00
daiao 0ffeec64e3 单位审核bug修复 2016-08-01 16:10:57 +08:00
huang 7c4759f3b7 项目左侧添加pull request入口 2016-08-01 15:52:05 +08:00
yuanke dde89b72fa 加入项目二维码修改 2016-08-01 15:50:21 +08:00
daiao fc1fc0bd7d 单位审核bug修复 2016-08-01 15:44:18 +08:00
yuanke f016027e8f 微信加入项目修改 2016-08-01 15:35:29 +08:00
huang 96b04f39b1 pull requests框架搭建（路由控制器、views） 2016-08-01 15:33:47 +08:00
Tim 08b8e3f1cb 加入班级，项目弹框定位js重写 2016-08-01 15:21:23 +08:00
yuanke 2c86ae3eb2 二维码识别 项目和班级区分 2016-08-01 15:09:36 +08:00
yuanke c1bd3b6bf1 增加日志测试 2016-08-01 14:30:31 +08:00
cxt 18539b45de Merge branch 'dev_shcool' into develop 2016-08-01 14:03:58 +08:00
cxt 6d17329a6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-01 13:58:02 +08:00
cxt 3bc696a597 申请学校的更改 2016-08-01 13:57:55 +08:00
daiao 5272f20de8 单位审核bug的修复 2016-08-01 13:56:37 +08:00
yuanke fa43924330 微信项目二维码修改 2016-08-01 13:54:10 +08:00
huang c7f2ab0415 修复创建英文名字的项目标题为“为项目讨论区的问题” 2016-08-01 13:51:11 +08:00
yuanke 84f0069cbd 打开项目邀请码信息 2016-08-01 11:30:25 +08:00
yuanke 4c9e183cd0 微信菜单点击加入项目修改 2016-08-01 11:24:27 +08:00
yuanke bb0bfa21cc 加入项目邀请码修改 2016-08-01 11:18:01 +08:00
yuanke f0cf7adcdf 加入项目邀请码 2016-08-01 11:14:03 +08:00
huang 3feb0680cc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-01 09:50:31 +08:00
huang f7e8c5232c 个人主页加入项目，如果已经申请了则提示已申请 2016-08-01 09:50:05 +08:00
cxt 87e3707b52 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:54:17 +08:00
cxt 0ac906a5cf 消息列表报500 2016-07-29 23:54:10 +08:00
daiao 8e805d382a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:50:39 +08:00
daiao 6ea829131b 单位列表发送消息样式调整 2016-07-29 23:48:12 +08:00
huang 30ce469483 申请加入项目删除邮件 2016-07-29 23:37:31 +08:00
daiao 15227907ea Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:23:11 +08:00
huang 07ff420a6a 退出项目的时候清楚申请信息 2016-07-29 23:23:04 +08:00
daiao db690bedab 单位名称列表缺陷修复 2016-07-29 23:22:32 +08:00
huang 21eed9ebb3 去掉同意拒绝“：” 2016-07-29 23:03:18 +08:00
huang 08b1f0c266 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 22:58:43 +08:00
huang b1fd7048fe 报告人员问题 2016-07-29 22:58:24 +08:00
huang 97288d4eb4 按钮样式 2016-07-29 22:51:13 +08:00
cxt bf529f07a5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 22:49:46 +08:00
cxt 23bb010315 课程列表的资源数显示不对 2016-07-29 22:49:39 +08:00
yuanke 7d0d208676 Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool 2016-07-29 22:10:06 +08:00
yuanke dce84484ff 修改单位的省市个人资料省市也得修改 2016-07-29 22:09:03 +08:00
daiao 911a769670 Merge branch 'develop' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
 2016-07-29 22:05:56 +08:00
daiao 5b93d40f67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/assets/wechat/app.html
	public/assets/wechat/new_project.html
	public/javascripts/wechat/directives/ellipsis.js
	public/stylesheets/weui/weixin.css
 2016-07-29 22:03:45 +08:00
daiao 641ccee631 修改名称过长问题 2016-07-29 22:02:23 +08:00
cxt 98a2ebd682 Merge branch 'cxt_course' into develop 2016-07-29 21:54:33 +08:00
cxt 4a800b67d8 消息列表报500 2016-07-29 21:53:00 +08:00
cxt a41fbdb985 课程大纲报500 2016-07-29 21:50:44 +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
cxt ebb336afa0 课程大纲的二级回复 2016-07-29 21:48:10 +08:00
daiao d6178ec7dd 管理员界面单位申请 2016-07-29 21:45:52 +08:00
yuanke 1704462986 管理员界面单位申请修改 2016-07-29 21:45:32 +08:00
cxt 04b9c35a05 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 21:41:26 +08:00
cxt 807db1ac40 课程角色申请链接的样式 2016-07-29 21:41:19 +08:00
huang 847cae6d41 Merge branch 'develop' into rep_quality 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 21:39:00 +08:00
huang cf63d252e2 局部刷新 2016-07-29 21:37:35 +08:00
huang 5414080646 删除用户和拒绝用户可以再申请 2016-07-29 21:21:59 +08:00
yuanke 1f47eb5ea8 单位申请列表修改 2016-07-29 21:19:09 +08:00
huang f857ceab32 消息中项目添加title 2016-07-29 21:07:15 +08:00
huang 8d625eff5e 修改方式就用户图像显示 2016-07-29 21:04:01 +08:00
daiao 3251890c91 Merge branch 'rep_quality' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 20:52:18 +08:00
huang 643b06484b 消息表添加字段 2016-07-29 20:50:55 +08:00
daiao 430a93e4b2 单位名称列表功能代码 2016-07-29 20:48:36 +08:00
cxt 02bee33ad2 身份切换加提示 2016-07-29 20:33:35 +08:00
huang 0bf9b5c6e6 消息红点记录 个人主页添加加入项目入口 2016-07-29 20:31:24 +08:00
cxt d0f83aab64 去掉姓和名之间的空格 2016-07-29 20:24:04 +08:00
cxt b3d34d6e0f 配置班级列表的名称显示全 2016-07-29 20:18:26 +08:00
huang 153efb7eda 局部刷新 2016-07-29 19:42:21 +08:00
cxt e3d538c3fa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	db/schema.rb
 2016-07-29 19:39:42 +08:00
cxt 72977886c7 Merge branch 'cs_optimize_txz' into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
 2016-07-29 19:37:15 +08:00
huang 60417b2db7 项目邀请消息样式问题 2016-07-29 19:30:53 +08:00
cxt 5a8d2407e2 放开新建课程、新建班级的权限 2016-07-29 19:28:50 +08:00
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00
huang 48a72ff816 代码分析结果入口放置在版本库 2016-07-29 17:46:24 +08:00
huang 824b430fbd 解决质量分支弹出空白页面问题 2016-07-29 17:38:21 +08:00
cxt a1553c7a8f 角色的修改 2016-07-29 16:27:02 +08:00
daiao 5b30036639 单位名称列表功能 2016-07-29 16:11:26 +08:00
huang 769a07bd94 去掉配置页面的成员申请 2016-07-29 16:00:46 +08:00
huang 450217e7c2 同意加入消息发送，及添加成员 2016-07-29 15:58:24 +08:00
huang c07677ef99 项目邀请框架 拒绝消息 2016-07-29 14:49:37 +08:00
cxt a1a2b3dd33 Merge branch 'rep_quality' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-29 14:36:18 +08:00
cxt 848c56d54e 班级主页身份切换、成员管理页面的多重身份 2016-07-29 14:34:42 +08:00
daiao 6bd9f47222 Merge branch 'dev_shcool' into develop 
Conflicts:
	db/schema.rb
 2016-07-28 20:02:57 +08:00
daiao 50ec127c5b 单位名称列表功能 2016-07-28 20:01:22 +08:00
yuanke 22897af6c3 Merge branch 'weixin_guange' into develop 2016-07-28 18:22:20 +08:00
yuanke ca60496e7b 微信 新建项目默认为私有 2016-07-28 18:21:42 +08:00
yuanke 603a00fde3 Merge branch 'weixin_guange' into develop 2016-07-28 17:56:33 +08:00
yuanke 1489ab015a 微信模版消息标题加上句号 2016-07-28 17:55:37 +08:00
yuanke de46c5d9ca Merge branch 'weixin_guange' into develop 2016-07-28 17:27:57 +08:00
yuanke 93844e757c 微信：角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改 2016-07-28 17:26:57 +08:00
huang a8fa4a55e3 项目申请消息发送 2016-07-28 16:22:33 +08:00
yuanke 283dc86a8b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	db/schema.rb
	public/assets/wechat/homework_detail.html
	public/javascripts/wechat/controllers/activity.js
 2016-07-28 15:23:12 +08:00
yuanke 6d594cfcbe git pull后重新commit 2016-07-28 15:11:04 +08:00
yuanke cf65e6748b 微信项目相关功能开发，班级角色功能等 2016-07-28 14:49:45 +08:00
huang 4a9eec0cce 完成项目邀请及公共弹框的封装 2016-07-28 14:42:36 +08:00
huang c6bc5c9cb8 Merge branch 'dev_shcool' into rep_quality 
Conflicts:
	db/schema.rb
 2016-07-28 10:19:37 +08:00
huang 7413298aad 项目邀请码申请及弹框 2016-07-28 10:18:35 +08:00
cxt e275cd9aa0 邀请码 2016-07-27 17:18:26 +08:00
cxt e2546cdcb7 邀请码的提示 2016-07-27 17:14:06 +08:00
cxt 2fea69359d 非本课程成员无法看到邀请码 2016-07-27 16:47:47 +08:00
cxt 0dfc887f74 复制班级中资源的提示修改 2016-07-27 16:43:27 +08:00
yuanke 4fe60bfc97 微信课程角色修改 2016-07-27 14:56:41 +08:00
huang b1f69140c7 issue用户添加链接，issue链接颜色修改 2016-07-27 14:47:13 +08:00
Tim 52475099dc 博客设为主页后，文字整个容器宽度显示；班级配置图标菜单css冲突处理；大纲样式冲突处理 2016-07-27 14:36:46 +08:00
yuanke 653b98d832 微信增加项目相关内容 2016-07-27 14:30:19 +08:00
cxt 35b3993c0c 未提交的作品去掉提示 2016-07-27 14:14:29 +08:00
cxt a1149c1104 班级列表的公开私有 2016-07-27 14:07:16 +08:00
huang 43cb2a0d18 单位申请消息显示 2016-07-27 11:33:54 +08:00
huang 2f79e521ca 单位批准发送消息；申请单位给系统每位管理员发送消息 2016-07-27 11:20:12 +08:00
huang 29edd60ce6 Merge branch 'daiao_dev' into dev_shcool 2016-07-27 10:54:38 +08:00
daiao 9e788c9b6f 单位批准及消息框架搭建 2016-07-27 10:46:48 +08:00
daiao f35b33b09e 单位申请记录用户信息（添加user_id） 2016-07-27 10:36:08 +08:00
cxt aafe0aa4ae 删除班级留言时左侧导航栏的样式问题 2016-07-27 10:20:27 +08:00
cxt 4422bb1bc0 课程列表中的私有班级不可访问 2016-07-27 10:11:00 +08:00
cxt 76eca76728 作业发布时资源库的提示修改 2016-07-27 09:39:42 +08:00
guange c5dd2eaf41 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-07-26 18:28:28 +08:00
cxt a0f2f518cf 回复他人的博客首页不应跳到自己的博客首页 2016-07-26 17:45:59 +08:00
cxt 1f8fa1c70a 班级动态去掉“>” 2016-07-26 17:16:42 +08:00
cxt d17a9dabd8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/helpers/courses_helper.rb
 2016-07-26 16:59:20 +08:00
daiao 0d59f5a358 Merge branch 'daiao_dev' into develop 2016-07-26 16:57:18 +08:00
cxt 04207609cb 未配置课程的班级打开报500 2016-07-26 16:54:34 +08:00
cxt feb45a07bf 课程列表分为我创建的课程和我加入的课程 2016-07-26 16:45:36 +08:00
huang f12423e8a6 issue动态中不能删除问题 2016-07-26 16:29:03 +08:00
huang d51295127d issue删除回复删除附件的问题 同事关联删除 2016-07-26 16:13:20 +08:00
daiao 3661969528 修改课程下，课件名称，显示尽可能全 2016-07-26 14:48:36 +08:00
daiao 1dcf4918b9 非管理员用户在新建帖子时，置顶及锁定功能在页面不显示 2016-07-26 14:30:12 +08:00
huang e7f862458f issue回复问题； 二级回复编辑issue弹空白框问题 2016-07-26 12:06:54 +08:00
daiao 6ab2c15504 修复先删除课程下的某班级，再删除该课程报错 2016-07-26 10:38:04 +08:00
huang b01e228d51 修复issue回复不能点击的问题 2016-07-26 09:19:55 +08:00
huang 2c8f94c899 去掉ID转换成用户login 2016-07-26 09:02:47 +08:00
huang 463c09f02c 项目邀请弹框 2016-07-26 08:55:07 +08:00
yuanke 04e9551450 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-26 08:52:52 +08:00
daiao 67bdea314a 作品列表-分班过滤：点击“请选择分班”过滤显示所有学生 2016-07-25 19:53:56 +08:00
daiao 4646d13234 1.修改资源课程名称，竟可能显示全。 
2.班级动态下，去掉“班级动态>”
 2016-07-25 18:54:44 +08:00
daiao 5883b451ca 在管理员界面添加单位名称列表 2016-07-25 18:31:28 +08:00
guange 6a871e2116 . 2016-07-25 17:09:14 +08:00
yuanke 4f803ce0de Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-25 17:02:52 +08:00
yuanke db7c267a47 微信单个项目动态 2016-07-25 17:02:42 +08:00
guange 9d2900d58f 解决没绑定用户不跳转到绑定页问题 2016-07-25 16:59:52 +08:00