 huang
|
a759fce270
|
issue详情优化
|
2016-12-21 16:28:51 +08:00 |
|
huang
|
a148f3c157
|
Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_new_user_message.html.erb
public/stylesheets/css/user.css
|
2016-12-16 14:06:17 +08:00 |
 daiao
|
1ff1ed3c54
|
个人主页
|
2016-12-16 14:03:01 +08:00 |
|
huang
|
c0391b967f
|
注册用户发送留言 、留言页面代码优化
|
2016-12-16 11:42:52 +08:00 |
|
daiao
|
ffd1e3942c
|
个人主页tab列表
|
2016-12-15 09:13:39 +08:00 |
 cxt
|
30dccdec90
|
个人首页的待匿评作品、待完成问卷
|
2016-12-13 13:57:25 +08:00 |
|
cxt
|
9715cba687
|
用户待完成的测验、用户待完成的作业
|
2016-12-12 16:44:01 +08:00 |
|
huang
|
6e67e4a5c7
|
0
|
2016-12-12 10:55:19 +08:00 |
|
daiao
|
0f328d36e1
|
代码改进
|
2016-12-12 10:00:05 +08:00 |
|
daiao
|
fb62d4f1b2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/project.css
|
2016-12-09 20:00:07 +08:00 |
|
daiao
|
92bc7aa813
|
个人首页的7个tab
|
2016-12-09 19:32:00 +08:00 |
|
daiao
|
1875b6ecf7
|
个人首页的项目社区
|
2016-12-08 14:14:52 +08:00 |
|
daiao
|
224c0b686c
|
个人首页的课程社区
|
2016-12-08 09:59:22 +08:00 |
|
cxt
|
9a830fc907
|
Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
app/views/layouts/new_base_user.html.erb
|
2016-12-07 15:21:25 +08:00 |
|
cxt
|
27d800a94a
|
新版首页架构
|
2016-12-07 15:15:00 +08:00 |
|
daiao
|
69d9228808
|
个人主页的消息页面
|
2016-12-07 15:13:51 +08:00 |
|
daiao
|
e6763c6d0c
|
用户消息铃铛样式调整
|
2016-12-07 09:00:33 +08:00 |
|
cxt
|
494946c70e
|
匿评结束后提交的作品也应计算缺评扣分
|
2016-12-06 16:13:04 +08:00 |
|
daiao
|
35fdf9a8a7
|
个人首页头部及其左侧导航(未完)
|
2016-12-06 09:36:13 +08:00 |
|
陈晓婷
|
39258f4ac5
|
Merge branch 'develop' into 'develop'
课程相关bug修复；叠层回复的“回复”、“赞”的显隐
See merge request !32
|
2016-12-02 10:14:07 +08:00 |
|
cxt
|
3f35b7f806
|
贴吧回复改版
|
2016-11-29 09:36:38 +08:00 |
|
daiao
|
2cbc7bca33
|
我的Issue导出功能
|
2016-11-28 16:11:52 +08:00 |
|
daiao
|
2c664dcd21
|
我的issue导出功能（未完）
|
2016-11-28 15:32:02 +08:00 |
 guange
|
c2629ebdc0
|
有几处相同的content key
|
2016-11-26 17:06:17 +08:00 |
|
cxt
|
e202a7b99c
|
二级回复
|
2016-11-25 20:13:01 +08:00 |
|
cxt
|
8a52e136cf
|
点击展开回复
|
2016-11-25 18:01:50 +08:00 |
|
cxt
|
ebda1d7d54
|
测试版课程列表报500
|
2016-11-25 16:17:02 +08:00 |
|
cxt
|
785f027a63
|
Merge branch 'cxt_course' into develop
|
2016-11-25 14:56:24 +08:00 |
|
cxt
|
8743460134
|
动态与详情的回复叠层调整
|
2016-11-25 09:59:03 +08:00 |
 yuanke
|
7713fba2f8
|
个人留言列表优化
|
2016-11-24 14:30:24 +08:00 |
|
cxt
|
eeacd76aa9
|
首页班级列表的归档
|
2016-11-22 10:27:56 +08:00 |
|
cxt
|
4388b7625e
|
首页班级列表的归档
|
2016-11-21 16:58:25 +08:00 |
|
daiao
|
d65a062737
|
所有我的issue功能
|
2016-11-17 17:02:02 +08:00 |
|
daiao
|
e956d20d6e
|
我的issue部分功能
|
2016-11-16 16:57:02 +08:00 |
|
daiao
|
acffe8ec19
|
我的issue未完
|
2016-11-16 11:26:17 +08:00 |
|
huang
|
0adde560ba
|
我的issue路由修改及查询修改
|
2016-11-15 14:30:01 +08:00 |
|
huang
|
11f8656651
|
0
|
2016-11-15 11:20:30 +08:00 |
|
huang
|
5f21b63c41
|
我的issue框架搭建
|
2016-11-15 10:47:07 +08:00 |
|
huang
|
3561009efc
|
Merge branch 'develop' into dev_newproject
|
2016-11-15 09:01:45 +08:00 |
|
cxt
|
edf8ceed7c
|
取消收藏的班级和项目动态不显示
|
2016-11-14 16:37:42 +08:00 |
|
huang
|
f08b04d645
|
My Issue未完
|
2016-11-14 16:06:54 +08:00 |
|
huang
|
d1f9ce3ab2
|
课程中资源库导入不能用
|
2016-11-11 18:19:03 +08:00 |
|
huang
|
0f328c9c58
|
解决用户ID转换成用户名后引发的问题
|
2016-11-10 10:27:57 +08:00 |
|
cxt
|
f921c8cccc
|
发布作业时默认教师优先、迟交扣分为0、缺评扣分为0
|
2016-11-04 18:54:51 +08:00 |
|
huang
|
3ef90a3c62
|
Merge branch 'dev_newproject' into develop
Conflicts:
db/schema.rb
|
2016-10-27 17:33:28 +08:00 |
|
huang
|
ec5645fc66
|
完成项目动态中样式别别的地方冲突问题
|
2016-10-27 14:57:12 +08:00 |
|
huang
|
c4b32438ee
|
动态样式冲突问题
|
2016-10-27 11:16:51 +08:00 |
|
huang
|
6b8184ed49
|
issue模块新版二级回复ajax刷新
|
2016-10-21 13:27:41 +08:00 |
|
cxt
|
bee1597167
|
删除的个人主页报500
|
2016-10-20 15:01:05 +08:00 |
|
cxt
|
269083c4a6
|
分组作业的评分设置
|
2016-10-20 14:24:07 +08:00 |