 cxt
|
cde8a8957c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-30 16:37:43 +08:00 |
|
cxt
|
986fe7db86
|
竞赛增加讨论区模块
|
2016-12-30 16:37:20 +08:00 |
|
cxt
|
d1fbaa27b9
|
竞赛 ：作品--》提交
|
2016-12-30 13:58:09 +08:00 |
|
cxt
|
73350e34f1
|
竞赛作品的相关设置
|
2016-12-30 10:30:21 +08:00 |
|
cxt
|
bdd2a60d00
|
竞赛：加入竞赛、发布竞赛、发布通知等的消息
|
2016-12-28 11:30:31 +08:00 |
 黄井泉
|
8e2353d61e
|
Merge branch 'develop' into 'develop'
新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题
新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题
See merge request !88
|
2016-12-27 16:27:19 +08:00 |
 daiao
|
cfa81fc79d
|
新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题
|
2016-12-27 16:18:23 +08:00 |
|
cxt
|
1de4b48d34
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-27 14:28:30 +08:00 |
|
huang
|
8126353b43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
2016-12-27 12:29:43 +08:00 |
|
cxt
|
76b13b1c05
|
竞赛列表的星星icon提示需要修改
|
2016-12-27 10:52:04 +08:00 |
|
cxt
|
b0aedc9882
|
竞赛列表的单位改成创建者
|
2016-12-27 09:41:22 +08:00 |
|
huang
|
d10a51df1b
|
部分用户主页 点击课程后500问题
|
2016-12-26 16:45:56 +08:00 |
|
cxt
|
4067a9c4a7
|
title修改、通知的编辑删除、附件下载
|
2016-12-24 20:22:09 +08:00 |
|
cxt
|
631bcd508f
|
竞赛通知要可以编辑和删除
|
2016-12-24 19:34:03 +08:00 |
|
cxt
|
cbefe70e00
|
bug修复
|
2016-12-24 19:12:33 +08:00 |
|
cxt
|
e22e1caaed
|
bug修复
|
2016-12-24 18:48:50 +08:00 |
|
daiao
|
e86bd6728e
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/users_controller.rb
app/helpers/application_helper.rb
app/views/users/_user_activities.html.erb
db/schema.rb
|
2016-12-24 16:48:48 +08:00 |
|
cxt
|
de9f5131b6
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-24 16:30:30 +08:00 |
|
daiao
|
84d5b5bc4a
|
竞赛列表
|
2016-12-24 16:29:53 +08:00 |
|
cxt
|
9af9945cb4
|
竞赛
|
2016-12-24 16:29:10 +08:00 |
|
cxt
|
44b3f6019c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-23 21:44:20 +08:00 |
|
cxt
|
86bd5b97b1
|
竞赛头部调整
|
2016-12-23 21:44:03 +08:00 |
|
daiao
|
110bbd6c3b
|
issue 动态样式宽度
|
2016-12-23 21:34:21 +08:00 |
|
huang
|
b563b170bd
|
竞赛动态新闻
|
2016-12-23 21:13:40 +08:00 |
|
daiao
|
dbd8802b9c
|
项目动态内容样式调整，重发邮件调整
|
2016-12-23 21:11:39 +08:00 |
|
huang
|
43bb3fe4eb
|
完成竞赛通知 列表页面
|
2016-12-23 19:35:02 +08:00 |
|
daiao
|
d10a12fadd
|
邮箱激活页面调整
|
2016-12-23 15:30:39 +08:00 |
|
cxt
|
544702e11f
|
新建题目
|
2016-12-23 14:41:21 +08:00 |
|
daiao
|
fd97d8b421
|
课程社区的首页动态，加入班级资源库动态
|
2016-12-23 14:03:43 +08:00 |
|
daiao
|
1f10a75150
|
项目社区首页，点击动态选项“论坛动态”报500问题
|
2016-12-23 11:12:05 +08:00 |
|
daiao
|
a40b7f6fd0
|
申请项目，申请人接受到的消息调整为：申请人头像+申请姓名+消息
|
2016-12-23 09:34:23 +08:00 |
|
cxt
|
9331525304
|
竞赛消息的调整
|
2016-12-22 17:13:10 +08:00 |
|
cxt
|
346dc069ef
|
加入竞赛的消息通知
|
2016-12-22 16:02:36 +08:00 |
|
daiao
|
b4d4fa4e28
|
待办任务的所有列表页，首列加上发布人的头像
|
2016-12-22 14:49:19 +08:00 |
|
daiao
|
884a201953
|
项目加入申请，被审批后，其他管理员的消息显示加入操作人姓名（并将提示弹框改为新版）
|
2016-12-22 13:48:03 +08:00 |
|
cxt
|
5242e12373
|
竞赛框架搭建
|
2016-12-22 10:01:37 +08:00 |
|
daiao
|
c42861c8b5
|
个人主页，待办任务数字实时刷新
|
2016-12-21 17:27:53 +08:00 |
|
daiao
|
adce17c877
|
首页的消息列表头像换成圆形
|
2016-12-21 09:49:09 +08:00 |
|
daiao
|
c481ee6536
|
项目的讨论区和资源库翻页做成新样式
|
2016-12-21 08:48:16 +08:00 |
|
daiao
|
34e250f953
|
动态文字内容宽度调整至于齿轮中线对齐
|
2016-12-20 16:59:01 +08:00 |
|
daiao
|
c2924e06e6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-20 11:04:39 +08:00 |
|
daiao
|
2b60143f78
|
博客，班级的帖子标题和内容，留言显示出现英文单词分隔显示问题
|
2016-12-20 11:04:16 +08:00 |
|
huang
|
9a6a4a5203
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-19 09:55:07 +08:00 |
|
cxt
|
35dfdeea98
|
消息报500
|
2016-12-17 18:01:08 +08:00 |
|
cxt
|
fc6d2f1155
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-17 17:59:05 +08:00 |
|
cxt
|
c444096a04
|
消息列表报500
|
2016-12-17 17:58:31 +08:00 |
|
daiao
|
96e02cd48f
|
项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误
|
2016-12-17 17:04:44 +08:00 |
|
daiao
|
d16e9e4ecd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-17 15:38:49 +08:00 |
|
daiao
|
73747a81d6
|
个人主页消息铃铛翻页
|
2016-12-17 15:34:26 +08:00 |
|
cxt
|
d9dcb3b291
|
“我的作业”页面中“评分”建议跳转到作品列表，而不是作业信息页面
|
2016-12-17 10:41:30 +08:00 |