 ouyangxuhua
|
d4c3cb8777
|
Merge branch 'develop' into dev_hjq
|
2016-01-22 17:13:46 +08:00 |
|
ouyangxuhua
|
0a9ecac3db
|
帖子栏目讨论区链接问题修复
|
2016-01-22 17:12:59 +08:00 |
|
ouyangxuhua
|
b5bfa6d824
|
1.组织配置中，允许游客下载格式对齐；2.新建组织中，允许游客下载选项生效。
|
2016-01-22 16:56:36 +08:00 |
|
ouyangxuhua
|
b6219c149a
|
解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除；
|
2016-01-22 16:10:05 +08:00 |
|
ouyangxuhua
|
b5159d54c8
|
博客按更新时间排序
|
2016-01-22 15:05:52 +08:00 |
|
ouyangxuhua
|
d7b17b455d
|
Merge branch 'szzh' into develop
|
2016-01-22 10:27:32 +08:00 |
 huang
|
59aa1e9c6f
|
issue截止修改
|
2016-01-22 09:55:58 +08:00 |
|
ouyangxuhua
|
a15f7fa97b
|
系统管理员增加组织管理员的权限
|
2016-01-22 09:54:20 +08:00 |
|
huang
|
da3dcb6fc0
|
Merge branch 'szzh' into develop
|
2016-01-22 09:32:36 +08:00 |
|
huang
|
2a50a850a7
|
Merge branch 'develop' into szzh
|
2016-01-22 09:32:05 +08:00 |
|
ouyangxuhua
|
5e72734bee
|
增加3个url定制路由
|
2016-01-22 09:25:58 +08:00 |
|
ouyangxuhua
|
594ce8a304
|
修改几个bug
|
2016-01-21 16:57:13 +08:00 |
|
ouyangxuhua
|
b6460633d2
|
个人博客按更新时间倒排
|
2016-01-21 16:15:45 +08:00 |
|
ouyangxuhua
|
600f5de32e
|
个人动态进入个人博客编辑后，跳转到个人首页
|
2016-01-21 16:11:06 +08:00 |
|
huang
|
0ba724776e
|
项目版本库左侧添加提交次数统计
|
2016-01-21 16:06:50 +08:00 |
|
huang
|
56e804b423
|
issue邮件name问题
|
2016-01-21 15:52:07 +08:00 |
|
huang
|
ff475fb00b
|
Merge branch 'szzh' into develop
|
2016-01-21 15:35:38 +08:00 |
|
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
2016-01-21 15:32:18 +08:00 |
|
ouyangxuhua
|
bd99352ab1
|
组织增加是否允许游客下载的选项
|
2016-01-21 15:31:36 +08:00 |
|
huang
|
024e299817
|
gitlab同步问题
|
2016-01-21 15:29:06 +08:00 |
 cxt
|
65563e6503
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-21 15:24:40 +08:00 |
|
cxt
|
219755e4d4
|
Merge branch 'cxt_course' into szzh
|
2016-01-21 15:24:29 +08:00 |
|
cxt
|
99cda66d00
|
编程作业：每次提交了测试集后，页面都会跳到作业页面的最底端，还得手动翻到页面最顶端，再点“发送”
|
2016-01-21 15:02:12 +08:00 |
|
ouyangxuhua
|
6b44b93f0e
|
在通知详情页面，也有发送按钮
|
2016-01-21 14:54:20 +08:00 |
|
cxt
|
5672b029fe
|
导入作业加提示语
|
2016-01-21 14:50:16 +08:00 |
|
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一，分享文件、通知等均可复用
|
2016-01-21 14:33:31 +08:00 |
|
cxt
|
247924af26
|
动态内容显示不全
|
2016-01-21 11:24:26 +08:00 |
|
huang
|
524e152b24
|
Issue截止时间到了邮件提醒
|
2016-01-21 11:19:08 +08:00 |
|
cxt
|
f15847371c
|
附件显示过长
|
2016-01-21 10:36:30 +08:00 |
|
ouyangxuhua
|
ece9f9dc6f
|
项目新闻使用方块样式
|
2016-01-21 10:33:53 +08:00 |
|
cxt
|
1ff244ad98
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-20 18:38:00 +08:00 |
|
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
2016-01-20 18:37:47 +08:00 |
 Tim
|
c7edf0d73b
|
弹框样式修改
|
2016-01-20 17:55:20 +08:00 |
|
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
2016-01-20 17:23:02 +08:00 |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
2016-01-20 16:24:14 +08:00 |
|
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
2016-01-20 16:03:28 +08:00 |
|
huang
|
7b76514513
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-20 15:45:53 +08:00 |
|
huang
|
d6471917b4
|
Merge branch 'szzh' into develop
|
2016-01-20 15:45:44 +08:00 |
|
huang
|
280bf01912
|
Merge branch 'dev_hjq' into szzh
|
2016-01-20 15:45:00 +08:00 |
|
cxt
|
fe0414c83f
|
组织文章和博客的点赞
|
2016-01-20 10:53:05 +08:00 |
|
cxt
|
945ed84276
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-20 09:27:38 +08:00 |
|
cxt
|
b64fc1771d
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
2016-01-20 09:27:29 +08:00 |
|
ouyangxuhua
|
18e79ba9b3
|
未登陆情况下，可以看到组织文章列表及首页全部内容
|
2016-01-20 09:25:12 +08:00 |
|
Tim
|
a3c30ee965
|
issue上传附件样式修改
|
2016-01-19 17:31:59 +08:00 |
|
Tim
|
cd3a1e59dd
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-19 17:03:10 +08:00 |
|
cxt
|
f4afc24e3b
|
Merge branch 'szzh' into develop
|
2016-01-19 17:03:06 +08:00 |
|
Tim
|
04fded784e
|
单词折行样式
|
2016-01-19 17:02:46 +08:00 |
|
ouyangxuhua
|
e70e1beb5d
|
Merge branch 'szzh' into dev_hjq
|
2016-01-19 16:59:04 +08:00 |
|
ouyangxuhua
|
7acfc22ee1
|
未登陆情况下，访问组织栏目增加margin-top:10px,已使样式正常
|
2016-01-19 16:58:15 +08:00 |
|
cxt
|
6e56a0706a
|
动态描述中的单词折行
|
2016-01-19 16:53:34 +08:00 |