 cxt
|
148aa9cda9
|
首页头像调整
|
2016-08-26 16:42:29 +08:00 |
|
cxt
|
6eb518c465
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/at/show.json.erb
app/views/layouts/new_base_user.html.erb
|
2016-08-26 16:23:07 +08:00 |
|
cxt
|
0d05d04d2c
|
头像编辑的样式调整
|
2016-08-26 14:44:32 +08:00 |
|
cxt
|
62e28f638c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
app/views/layouts/base_projects.html.erb
app/views/layouts/new_base_user.html.erb
|
2016-08-26 14:33:18 +08:00 |
|
cxt
|
774b5eca89
|
课程和项目的头像点击可编辑
|
2016-08-26 14:31:14 +08:00 |
 Tim
|
a8f30fe85f
|
个人主页，课程，项目头像、logo增加编辑按钮
|
2016-08-26 11:31:54 +08:00 |
|
cxt
|
60beb2abab
|
首页左侧班级和项目列表的收藏功能
|
2016-08-25 11:30:47 +08:00 |
|
cxt
|
56b74b755b
|
取消收藏
|
2016-08-24 17:30:30 +08:00 |
 daiao
|
8b0c0925dd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-08-24 14:52:10 +08:00 |
|
cxt
|
6af43070c7
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-08-24 13:56:53 +08:00 |
|
Tim
|
57ecffc130
|
班级新增收藏功能
|
2016-08-24 10:28:09 +08:00 |
|
cxt
|
5d5bd88c88
|
个人主页：用户不应有修改他人头像的权限
|
2016-08-24 09:30:57 +08:00 |
|
daiao
|
7e34062435
|
Merge branch 'dev_shcool' into develop
|
2016-08-23 09:43:38 +08:00 |
|
cxt
|
1374444ec1
|
左侧项目列表的展开
|
2016-08-13 17:04:09 +08:00 |
|
daiao
|
4a9967674a
|
1. 强制编辑基本资料，在删除单位时给出消息通知
2. 单位名称申请提示一直显示
3. 申请单位的消息通知显示申请人头像，并连接到申请人主页
|
2016-08-13 14:29:33 +08:00 |
|
Tim
|
ba7f9ed735
|
班级、项目侧导航文字缩小
|
2016-08-10 17:19:32 +08:00 |
|
cxt
|
0d86a28c54
|
我的作业
|
2016-08-05 16:12:53 +08:00 |
|
cxt
|
b7c05fed4a
|
首页样式和js调整
|
2016-08-04 16:33:51 +08:00 |
|
cxt
|
6c7b53f7d4
|
首页左侧栏
|
2016-08-04 11:05:34 +08:00 |
 huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
2016-07-29 21:39:00 +08:00 |
|
huang
|
0bf9b5c6e6
|
消息红点记录 个人主页添加加入项目入口
|
2016-07-29 20:31:24 +08:00 |
|
cxt
|
5a8d2407e2
|
放开新建课程、新建班级的权限
|
2016-07-29 19:28:50 +08:00 |
|
Tim
|
c41a116378
|
博客上传附件后，编辑处文件夹图标显示；大纲引用css样式更改
|
2016-07-14 17:00:38 +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 |
|
cxt
|
2c1e0f534c
|
课程大纲
|
2016-07-01 11:11:53 +08:00 |
|
Tim
|
ba1db91a1e
|
css优化调整
|
2016-06-30 15:38:00 +08:00 |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
2016-06-30 10:44:11 +08:00 |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
2016-06-29 10:45:56 +08:00 |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
2016-06-28 15:13:04 +08:00 |
|
huang
|
8741917823
|
访问统计 （自2016年5月）
|
2016-06-17 14:31:42 +08:00 |
|
huang
|
d127c6e12c
|
访问添加自某年某月
|
2016-06-17 09:45:10 +08:00 |
|
Tim
|
9cd1630651
|
优化css添加，将课程，项目，个人主页，组织首页样式替换，登录与个人主页详细css替换
|
2016-06-16 08:52:13 +08:00 |
 yuanke
|
44c9265fee
|
个人主页个性签名增加自动识别url
|
2016-06-13 15:29:15 +08:00 |
|
cxt
|
d303a06377
|
首页列表的排序
|
2016-05-10 11:32:20 +08:00 |
|
huang
|
572a051b04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/users_controller.rb
app/views/blogs/_article.html.erb
app/views/layouts/new_base_user.html.erb
|
2016-05-06 11:35:27 +08:00 |
|
yuanke
|
411ae6f89e
|
1.修改贴吧分页显示问题2列表优化
|
2016-05-04 11:03:08 +08:00 |
|
yuanke
|
afd176b805
|
课程项目按更新时间排序
|
2016-05-03 19:10:04 +08:00 |
|
cxt
|
3f7a391214
|
课程和项目的排序
|
2016-04-29 20:45:14 +08:00 |
|
cxt
|
1dc0f9dd95
|
主页的项目和课程排序
|
2016-04-29 15:55:29 +08:00 |
|
yuanke
|
dac717bd97
|
列表左边菜单收缩
|
2016-04-27 14:12:56 +08:00 |
|
yuanke
|
23f48b7189
|
项目列表、项目讨论区列表
|
2016-04-27 09:54:49 +08:00 |
|
yuanke
|
43c1120b19
|
课程问答区 项目讨论区列表
|
2016-04-26 15:10:47 +08:00 |
|
yuanke
|
f6d09e0554
|
配置中增加一个 隐藏课程信息的功能
|
2016-04-24 14:23:08 +08:00 |
|
huang
|
acf4e15f09
|
统计数左侧刷新
|
2016-04-14 10:26:25 +08:00 |
 alan
|
6862480632
|
修改当用户没有项目时，报错
|
2016-03-25 17:16:45 +08:00 |
|
alan
|
05d66f41f9
|
fix bug when user don't have courses or projects
|
2016-03-25 17:07:30 +08:00 |
|
alan
|
0d049bbe1f
|
refactor new_base_user
|
2016-03-24 10:07:39 +08:00 |
|
alan
|
13e265b7d2
|
优化 layouts/_user_projects 和 layouts/_user_courses页面
|
2016-03-23 18:25:50 +08:00 |
 ouyangxuhua
|
5c22b23f3a
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-18 14:52:51 +08:00 |
|
ouyangxuhua
|
1eafad6468
|
鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息
|
2016-03-18 10:05:31 +08:00 |