 huang
|
415b624e0b
|
样式问题
|
2016-05-25 11:07:36 +08:00 |
|
huang
|
4280d79eab
|
Merge branch 'develop' into hjq_beidou
|
2016-05-25 09:11:55 +08:00 |
|
huang
|
197f054c18
|
注释掉申请私有资源功能
|
2016-05-25 09:10:41 +08:00 |
|
huang
|
d1e11d4260
|
代码审查后代码简化
|
2016-05-25 08:58:58 +08:00 |
|
huang
|
b38bd0c1e5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 20:13:42 +08:00 |
 cxt
|
ed2f413949
|
代码还原
|
2016-05-24 20:04:06 +08:00 |
|
huang
|
a7a2be6a4b
|
作业导入资源问题
|
2016-05-24 16:01:02 +08:00 |
|
huang
|
bc0e24d39e
|
资源引用代码注释
|
2016-05-24 10:28:17 +08:00 |
|
huang
|
a60356091b
|
issue中添加类型tag
|
2016-05-23 11:02:21 +08:00 |
|
huang
|
eead7962cf
|
资源申请权限控制
|
2016-05-21 11:39:50 +08:00 |
|
huang
|
039d11e862
|
资源发送权限问题
|
2016-05-20 21:48:51 +08:00 |
|
huang
|
0fcd8ae86d
|
导入资源鼠标点击效果
|
2016-05-20 21:10:53 +08:00 |
|
huang
|
e512154ea9
|
古剑删除描述一致
|
2016-05-20 21:00:36 +08:00 |
|
huang
|
166a97dc0c
|
注释
|
2016-05-20 20:37:11 +08:00 |
|
huang
|
90bb940290
|
资源下载链接问题
|
2016-05-20 20:27:32 +08:00 |
|
huang
|
3ffe131a73
|
删除的提示
|
2016-05-20 20:02:17 +08:00 |
|
huang
|
baf7e1dbc0
|
没有连接点击不刷新页面
|
2016-05-20 19:52:42 +08:00 |
|
huang
|
e10bc46361
|
Merge branch 'yuanke' into develop
|
2016-05-20 18:59:54 +08:00 |
|
huang
|
8ebe8b0d0c
|
删除提示顺序
消息样式
|
2016-05-20 18:55:17 +08:00 |
|
huang
|
e901becfe6
|
发送权限问题
|
2016-05-20 18:46:19 +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 |
|
huang
|
f9e445500e
|
已经引用通过的勾选问题
|
2016-05-20 16:38:58 +08:00 |
|
huang
|
d108f0a684
|
Merge branch 'yuanke' into develop
|
2016-05-20 15:37:44 +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
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
2016-05-20 15:35:08 +08:00 |
|
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
2016-05-20 15:30:25 +08:00 |
|
cxt
|
2895dd5342
|
作业二级回复的消息通知增加显示作业名称的tip
|
2016-05-20 14:28:14 +08:00 |
|
huang
|
004c48b456
|
发送至课程项目局部刷新
|
2016-05-20 14:16:45 +08:00 |
|
huang
|
f18c3ed667
|
私有资源中不添加”上传资源“的按钮
|
2016-05-20 13:37:18 +08:00 |
|
huang
|
0d8d2939b3
|
资源不符合条件的不能选择框
|
2016-05-20 12:43:47 +08:00 |
|
huang
|
1402f2076a
|
资源申请添加链接
|
2016-05-19 16:53:22 +08:00 |
|
yuanke
|
0dd7aae08c
|
先注释自动识别URL
|
2016-05-19 16:39:23 +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 |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-19 16:01:07 +08:00 |
|
huang
|
984f706722
|
可发送权限控制
|
2016-05-19 15:59:59 +08:00 |
|
cxt
|
3ebef0eae2
|
消息通知中申请引用作业的用户点击申请的消息打开没有权限访问的页面
|
2016-05-19 15:57:20 +08:00 |
|
cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
2016-05-19 15:26:23 +08:00 |
|
huang
|
0b2f6c9a53
|
私有资源的搜索和排序
|
2016-05-19 14:28:13 +08:00 |
|
cxt
|
0f2f4717b6
|
作业列表增加序号和翻页、按创建时间倒排
|
2016-05-19 13:50:45 +08:00 |
|
huang
|
4c68da9bee
|
修正链接资源名
|
2016-05-19 13:49:29 +08:00 |
|
huang
|
bddc807057
|
修正资源库弹框位置
|
2016-05-19 13:41:32 +08:00 |