 guange
|
3130296e69
|
修改微信个人信息获取实现
|
2016-08-13 11:09:48 +08:00 |
 yuanke
|
4e6c58ae37
|
动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息
|
2016-08-11 17:22:48 +08:00 |
 huang
|
3ef2509d27
|
报告人员加入项目不用提醒
|
2016-08-05 16:35:22 +08:00 |
 Tim
|
950b18c250
|
加入班级提示
|
2016-08-03 16:39:22 +08:00 |
|
guange
|
fc38ef6a3f
|
增加了一个查看服务器内网ip的middleware，利于以后分析问题，headers为X-Response-Ip
|
2016-08-01 19:16:51 +08:00 |
 daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
2016-07-29 22:05:56 +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 |
|
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 |
 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
|
335b82c046
|
加入班级的弹框
|
2016-07-29 19:19:58 +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 |
|
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 |
|
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 |
|
cxt
|
0dfc887f74
|
复制班级中资源的提示修改
|
2016-07-27 16:43:27 +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 |
|
Tim
|
82ae7310dc
|
rake db生成文件
|
2016-07-27 09:32:10 +08:00 |
|
guange
|
c5dd2eaf41
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-07-26 18:28:28 +08:00 |
|
daiao
|
5886a9898a
|
在单位名称列表的数据库表中，增加用户字段
|
2016-07-26 16:46:31 +08:00 |
|
daiao
|
5883b451ca
|
在管理员界面添加单位名称列表
|
2016-07-25 18:31:28 +08:00 |
|
guange
|
6a871e2116
|
.
|
2016-07-25 17:09:14 +08:00 |
|
txz
|
12e845c3ab
|
课程列表与项目列表样式统一
|
2016-07-25 15:31:44 +08:00 |
|
huang
|
84d1adbf25
|
生成邀请码
|
2016-07-25 14:36:52 +08:00 |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
2016-07-22 16:46:01 +08:00 |
|
huang
|
160b05ae89
|
组织匿名数据处理
|
2016-07-22 16:03:33 +08:00 |
|
huang
|
4e4ff4958f
|
修改changeset触发事件
|
2016-07-21 17:19:45 +08:00 |
|
huang
|
472eb4736e
|
修改数据类型
|
2016-07-21 16:17:40 +08:00 |
|
huang
|
246923a335
|
版本库新增提交次数表，增加至项目动态
|
2016-07-21 16:09:07 +08:00 |
|
cxt
|
71b5fe1273
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/_issue_replies.html.erb
app/views/issues/_issue_reply_ke_form.html.erb
db/schema.rb
|
2016-07-21 14:31:43 +08:00 |
|
cxt
|
f3c95906d8
|
项目缺陷的二级回复
|
2016-07-21 10:30:48 +08:00 |
|
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
2016-07-20 17:00:18 +08:00 |
|
huang
|
facf3ae8f8
|
提交次数写入动态中
|
2016-07-18 16:45:49 +08:00 |
|
cxt
|
7725db9c69
|
题库报500
|
2016-07-15 17:38:32 +08:00 |
|
cxt
|
f7942e4d3c
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
db/schema.rb
|
2016-07-15 15:55:41 +08:00 |
|
guange
|
8279d9385c
|
区分是课程邀请，还是意见反馈
|
2016-07-09 10:13:05 +08:00 |
|
guange
|
7c98e0f392
|
merge
|
2016-07-08 20:00:49 +08:00 |
|
guange
|
5c0468f8fd
|
二维码过期改为一个月有效期
|
2016-07-08 17:18:09 +08:00 |
|
cxt
|
c224f97905
|
样式调整、线下作业的作品评分、导出作业成绩报500
|
2016-07-08 15:02:50 +08:00 |
|
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-08 13:18:46 +08:00 |
|
cxt
|
13bae8f8a5
|
线下作业
|
2016-07-08 13:17:14 +08:00 |
|
txz
|
ed39b4b4f1
|
动态：创建班级；学生进入资源也显示课件；已有班级和新增班级颜色区分
|
2016-07-08 11:29:33 +08:00 |