 daiao
|
0591440c9e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
app/views/users/_user_message_forge.html.erb
db/schema.rb
|
2017-01-13 11:28:33 +08:00 |
|
daiao
|
7b5c3435d4
|
修改小铃铛未读消息数的背景样式
|
2017-01-12 16:50:12 +08:00 |
 cxt
|
c44af451ce
|
竞赛增加留言模块
|
2017-01-11 10:16:25 +08:00 |
 huang
|
17d4e45acc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2016-12-30 17:33:18 +08:00 |
|
cxt
|
6ba5f124e3
|
竞赛相关icon更换
|
2016-12-30 13:58:40 +08:00 |
|
huang
|
11135bfabf
|
问吧编辑
|
2016-12-30 11:30:40 +08:00 |
|
cxt
|
bdd2a60d00
|
竞赛：加入竞赛、发布竞赛、发布通知等的消息
|
2016-12-28 11:30:31 +08:00 |
|
huang
|
465b3e7b52
|
问吧 base框架
|
2016-12-27 16:09:09 +08:00 |
|
cxt
|
3d30a11f66
|
导航栏头部增加竞赛入口
|
2016-12-27 10:06:56 +08:00 |
|
daiao
|
adce17c877
|
首页的消息列表头像换成圆形
|
2016-12-21 09:49:09 +08:00 |
|
cxt
|
16fe5f58a1
|
详细列表的样式调整
|
2016-12-17 09:38:48 +08:00 |
|
daiao
|
e773ba2aa8
|
个人主页样式调整
|
2016-12-16 16:41:55 +08:00 |
|
cxt
|
552b6429ef
|
消息列表的样式调整
|
2016-12-16 16:11:19 +08:00 |
|
daiao
|
0d4dc89c73
|
个人主页的tab的JS及其样式
|
2016-12-14 10:17:39 +08:00 |
|
daiao
|
54687793ec
|
铃铛样式重新排版
|
2016-12-13 17:22:30 +08:00 |
|
cxt
|
93cf24cf41
|
首页消息提醒、消息动态样式
|
2016-12-12 15:57:26 +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 |
|
cxt
|
92871ff925
|
弹框样式调整、作业截止后附件不能删除
|
2016-12-08 16:24:17 +08:00 |
|
daiao
|
69d9228808
|
个人主页的消息页面
|
2016-12-07 15:13:51 +08:00 |
|
daiao
|
e6763c6d0c
|
用户消息铃铛样式调整
|
2016-12-07 09:00:33 +08:00 |
|
cxt
|
2fd4cb9064
|
班级作业增加设置选项：成绩公开范围
|
2016-12-02 13:30:49 +08:00 |
 yuanke
|
b1ae697c3d
|
页面缩小时页面下方需要出现左右滚动条
|
2016-11-25 16:00:41 +08:00 |
 Tim
|
aa379980d7
|
版本库显示页面宽度扩展
|
2016-10-18 15:40:23 +08:00 |
|
Tim
|
c693afdee8
|
project.css去重，提取到public.css
|
2016-10-11 17:26:36 +08:00 |
|
huang
|
db54d6e0d9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/project.css
|
2016-09-26 22:21:45 +08:00 |
|
Tim
|
13f3ffec9f
|
侧导航调整
|
2016-09-23 16:47:12 +08:00 |
|
Tim
|
86a3ce185d
|
个人主页侧导航宽度限制更改，提示框效果及js实现
|
2016-09-23 14:17:23 +08:00 |
|
huang
|
751665089c
|
完成项目base搭建
|
2016-09-23 11:28:00 +08:00 |
|
Tim
|
7cd2a98f11
|
侧导航课程、班级名称长度控制；箭头替换；tip显示更改
|
2016-09-14 16:50:46 +08:00 |
|
Tim
|
8c95141460
|
侧导航箭头显示
|
2016-09-09 16:48:43 +08:00 |
|
Tim
|
862bbd1a1f
|
班级名称前增加课程名，一系列更改
|
2016-09-09 15:49:31 +08:00 |
|
Tim
|
40f5510195
|
侧导航文字和按钮不重合
|
2016-09-01 16:01:16 +08:00 |
|
Tim
|
eda735db58
|
footer文字居中
|
2016-08-31 14:40:34 +08:00 |
|
cxt
|
3c5afb2b4f
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-08-29 15:35:04 +08:00 |
|
cxt
|
95ec047653
|
班级名称过长时，动态中标题显示与动态编辑图标按钮重叠
|
2016-08-29 14:12:42 +08:00 |
|
Tim
|
a13ec60173
|
修复无效的css
|
2016-08-24 17:02:59 +08:00 |
|
Tim
|
5dd6244a34
|
pull request添加留言
|
2016-08-09 10:45:14 +08:00 |
|
cxt
|
b7c05fed4a
|
首页样式和js调整
|
2016-08-04 16:33:51 +08:00 |
|
cxt
|
6c7b53f7d4
|
首页左侧栏
|
2016-08-04 11:05:34 +08:00 |
|
cxt
|
72977886c7
|
Merge branch 'cs_optimize_txz' into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
|
2016-07-29 19:37:15 +08:00 |
|
cxt
|
335b82c046
|
加入班级的弹框
|
2016-07-29 19:19:58 +08:00 |
|
Tim
|
52475099dc
|
博客设为主页后，文字整个容器宽度显示；班级配置图标菜单css冲突处理；大纲样式冲突处理
|
2016-07-27 14:36:46 +08:00 |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
2016-07-22 16:46:01 +08:00 |
|
cxt
|
1e28ff880d
|
新版课程大纲
|
2016-07-22 10:20:28 +08:00 |
|
Tim
|
541440135f
|
css中引用图片路径修改
|
2016-07-21 10:11:02 +08:00 |
|
Tim
|
78e4d37d8b
|
大纲base页引入弹框样式；作业列表调整
|
2016-07-20 15:09:01 +08:00 |
|
Tim
|
c41a116378
|
博客上传附件后，编辑处文件夹图标显示；大纲引用css样式更改
|
2016-07-14 17:00:38 +08:00 |
|
Tim
|
1fdd1a2a21
|
作业列表css与develop分支同步；popup.css优化
|
2016-07-14 15:28:01 +08:00 |