 huang
|
ba6d0e6926
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-24 15:13:00 +08:00 |
|
huang
|
bafb3e98a7
|
tip for sonar results
|
2016-08-24 15:05:10 +08:00 |
 daiao
|
90803fbb2a
|
Merge branch 'dev_shcool' into develop
|
2016-08-24 14:53:31 +08:00 |
|
daiao
|
8b0c0925dd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-08-24 14:52:10 +08:00 |
|
daiao
|
078900088a
|
修复：新建组织关联trustie-forge项目，点击组织动态的论坛动态报500
|
2016-08-24 14:41:26 +08:00 |
 cxt
|
6af43070c7
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-08-24 13:56:53 +08:00 |
 yuanke
|
e0957113d8
|
项目issue模版消息提醒
|
2016-08-24 11:28:50 +08:00 |
|
yuanke
|
bd3911c072
|
.
|
2016-08-24 11:22:34 +08:00 |
|
yuanke
|
f8dfe85156
|
项目issue增加模版消息
|
2016-08-24 11:03:38 +08:00 |
 Tim
|
bb2b51aa8d
|
收藏按钮增加title
|
2016-08-24 10:30:20 +08:00 |
|
Tim
|
57ecffc130
|
班级新增收藏功能
|
2016-08-24 10:28:09 +08:00 |
|
yuanke
|
0eb1c1a392
|
微信审核链接修改
|
2016-08-24 09:45:18 +08:00 |
|
yuanke
|
2e1e9391b6
|
微信审核链接路径修改
|
2016-08-24 09:39:41 +08:00 |
|
cxt
|
5d5bd88c88
|
个人主页：用户不应有修改他人头像的权限
|
2016-08-24 09:30:57 +08:00 |
|
yuanke
|
e0ab93b739
|
微信审核路径修改
|
2016-08-24 09:30:28 +08:00 |
|
yuanke
|
3af5bc5813
|
微信审核修改
|
2016-08-23 17:42:48 +08:00 |
|
yuanke
|
c5cedbfcc2
|
修改班级和项目审核模版消息地址
|
2016-08-23 17:37:23 +08:00 |
|
cxt
|
74b15229fb
|
at所有人
|
2016-08-23 17:15:51 +08:00 |
|
yuanke
|
c26f59e697
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-23 16:53:05 +08:00 |
|
yuanke
|
c612104fab
|
微信增加发帖功能
|
2016-08-23 16:52:35 +08:00 |
|
Tim
|
c8c5f5d415
|
iphone下flex无效
|
2016-08-23 16:36:59 +08:00 |
|
daiao
|
5088770214
|
修复：文章附件和资源栏目下载权限一致
|
2016-08-23 16:34:11 +08:00 |
|
Tim
|
7d671c7758
|
调整输入框padding值
|
2016-08-23 15:04:48 +08:00 |
|
Tim
|
34acb1aa2f
|
课程项目增加发布按钮
|
2016-08-23 11:05:49 +08:00 |
|
cxt
|
461912bec2
|
班级作业，上传附件提交作品，重试后直接提交，提交页面附件不显示但验证弹框中被删除的附件又显示了
|
2016-08-23 10:50:51 +08:00 |
|
yuanke
|
e473a18487
|
提交错分支 还原
|
2016-08-23 10:26:39 +08:00 |
|
yuanke
|
55512f9eb2
|
Merge branch 'develop' into weixin_guange
|
2016-08-23 10:24:46 +08:00 |
|
Tim
|
bbc0277d39
|
iphone端输入框js控制
|
2016-08-23 10:23:55 +08:00 |
|
yuanke
|
965d8930dc
|
班级增加动态
|
2016-08-23 10:23:46 +08:00 |
|
cxt
|
b8dc444cc7
|
普通作业和编程作业在题库发送后，编辑并进行发布，没有自动创建作品列表
复制班级功能里，勾选“作业”，同上
对应方法：在作业的发布时间点（不用考虑作业是通过何种途径生成的），除了发布作业外，应该为该作业自动创建完整的作品列表（分组作业除外）
|
2016-08-23 10:17:08 +08:00 |
|
daiao
|
7e34062435
|
Merge branch 'dev_shcool' into develop
|
2016-08-23 09:43:38 +08:00 |
|
huang
|
ea6b928188
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-22 17:19:48 +08:00 |
|
Tim
|
8b6e6fec87
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-22 16:50:48 +08:00 |
|
Tim
|
863ec9d396
|
iphone下输入框位置调整
|
2016-08-22 16:50:14 +08:00 |
|
yuanke
|
864c6c821f
|
Merge branch 'weixin_guange' into develop
|
2016-08-22 16:50:13 +08:00 |
|
huang
|
5e98884801
|
tip for sonar
|
2016-08-22 16:32:32 +08:00 |
|
yuanke
|
c275557fa7
|
调试
|
2016-08-22 15:44:20 +08:00 |
|
cxt
|
68dd0a52d2
|
Merge branch 'develop' into cxt_course
|
2016-08-22 15:40:15 +08:00 |
|
cxt
|
f5cbdf11bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-22 15:24:18 +08:00 |
|
cxt
|
06361246c7
|
作品列表中的已提交人数无法自动刷新
|
2016-08-22 15:24:12 +08:00 |
|
yuanke
|
7f8a6f931b
|
调试
|
2016-08-22 15:23:34 +08:00 |
|
yuanke
|
d5a7d10f5d
|
调试
|
2016-08-22 14:59:50 +08:00 |
|
yuanke
|
9e4aaa767c
|
调试
|
2016-08-22 14:57:28 +08:00 |
|
yuanke
|
0c381ad53d
|
调试
|
2016-08-22 14:42:04 +08:00 |
|
huang
|
af079a1cc3
|
Merge branch 'develop' into rep_quality
|
2016-08-22 14:37:51 +08:00 |
|
yuanke
|
19c48fa617
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-22 14:35:07 +08:00 |
|
yuanke
|
d9e031c314
|
调试
|
2016-08-22 14:34:42 +08:00 |
|
Tim
|
4f3f6358fc
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-22 14:30:00 +08:00 |
|
Tim
|
a846eda77b
|
输入框padding调整；发帖样式新增
|
2016-08-22 14:29:43 +08:00 |
|
huang
|
f8fc656920
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-22 14:22:31 +08:00 |