 Tim
|
8bbcef83f2
|
Merge branch 'develop' into cs_optimize_txz
|
2016-08-31 14:32:33 +08:00 |
|
Tim
|
d11f673711
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-31 14:30:32 +08:00 |
|
Tim
|
ec15474c3a
|
成员管理更改时，确定按钮样式变更
|
2016-08-31 14:30:16 +08:00 |
 yuanke
|
6c5eaf2779
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-31 14:21:50 +08:00 |
|
yuanke
|
292e778a8c
|
微信班级项目增加删除和退出功能
|
2016-08-31 14:21:38 +08:00 |
 cxt
|
076feb17e8
|
课程大纲的班级列表中的“主讲老师”改为“创建老师”
|
2016-08-31 14:12:04 +08:00 |
|
cxt
|
a8575f2a15
|
暂时隐藏个人名片
|
2016-08-31 14:08:19 +08:00 |
|
Tim
|
48f110bbc8
|
新增退出项目，成员管理删除
|
2016-08-31 13:53:11 +08:00 |
 huang
|
9ab68625df
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-31 13:50:57 +08:00 |
|
cxt
|
cc7b97192e
|
分组作业关联项目下的文字链接到项目
|
2016-08-31 11:27:37 +08:00 |
|
huang
|
97fa6562fa
|
Merge branch 'develop' into rep_quality
|
2016-08-31 11:16:23 +08:00 |
|
Tim
|
e0fed38f1d
|
新增退出班级及删除成员
|
2016-08-31 10:53:58 +08:00 |
|
cxt
|
e05780cc3f
|
设置了答题时间的测验不应有保存按钮，而是直接提交
|
2016-08-31 10:48:43 +08:00 |
|
huang
|
cde1d11871
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-31 10:34:42 +08:00 |
|
huang
|
4320fbf945
|
Merge branch 'dev_blankdatabase' into develop
|
2016-08-31 10:30:46 +08:00 |
|
huang
|
936198a8bd
|
隐藏非项目信息
|
2016-08-31 10:30:23 +08:00 |
|
cxt
|
6e36418201
|
admin界面的留言列表过滤掉新用户的留言
|
2016-08-31 09:47:51 +08:00 |
|
huang
|
0c221abd61
|
PULL REQUEST 默认情况下不显示
|
2016-08-31 09:18:05 +08:00 |
|
cxt
|
f4632c432f
|
消息列表中的at消息报500
|
2016-08-30 17:11:22 +08:00 |
|
cxt
|
188b9197aa
|
消息列表
|
2016-08-30 16:15:57 +08:00 |
|
huang
|
6d0f22fd60
|
空数据库--修复后台删除issue标签500问题
|
2016-08-30 16:03:28 +08:00 |
|
huang
|
e2c0237fcd
|
解决空数据库问题
|
2016-08-30 15:30:01 +08:00 |
|
cxt
|
23ff5f6449
|
匿评时具有多重身份的教辅打的分变成了“我的评分”
|
2016-08-30 15:01:41 +08:00 |
|
yuanke
|
b9e9892257
|
微信issue指向BUG修改，issue@功能修改
|
2016-08-30 15:01:26 +08:00 |
|
yuanke
|
e37a2fee1e
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-30 14:25:46 +08:00 |
|
yuanke
|
b4a5179a1b
|
修改班级成员管里的配置返回后显示空白及@issue链接无效的问题
|
2016-08-30 14:25:36 +08:00 |
|
cxt
|
623dadaea1
|
回复的删除按钮当鼠标放上去才显示
|
2016-08-30 14:12:50 +08:00 |
|
Tim
|
14ece14b78
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-30 14:12:15 +08:00 |
|
Tim
|
bc1caf3d54
|
表情处理
|
2016-08-30 14:12:05 +08:00 |
|
yuanke
|
4e312595fe
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-30 14:08:23 +08:00 |
|
yuanke
|
8a6ad89973
|
issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等
|
2016-08-30 14:08:10 +08:00 |
|
huang
|
3d7d8c5795
|
Merge branch 'rep_quality' into develop
|
2016-08-30 11:32:51 +08:00 |
|
huang
|
2b7a38062c
|
css for red
|
2016-08-30 11:30:08 +08:00 |
|
huang
|
5b32433172
|
Merge branch 'rep_quality' into develop
|
2016-08-30 11:19:30 +08:00 |
|
huang
|
bbe44b3957
|
Merge branch 'develop' into rep_quality
|
2016-08-30 11:18:49 +08:00 |
|
Tim
|
e30416f6b3
|
手机表情处理
|
2016-08-30 10:49:44 +08:00 |
|
huang
|
ee2ae456ac
|
unresolved issues for sonar
|
2016-08-30 10:43:47 +08:00 |
|
cxt
|
f803a23298
|
组织头像编辑的小笔调整
|
2016-08-29 16:49:54 +08:00 |
|
cxt
|
141118e3d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-29 16:39:54 +08:00 |
|
Tim
|
ac0cc37fe4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-29 16:39:23 +08:00 |
|
Tim
|
ea0211c9ca
|
组织搜索成员时，页数过多折行问题
|
2016-08-29 16:39:13 +08:00 |
|
cxt
|
60fb21d2fc
|
班级主页的样式调整
|
2016-08-29 16:30:37 +08:00 |
|
cxt
|
eb255d84b1
|
issue详情页里的点赞刷新
|
2016-08-29 16:25:30 +08:00 |
|
cxt
|
45f0234ff7
|
组织logo点击可编辑
|
2016-08-29 16:19:06 +08:00 |
|
cxt
|
4ff45c15a3
|
还原质量分析的代码
|
2016-08-29 15:43:32 +08:00 |
|
cxt
|
acb18ca4c6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-29 15:40:26 +08:00 |
|
cxt
|
b3b0d8e8f3
|
Merge branch 'cxt_course' into develop
|
2016-08-29 15:40:18 +08:00 |
|
cxt
|
15ba4a6136
|
头像调整
|
2016-08-29 15:38:58 +08:00 |
|
cxt
|
3c5afb2b4f
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-08-29 15:35:04 +08:00 |
|
Tim
|
a8d551105b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-29 15:28:45 +08:00 |