 yuanke
|
87845bcfda
|
Merge branch 'develop' into yuanke
|
2016-07-04 08:58:14 +08:00 |
|
yuanke
|
3159d16917
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 21:39:14 +08:00 |
 huang
|
3737ef40d0
|
Merge branch 'cxt_course' into develop
Conflicts:
public/stylesheets/courses.css
|
2016-07-01 21:39:29 +08:00 |
|
yuanke
|
447e624f36
|
课程大纲bug修复
|
2016-07-01 21:38:37 +08:00 |
|
huang
|
d346679eaf
|
Merge branch 'rep_quality' into develop
|
2016-07-01 21:34:49 +08:00 |
 txz
|
6ac7d322b9
|
some added
|
2016-07-01 21:31:50 +08:00 |
|
yuanke
|
62a7d56c97
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 20:39:17 +08:00 |
|
yuanke
|
70e26927cb
|
班级中的课程字样改为班级
|
2016-07-01 20:38:33 +08:00 |
|
huang
|
171130ed74
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 20:28:51 +08:00 |
|
huang
|
641b1531b5
|
Merge branch 'rep_quality' into develop
|
2016-07-01 20:28:30 +08:00 |
|
txz
|
61b5a100eb
|
delete log messages
|
2016-07-01 20:25:58 +08:00 |
|
txz
|
134aa55e04
|
authoriod
|
2016-07-01 20:16:06 +08:00 |
|
yuanke
|
82b4e1058a
|
Merge branch 'develop' into yuanke
|
2016-07-01 20:07:51 +08:00 |
|
yuanke
|
bc30f1128e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 20:06:53 +08:00 |
|
yuanke
|
1bfb2918f0
|
KE间距改回原来的，修改课程大纲附件删除下载问题，修改博客标题与置顶样式问题
|
2016-07-01 20:06:12 +08:00 |
|
txz
|
8cc4b7a878
|
public questions
|
2016-07-01 20:00:23 +08:00 |
|
Tim
|
28c20c966e
|
查看标签页面显示bug
|
2016-07-01 19:28:55 +08:00 |
|
huang
|
67cad6fc25
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 17:54:38 +08:00 |
|
huang
|
374a905d1e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 17:53:47 +08:00 |
|
huang
|
e74a2ba275
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-07-01 17:53:29 +08:00 |
|
huang
|
2a048b86f2
|
Merge branch 'rep_quality' into develop
|
2016-07-01 17:52:45 +08:00 |
 cxt
|
b1a77a036b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 17:52:35 +08:00 |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-01 17:52:29 +08:00 |
|
yuanke
|
a7ecfba23b
|
Merge branch 'yuanke_org' into develop
|
2016-07-01 17:52:23 +08:00 |
|
cxt
|
0e2e1b09b5
|
title修改
|
2016-07-01 17:51:01 +08:00 |
|
txz
|
25e77497e7
|
consloe pring
|
2016-07-01 17:50:08 +08:00 |
|
cxt
|
8b87c141cc
|
bug修复
|
2016-07-01 17:47:35 +08:00 |
|
yuanke
|
547d5409bb
|
组织中的课程字样改为班级
|
2016-07-01 17:43:38 +08:00 |
|
cxt
|
0f8cc584a9
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-07-01 17:27:40 +08:00 |
|
cxt
|
5a1090c0e1
|
bug修复
|
2016-07-01 17:27:34 +08:00 |
|
yuanke
|
1edc63721f
|
修改课程列表班级时间显示问题
|
2016-07-01 17:03:05 +08:00 |
|
Tim
|
afbf62fd64
|
当课程数为0时，课程列表点击无效
|
2016-07-01 17:02:52 +08:00 |
|
cxt
|
6867a88a94
|
课程大纲样式调整
|
2016-07-01 16:41:13 +08:00 |
|
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
2016-07-01 16:25:52 +08:00 |
|
Tim
|
3493136aab
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-07-01 16:25:50 +08:00 |
|
yuanke
|
89e42ac776
|
将姓氏改为姓名
|
2016-07-01 16:10:48 +08:00 |
|
huang
|
a5f3b304d7
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/repositories/show.html.erb
|
2016-07-01 16:00:34 +08:00 |
|
yuanke
|
8db5852a61
|
激活邮箱界面显示邮箱，激活邮箱界面留言太长不能留言解决
|
2016-07-01 15:49:25 +08:00 |
|
txz
|
7178c50b1d
|
branch's total commits
|
2016-07-01 15:37:39 +08:00 |
|
cxt
|
25b5d74a42
|
课程大纲的修改
|
2016-07-01 15:25:30 +08:00 |
|
txz
|
21be94cbe1
|
add some links
|
2016-07-01 15:05:01 +08:00 |
|
txz
|
1fbb65b906
|
获取结果ajax加载中
|
2016-07-01 14:39:40 +08:00 |
|
Tim
|
5f1fd2239b
|
数据迁移
|
2016-07-01 14:20:48 +08:00 |
|
cxt
|
f70b51769c
|
Merge branch 'cxt_course' into develop
|
2016-07-01 14:14:13 +08:00 |
|
cxt
|
afe16cc99c
|
课程大纲列表的js调整
|
2016-07-01 14:13:40 +08:00 |
|
Tim
|
def0d79271
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_syllabus_list.html.erb
|
2016-07-01 13:56:07 +08:00 |
|
Tim
|
7633761bbe
|
课程大纲列表展开收起js
|
2016-07-01 13:54:00 +08:00 |
|
cxt
|
b2aee9b1b8
|
新建课程大纲的描述
|
2016-07-01 13:52:22 +08:00 |
|
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
2016-07-01 11:31:51 +08:00 |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-01 11:30:24 +08:00 |