 ouyangxuhua
|
49af0cdea7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-25 13:05:06 +08:00 |
|
ouyangxuhua
|
d7de5fc480
|
更改消息样式
|
2015-08-25 13:04:46 +08:00 |
 huang
|
4c974266b8
|
没消息显示！
|
2015-08-25 13:04:25 +08:00 |
|
huang
|
b1ed9deba1
|
内容框对齐
|
2015-08-25 12:46:57 +08:00 |
|
huang
|
64e54cda75
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-25 12:43:47 +08:00 |
|
huang
|
3ecdb2940b
|
去掉统计信息
|
2015-08-25 12:43:27 +08:00 |
|
ouyangxuhua
|
32e67a3cb1
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-25 11:17:57 +08:00 |
|
ouyangxuhua
|
12c3f5a723
|
消息讨论区viewed字段更新
|
2015-08-25 11:17:37 +08:00 |
|
huang
|
bff139b9a7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-25 11:10:32 +08:00 |
|
huang
|
0da75afc88
|
消息排序（公共表）
|
2015-08-25 11:10:08 +08:00 |
 sw
|
5b99effbc8
|
更新css，编辑个人简介功能BUG
|
2015-08-25 10:30:31 +08:00 |
|
ouyangxuhua
|
365e6ae678
|
样式更新
|
2015-08-25 10:25:49 +08:00 |
|
ouyangxuhua
|
354cb52339
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-25 10:20:39 +08:00 |
|
ouyangxuhua
|
d83ed09617
|
更新viewed字段
|
2015-08-25 10:19:47 +08:00 |
|
sw
|
67c4561b28
|
我的课程、我的项目图标
|
2015-08-25 10:04:27 +08:00 |
 cxt
|
9320cd18d3
|
个人动态的项目讨论动态
|
2015-08-25 09:50:36 +08:00 |
|
sw
|
d132c08a11
|
增加footer
|
2015-08-25 09:29:19 +08:00 |
|
huang
|
5306d7e2a4
|
列表排序（未完）
|
2015-08-24 23:53:28 +08:00 |
|
huang
|
7961e3db6f
|
建立公共表
|
2015-08-24 22:47:48 +08:00 |
|
sw
|
38f8aa5ba4
|
更新css文件
|
2015-08-24 18:25:33 +08:00 |
|
sw
|
4bf92d0737
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-24 18:17:45 +08:00 |
|
sw
|
45d90639c9
|
静态页面的间距
|
2015-08-24 18:17:33 +08:00 |
|
sw
|
3ea198dc3d
|
标题栏作业界面静态页面的添加
|
2015-08-24 18:15:46 +08:00 |
|
cxt
|
2e5916cf5e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/admin_controller.rb
|
2015-08-24 18:01:51 +08:00 |
|
huang
|
4af3c9816c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
db/schema.rb
|
2015-08-24 17:53:55 +08:00 |
|
huang
|
2d05d1f7d0
|
0
|
2015-08-24 17:51:44 +08:00 |
|
huang
|
d575ce5e5f
|
消息公共表
|
2015-08-24 17:51:19 +08:00 |
|
ouyangxuhua
|
b7a473a1b2
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-24 17:46:11 +08:00 |
|
cxt
|
51c2f595d1
|
个人主页动态
|
2015-08-24 17:45:09 +08:00 |
|
ouyangxuhua
|
f0483b6de8
|
更新新闻viewed
|
2015-08-24 17:45:00 +08:00 |
|
ouyangxuhua
|
bf596d7b4b
|
更新新闻viewed字段
|
2015-08-24 17:44:13 +08:00 |
|
sw
|
26c5592d29
|
用户课程或项目名称过长时的显示
|
2015-08-24 17:04:40 +08:00 |
 lizanle
|
5bf7aeb430
|
资源库css小改动
|
2015-08-24 16:35:10 +08:00 |
|
lizanle
|
39b022f696
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/new_public.css
|
2015-08-24 16:25:09 +08:00 |
|
lizanle
|
86d2f5342c
|
登陆界面
|
2015-08-24 16:22:22 +08:00 |
|
lizanle
|
614743d8d4
|
登陆界面
|
2015-08-24 16:22:06 +08:00 |
|
sw
|
a9c7c252e5
|
搜索功能js以及类型的选择
|
2015-08-24 16:16:07 +08:00 |
|
huang
|
f26ccac3b9
|
Merge branch 'sw_new_course' into dev_hjq
|
2015-08-24 15:46:29 +08:00 |
|
sw
|
e746a7764f
|
处理被还原的css
|
2015-08-24 15:36:32 +08:00 |
|
sw
|
5fcb97b990
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/new_public.css
|
2015-08-24 15:32:51 +08:00 |
|
sw
|
dabef542fe
|
更新css文件，并实现未登陆用户时静态页面显示
|
2015-08-24 15:30:11 +08:00 |
|
sw
|
fe91442c96
|
课程列表已关闭课程标识出来
|
2015-08-24 15:18:07 +08:00 |
|
huang
|
4d0abbc4d3
|
添加消息总数和未读控制
|
2015-08-24 15:03:45 +08:00 |
|
sw
|
7f2f2c5d40
|
个人主页，项目更多功能
|
2015-08-24 14:53:35 +08:00 |
|
lizanle
|
12b89e2c81
|
可拖动的框暂时做不了。
|
2015-08-24 14:53:30 +08:00 |
|
huang
|
3919f15806
|
调整消息提示样式及连接
|
2015-08-24 14:52:23 +08:00 |
|
sw
|
2d75fea96b
|
课程点击更多按钮显示
|
2015-08-24 14:44:22 +08:00 |
|
huang
|
17b06963dd
|
添加未读样式
|
2015-08-24 14:29:38 +08:00 |
|
lizanle
|
9a2e9a4ad2
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-24 13:54:22 +08:00 |
|
lizanle
|
5628a43578
|
资源库和新版个人中心整合
|
2015-08-24 13:54:15 +08:00 |