 yuanke
|
76006ef3e7
|
组织一级二级帖子删除文章问题
|
2016-05-20 22:07:33 +08:00 |
|
yuanke
|
d4be470e5f
|
1.组织二级帖子文章回复不了
2.组织二级帖子文章点进详情页面删除不了文章
|
2016-05-20 20:08:46 +08:00 |
|
yuanke
|
c9c3aa5f31
|
Merge branch 'develop' into yuanke
|
2016-05-20 18:43:20 +08:00 |
|
yuanke
|
bc8171501d
|
解决组织文章设为首页报500
|
2016-05-20 18:40:39 +08:00 |
 huang
|
b0e4ed5ab3
|
请求分享如果自己在项目的话则不需要申请
|
2016-05-20 17:40:18 +08:00 |
|
yuanke
|
0e827abd35
|
将代码测试编译器信息的冒号改为中文的
|
2016-05-20 17:25:56 +08:00 |
|
huang
|
82f4c685da
|
消息拒绝问题
|
2016-05-20 17:11:44 +08:00 |
|
huang
|
18054dd96d
|
私有资源不能下载
|
2016-05-20 17:04:20 +08:00 |
|
yuanke
|
6d7eca487f
|
将KE的newlineTag：'br' 改为'p',方便识别网址
|
2016-05-20 17:02:43 +08:00 |
|
huang
|
f9e445500e
|
已经引用通过的勾选问题
|
2016-05-20 16:38:58 +08:00 |
|
huang
|
fc8cbc2b38
|
Merge branch 'hjq_beidou' into develop
|
2016-05-20 16:18:47 +08:00 |
|
huang
|
ef1a5d32f2
|
顶端背景色
|
2016-05-20 16:18:23 +08:00 |
 cxt
|
8f9ead0a12
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 15:39:37 +08:00 |
|
cxt
|
7b0fd246ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 15:39:16 +08:00 |
|
cxt
|
da375dcb4e
|
挂起作业的作品列表中下拉列表的内容为空，截止时间和发布时间不应显示
|
2016-05-20 15:39:07 +08:00 |
|
huang
|
d108f0a684
|
Merge branch 'yuanke' into develop
|
2016-05-20 15:37:44 +08:00 |
|
huang
|
4c984882e4
|
Merge branch 'cxt_course' into develop
|
2016-05-20 15:37:15 +08:00 |
|
huang
|
13ac7ef273
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 15:37:02 +08:00 |
|
huang
|
1c400669aa
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 15:36:00 +08:00 |
|
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
2016-05-20 15:35:08 +08:00 |
|
huang
|
5114c12c17
|
注释掉为完成的代码
|
2016-05-20 15:34:35 +08:00 |
|
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
2016-05-20 15:30:25 +08:00 |
|
huang
|
dddd7e0ea2
|
下载
|
2016-05-20 15:28:09 +08:00 |
 Tim
|
c3f63709ed
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 15:15:56 +08:00 |
|
Tim
|
13f83719c1
|
作品列表改为table布局
|
2016-05-20 15:15:42 +08:00 |
|
huang
|
b1e0618742
|
导入资源不能用的问题
|
2016-05-20 15:05:04 +08:00 |
|
cxt
|
c165d0b37e
|
作业二级回复的模板通知
|
2016-05-20 14:52:47 +08:00 |
|
cxt
|
2895dd5342
|
作业二级回复的消息通知增加显示作业名称的tip
|
2016-05-20 14:28:14 +08:00 |
|
huang
|
004c48b456
|
发送至课程项目局部刷新
|
2016-05-20 14:16:45 +08:00 |
|
huang
|
352b40dd96
|
默认为“公共资源”
|
2016-05-20 13:52:39 +08:00 |
|
huang
|
f18c3ed667
|
私有资源中不添加”上传资源“的按钮
|
2016-05-20 13:37:18 +08:00 |
|
huang
|
0d8d2939b3
|
资源不符合条件的不能选择框
|
2016-05-20 12:43:47 +08:00 |
|
cxt
|
82568b5951
|
缺陷状态更改或内容更改时不发模板消息
|
2016-05-20 11:39:30 +08:00 |
|
cxt
|
6aa20c9edf
|
消息通知的内容没有过滤用Tab键空格引起的特殊符号
|
2016-05-20 11:12:37 +08:00 |
|
huang
|
80f829c018
|
解决搜索不能用的问题
|
2016-05-20 10:48:17 +08:00 |
|
huang
|
92f55e0dc1
|
公共资源库，点击底部不能发送的问题
|
2016-05-20 10:02:59 +08:00 |
|
cxt
|
b03b9a3c27
|
课程：问卷导入时显示的数据未进行过滤
|
2016-05-20 09:59:41 +08:00 |
|
Tim
|
b0fba934ae
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-19 17:24:11 +08:00 |
|
huang
|
f806dbf587
|
资源发送至组织和课程
|
2016-05-19 17:12:33 +08:00 |
|
huang
|
e0370e3e32
|
私有资源中发送文件
|
2016-05-19 17:04:46 +08:00 |
|
huang
|
1402f2076a
|
资源申请添加链接
|
2016-05-19 16:53:22 +08:00 |
|
yuanke
|
0dd7aae08c
|
先注释自动识别URL
|
2016-05-19 16:39:23 +08:00 |
|
cxt
|
df70c33bcd
|
学生列表活跃度为0
|
2016-05-19 16:39:14 +08:00 |
|
yuanke
|
ed58e78065
|
KE表格颜色问题
|
2016-05-19 16:38:48 +08:00 |
|
yuanke
|
5b0ef6ada0
|
Merge branch 'develop' into yuanke
|
2016-05-19 16:30:02 +08:00 |
|
yuanke
|
6e749f49e4
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
2016-05-19 16:29:33 +08:00 |
|
yuanke
|
7da1418069
|
自动识别URL
|
2016-05-19 16:24:57 +08:00 |
|
huang
|
4857769c49
|
Merge branch 'yuanke' into develop
|
2016-05-19 16:11:06 +08:00 |
|
huang
|
fe54a19940
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
app/views/blogs/_article.html.erb
app/views/users/_project_boardlist.html.erb
public/stylesheets/new_user.css
|
2016-05-19 16:10:18 +08:00 |
|
huang
|
faf5e89cc2
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
app/views/blogs/_article.html.erb
db/schema.rb
|
2016-05-19 16:04:27 +08:00 |