alan
|
4d82f0c959
|
在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》
|
2016-03-16 16:03:53 +08:00 |
alan
|
3b63071dee
|
修复《issue的展开和收起在属性表格的上面》
|
2016-03-16 15:12:50 +08:00 |
alan
|
050a266985
|
Merge branch 'FX-alan-message-access-slow' into alan_develop
|
2016-03-16 11:17:35 +08:00 |
alan
|
0ac12f3400
|
Merge branch 'FX-alan-admin-deleteuser-500' into alan_develop
|
2016-03-16 11:16:52 +08:00 |
alan
|
5343759f2f
|
Merge branch 'FX-alan-search-404' into alan_develop
|
2016-03-16 11:16:41 +08:00 |
ouyangxuhua
|
da1b27cd38
|
Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang
|
2016-03-16 10:01:42 +08:00 |
ouyangxuhua
|
9bac560906
|
超级管理员有编辑和删除博客的权限
|
2016-03-16 10:00:21 +08:00 |
ouyangxuhua
|
fe0d31d9c4
|
1.用户信息中的额用户链接改成正确连接;组织资源文件名过长时省略显示
|
2016-03-15 14:17:06 +08:00 |
ouyangxuhua
|
402b0e9c24
|
域名都使用Setting.host_name获取主机名
|
2016-03-14 23:15:08 +08:00 |
huang
|
3bfaddc80f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-14 18:31:09 +08:00 |
ouyangxuhua
|
15dfaf67b2
|
测试版环境,登陆注册改成https://test.forge.
|
2016-03-14 18:29:50 +08:00 |
huang
|
a7990a4c3c
|
Merge branch 'yuanke' into develop
|
2016-03-14 18:25:26 +08:00 |
ouyangxuhua
|
c0edd91c3d
|
登陆注册链接改为www.
|
2016-03-14 18:20:19 +08:00 |
yuanke
|
27a2aad3d6
|
修改KE贴吧回复添加视频图片不能显示的BUG
|
2016-03-14 18:19:23 +08:00 |
ouyangxuhua
|
46b50ab065
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-14 17:46:47 +08:00 |
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
2016-03-14 17:31:53 +08:00 |
ouyangxuhua
|
2899f29b5f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-14 17:29:06 +08:00 |
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
2016-03-14 17:16:11 +08:00 |
huang
|
7c624cd571
|
公共资源只包括公开资源
|
2016-03-14 16:35:18 +08:00 |
luoquan
|
006731ea61
|
修改以下问题:
KE问题:编辑时行间距挺好,发布后,在项目讨论区中的显示行间距稍微有点挤。
KE问题:缺省的文字颜色:在编辑时是黑色,但发布后就是灰色。应该发布后也是黑色。
|
2016-03-14 15:51:50 +08:00 |
ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源,过滤条件中的“其他”应该显示
|
2016-03-14 15:39:45 +08:00 |
luoquan
|
270a290df9
|
修改视频不能播放问题。
|
2016-03-14 15:18:56 +08:00 |
alan
|
3eaa4b08a3
|
解决删除用户报500错误
|
2016-03-14 11:06:29 +08:00 |
alan
|
2f5ce553e2
|
refactor user find
|
2016-03-14 10:46:02 +08:00 |
alan
|
0998ca3974
|
Merge branch 'develop' into FX-alan-search-404
|
2016-03-14 10:25:39 +08:00 |
alan
|
ce6d63ccaf
|
重构user.find
|
2016-03-14 10:24:50 +08:00 |
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
2016-03-11 19:43:36 +08:00 |
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
2016-03-11 19:34:33 +08:00 |
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-11 19:31:22 +08:00 |
cxt
|
46d22980c9
|
Merge branch 'cxt_course' into develop
|
2016-03-11 19:31:06 +08:00 |
cxt
|
a845da5c17
|
点赞有延迟
|
2016-03-11 19:25:24 +08:00 |
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
2016-03-11 18:06:43 +08:00 |
linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
2016-03-11 17:25:30 +08:00 |
luoquan
|
e0922e9b19
|
调整视频播放默认图大小
|
2016-03-11 16:25:05 +08:00 |
cxt
|
1d93c6c56b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-11 16:18:10 +08:00 |
cxt
|
e02bde6f65
|
作品列表支持按学生姓名和学号排序
|
2016-03-11 16:17:51 +08:00 |
huang
|
97a7694778
|
访问统计数--views
|
2016-03-11 15:58:16 +08:00 |
Tim
|
45f1cfa477
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-11 15:51:59 +08:00 |
Tim
|
051c9dfd0c
|
Merge branch 'cxt_course' into develop
|
2016-03-11 15:51:45 +08:00 |
huang
|
8079254089
|
首页增加访问统计
|
2016-03-11 15:51:45 +08:00 |
Tim
|
53c281103c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-11 15:49:54 +08:00 |
Tim
|
de3a4718ab
|
个人,课程,项目,组织访问量添加
|
2016-03-11 15:49:24 +08:00 |
huang
|
c18634be86
|
课程通知。新闻代码优化
|
2016-03-11 15:21:40 +08:00 |
luoquan
|
4fa25f68b6
|
Merge branch 'luoquan' into yuanke
|
2016-03-11 14:40:31 +08:00 |
luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
2016-03-11 14:40:07 +08:00 |
luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
luoquan
|
1e256add7f
|
媒体播放默认样式
|
2016-03-11 13:17:15 +08:00 |
luoquan
|
033c7991e1
|
修改媒体播放
|
2016-03-11 13:16:44 +08:00 |
alan
|
1f5c90185a
|
修复《顶部搜索“分析”报404错误》
|
2016-03-11 13:14:32 +08:00 |
cxt
|
dcd13b9d6b
|
点击个人主页的课程和项目在新的tab页中打开
|
2016-03-11 11:34:16 +08:00 |