 Tim
|
fbedaea768
|
图标显示css修改
|
2016-07-08 09:00:54 +08:00 |
|
Tim
|
65cbf14d72
|
提交与取消按钮间添加间距；图标不显示等
|
2016-07-07 17:06:31 +08:00 |
|
Tim
|
b02c1b5995
|
提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减；
|
2016-07-07 15:08:34 +08:00 |
|
Tim
|
421dc636fe
|
作业列表样式更新
|
2016-07-07 10:47:12 +08:00 |
|
Tim
|
b6716e542a
|
wiki编辑页面更新
|
2016-07-06 15:59:49 +08:00 |
|
Tim
|
0b764d0dfc
|
RSide样式处理
|
2016-07-06 15:52:18 +08:00 |
|
Tim
|
75475b6058
|
个人主页，课程，项目样式更新
|
2016-07-06 15:43:48 +08:00 |
|
Tim
|
d2d2222ea2
|
组织成员列表样式调整
|
2016-07-06 10:00:28 +08:00 |
|
Tim
|
4136aa9291
|
二级回复，上传附件后删除图标，文件图标显示，
|
2016-07-06 09:07:48 +08:00 |
|
Tim
|
d9fc479607
|
消息弹框显示css调整
|
2016-07-05 16:51:55 +08:00 |
|
Tim
|
253933c85a
|
消息通知图标显示
|
2016-07-05 16:46:52 +08:00 |
|
Tim
|
b91d6a3273
|
班级动态筛选框样式调整
|
2016-07-05 16:31:36 +08:00 |
|
Tim
|
c3bc901925
|
对#Rside样式处理
|
2016-07-05 16:16:12 +08:00 |
|
Tim
|
fae2dc324c
|
登录注册页面图标显示
|
2016-07-05 16:03:39 +08:00 |
|
Tim
|
1658f78a7b
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/users/_user_resource_info.html.erb
|
2016-07-05 15:38:56 +08:00 |
|
Tim
|
4cbae10934
|
同步devlope分支css
|
2016-07-05 15:01:02 +08:00 |
 cxt
|
0dd7ef4460
|
帖子列表的回复数与实际不符
|
2016-07-04 14:45:50 +08:00 |
|
cxt
|
599cedaa18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
public/stylesheets/public.css
|
2016-07-04 14:15:56 +08:00 |
|
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
2016-07-04 14:14:51 +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
|
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 |