 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 |
|
ouyangxuhua
|
d0c2eabddd
|
未登陆情况下，也能下载组织下的文件
|
2016-01-19 16:42:10 +08:00 |
|
cxt
|
e293805488
|
点击在线问卷时若未登录则直接跳到登录页面
|
2016-01-19 15:41:53 +08:00 |
|
cxt
|
8e9c4bab6b
|
赞增加tip
|
2016-01-19 10:08:28 +08:00 |
|
cxt
|
6e582fa631
|
老师评阅作品时可以不写评语，只有学生匿评的时候才强制写评语
|
2016-01-19 09:55:28 +08:00 |
|
cxt
|
7f7d0ac6f7
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
2016-01-18 17:12:56 +08:00 |
|
cxt
|
b4521d3582
|
课程/项目首页的更多默认收起
|
2016-01-18 16:18:40 +08:00 |
|
cxt
|
c5935a6a46
|
博客动态添加点赞
|
2016-01-18 15:52:38 +08:00 |
|
cxt
|
9cabb0248a
|
已点过赞的动态显示”已赞“
|
2016-01-18 15:12:47 +08:00 |
|
ouyangxuhua
|
909e0e846b
|
路由配置问题
|
2016-01-18 11:06:08 +08:00 |
|
ouyangxuhua
|
5e102d24dd
|
解决个人博客报500的问题
|
2016-01-18 11:01:04 +08:00 |
|
ouyangxuhua
|
f796aa1489
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-18 10:54:17 +08:00 |
|
ouyangxuhua
|
03df9abfeb
|
增加域名唯一性判断
|
2016-01-18 10:43:22 +08:00 |
|
cxt
|
df57b13ce0
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/helpers/application_helper.rb
|
2016-01-18 10:16:09 +08:00 |
|
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
2016-01-18 10:13:31 +08:00 |
|
ouyangxuhua
|
c6aaaff8d1
|
对有子域名的组织，栏目的链接应不含有组织及其id
|
2016-01-18 10:07:12 +08:00 |
 huang
|
ed26242f94
|
版本库提交次数迁移
|
2016-01-15 21:19:52 +08:00 |
|
huang
|
b2746d0953
|
课程讨论区总数计入回复数
|
2016-01-15 16:30:17 +08:00 |
|
huang
|
f52e74da61
|
修改issues总数读取方式
|
2016-01-15 16:11:26 +08:00 |
|
huang
|
eecdc26b2f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
2016-01-15 15:42:36 +08:00 |
|
huang
|
86516df88a
|
Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/helpers/application_helper.rb
|
2016-01-15 15:41:02 +08:00 |
|
huang
|
c936304314
|
课程默认收起
|
2016-01-15 15:37:17 +08:00 |
|
Tim
|
50849baade
|
侧导航“+”号图标调小
|
2016-01-15 15:27:03 +08:00 |
|
ouyangxuhua
|
b9359b1cee
|
显示url申请
|
2016-01-15 13:15:17 +08:00 |
|
huang
|
b6ae14a1ce
|
课程更多字体12
|
2016-01-15 12:51:50 +08:00 |
|
huang
|
81b32ea643
|
点击铃铛弹出新tab页
|
2016-01-15 12:39:38 +08:00 |
|
huang
|
18bc8215e3
|
路由冲突
|
2016-01-15 11:35:27 +08:00 |
|
huang
|
c6357181c4
|
Merge branch 'szzh' into develop
|
2016-01-15 11:16:30 +08:00 |
|
huang
|
2a31cc91fe
|
Merge branch 'develop' into szzh
Conflicts:
config/routes.rb
|
2016-01-15 11:15:47 +08:00 |
|
huang
|
64f972770f
|
添加board和attachment数据迁移
|
2016-01-15 10:41:34 +08:00 |
|
cxt
|
902cfdcbe9
|
课程/项目的创建动态不需要显示更新时间
|
2016-01-15 10:29:55 +08:00 |
|
cxt
|
c49a290d56
|
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-15 10:24:37 +08:00 |
|
ouyangxuhua
|
16a3a7d06d
|
隐藏url定制
|
2016-01-14 21:42:28 +08:00 |
|
ouyangxuhua
|
def640cd31
|
Merge branch 'dev_hjq' into develop
|
2016-01-14 21:31:29 +08:00 |
|
ouyangxuhua
|
7ad377f458
|
修改一些bug
|
2016-01-14 21:29:43 +08:00 |
|
huang
|
20d550e755
|
提交次数默认值为空的数据处理
|
2016-01-14 21:25:36 +08:00 |
|
cxt
|
0be6e36020
|
缺陷、通知、个人留言动态的点赞
|
2016-01-14 21:07:05 +08:00 |
|
huang
|
733c65d7fd
|
Merge branch 'hjq_new_course' into develop
|
2016-01-14 20:48:37 +08:00 |
|
huang
|
9bbb1e0f90
|
修改fork时候项目ID问题
|
2016-01-14 20:48:12 +08:00 |
 guange
|
c8b52db6f9
|
merge
|
2016-01-14 20:38:37 +08:00 |
|
guange
|
c298adda7c
|
子域名路由实现
|
2016-01-14 20:37:56 +08:00 |