 daiao
|
ed448f0087
|
Merge branch 'develop' into dev_shcool
Conflicts:
db/schema.rb
|
2016-09-09 09:31:17 +08:00 |
|
daiao
|
8c685f8978
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-09 09:27:19 +08:00 |
|
daiao
|
2ee9c22186
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
|
2016-09-09 09:16:49 +08:00 |
|
daiao
|
aa27d7def2
|
修复编辑issue，更新附件时，自动回复提示问题（不同Issue下，重名不显示，同意issue下，会更新创建时的附件）
|
2016-09-09 09:16:22 +08:00 |
 yuanke
|
d6ae177885
|
Merge branch 'weixin_guange' into develop
|
2016-09-09 09:05:59 +08:00 |
 huang
|
8bb2b5e8d9
|
change sonar reuslts
|
2016-09-09 09:00:21 +08:00 |
|
yuanke
|
4adc988ec1
|
微信图片url修改
|
2016-09-09 08:35:08 +08:00 |
|
yuanke
|
7a71a7bd47
|
Merge branch 'weixin_guange' into develop
|
2016-09-08 18:54:18 +08:00 |
|
yuanke
|
a6b03ed9f1
|
微信头像刷新修改
|
2016-09-08 18:53:36 +08:00 |
|
yuanke
|
5b8ecf6657
|
微信头像刷新修改
|
2016-09-08 18:50:09 +08:00 |
 Tim
|
2c719feacd
|
无用的内联样式
|
2016-09-08 18:34:35 +08:00 |
|
yuanke
|
8c71cf1946
|
Merge branch 'weixin_guange' into develop
|
2016-09-08 18:18:13 +08:00 |
|
yuanke
|
dc051f0ec3
|
博客回复颜色修改
|
2016-09-08 18:17:11 +08:00 |
|
yuanke
|
9e66bcb2ab
|
微信通知二级回复修改
|
2016-09-08 18:11:40 +08:00 |
|
yuanke
|
5c626f94b5
|
微信二级回复框不显示修改
|
2016-09-08 18:04:37 +08:00 |
|
yuanke
|
2ad432c5ce
|
调试
|
2016-09-08 17:51:36 +08:00 |
|
yuanke
|
b43f8cf974
|
调试
|
2016-09-08 17:44:38 +08:00 |
|
yuanke
|
8f3a73d400
|
调试
|
2016-09-08 17:37:00 +08:00 |
|
yuanke
|
b6fdbc11a6
|
微信回复框修改
|
2016-09-08 16:22:19 +08:00 |
|
huang
|
6dbb2e4e94
|
Pull request数量为0的时候显示在更多中
|
2016-09-08 16:03:32 +08:00 |
|
yuanke
|
ab383031a6
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-09-08 15:56:21 +08:00 |
|
yuanke
|
58037c3796
|
微信二级回复修改
|
2016-09-08 15:56:09 +08:00 |
|
huang
|
08c64d2ac7
|
解决新建及复制issue时点击取消没反应的问题
|
2016-09-08 15:38:01 +08:00 |
|
Tim
|
e5b1b920e6
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-09-08 15:37:07 +08:00 |
|
Tim
|
ca4c668c9b
|
邮箱提示位置调整
|
2016-09-08 15:36:58 +08:00 |
|
yuanke
|
e74516cb68
|
微信修改个人资料
|
2016-09-08 15:34:48 +08:00 |
|
Tim
|
031ba38655
|
性别选框样式调整
|
2016-09-08 15:28:22 +08:00 |
|
yuanke
|
8584d1dccb
|
修改微信二级回复回复框的BUG
|
2016-09-08 15:05:27 +08:00 |
 cxt
|
cf25dc8dfd
|
首页的项目列表
|
2016-09-08 15:00:20 +08:00 |
|
huang
|
7cfdacd172
|
Merge branch 'develop' into rep_quality
|
2016-09-08 14:47:19 +08:00 |
|
Tim
|
4c33b1d7ba
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-09-08 14:15:10 +08:00 |
|
Tim
|
216c834a40
|
微信修改资料select框去边框；二级回复显隐点击效果更改
|
2016-09-08 14:15:00 +08:00 |
|
yuanke
|
be0158fbb0
|
微信二级回复BUG修改
|
2016-09-08 14:10:58 +08:00 |
|
cxt
|
d8e04e7923
|
暂时隐藏“复制班级”
|
2016-09-08 14:04:40 +08:00 |
|
cxt
|
ab0863c9fb
|
平台的邀请码提示
|
2016-09-08 13:59:48 +08:00 |
|
cxt
|
3efc158fb5
|
班级作业：当已经发布了作业再去编辑作业时，现在是“发布时间”就不能再编辑了，建议代码判断只有当学生已经提交了作品或关联了项目才禁止再编辑发布时间，且要给出必要提示
|
2016-09-08 10:54:41 +08:00 |
|
yuanke
|
1109eba460
|
微信上传图片功能先屏蔽
|
2016-09-08 08:46:29 +08:00 |
|
yuanke
|
18fbf305c1
|
微信上传头像大小限制为1M
|
2016-09-07 16:16:53 +08:00 |
|
cxt
|
49e8a6f1ff
|
作业匿评时：学生点击作业列表中“追加附件”，进入作品列表后要默认打开自己提交的作品且弹出追加附件的弹框
|
2016-09-07 15:45:12 +08:00 |
|
Tim
|
2bb2a64dde
|
上传头像按钮和头像重合，并使上传按钮有效
|
2016-09-07 15:32:48 +08:00 |
|
cxt
|
775ed19129
|
admin界面-班级列表：课程列表中不显示已经删除的班级，全部班级列表中显示已经删除的班级
|
2016-09-07 15:26:15 +08:00 |
|
cxt
|
0ae4d26ec0
|
课程大纲的内容区域应该和下面的回复区域的宽度一致
|
2016-09-07 15:22:15 +08:00 |
|
yuanke
|
d8a4eb56cf
|
微信上传头像修改
|
2016-09-07 15:14:46 +08:00 |
|
cxt
|
d8bc6a51fc
|
加索引
|
2016-09-07 15:14:10 +08:00 |
|
yuanke
|
133b8af6ca
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-09-07 14:19:19 +08:00 |
|
yuanke
|
c234a8d2cb
|
个人资料修改功能
|
2016-09-07 14:19:07 +08:00 |
|
cxt
|
bec09a7f1c
|
为student_work_tests增加索引
|
2016-09-07 14:03:20 +08:00 |
|
cxt
|
e6ddb3cec0
|
个人主页动态过滤中点击全部动态要显示当前用户关联的所有动态
|
2016-09-07 11:30:26 +08:00 |
|
Tim
|
95824e3b6b
|
新建课程增加名称正确错误示例，课程说明
|
2016-09-07 11:24:38 +08:00 |
|
cxt
|
e084543030
|
新建作业时给出截止日期和发布日期的提示
|
2016-09-07 10:45:22 +08:00 |