ouyangxuhua
|
2076c9b449
|
Merge branch 'develop' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/base_org.html.erb
app/views/organizations/_org_activities.html.erb
db/schema.rb
public/stylesheets/new_user.css
public/stylesheets/org.css
public/stylesheets/public.css
|
2015-12-28 15:32:03 +08:00 |
Tim
|
445d5dc379
|
组织下拉菜单修改
|
2015-12-25 16:30:09 +08:00 |
huang
|
801651cba6
|
解决组织两个footer冲突问题
|
2015-12-25 16:16:06 +08:00 |
huang
|
533be61cf7
|
添加底部样式
|
2015-12-25 16:13:17 +08:00 |
huang
|
5d1b63d6fa
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 16:05:07 +08:00 |
huang
|
7412c1caf6
|
添加footer
|
2015-12-25 16:04:49 +08:00 |
Tim
|
1a24505eac
|
footer新增图片,样式修改
|
2015-12-25 15:27:45 +08:00 |
cxt
|
3e39eacd19
|
新建课程通知时通知标题框自动获取焦点
|
2015-12-24 16:45:45 +08:00 |
cxt
|
61b5cf41d0
|
取消课程首页的开设单位超链接
|
2015-12-24 11:23:23 +08:00 |
Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
2015-12-24 10:40:00 +08:00 |
Tim
|
eb7d0761cb
|
组织菜单栏修改成和个人首页相同
|
2015-12-24 10:37:13 +08:00 |
ouyangxuhua
|
9e0b88c186
|
项目讨论区样式改成方块样式
|
2015-12-24 09:46:18 +08:00 |
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-17 19:07:17 +08:00 |
lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
2015-12-17 18:17:38 +08:00 |
ouyangxuhua
|
ef46191c80
|
Merge branch 'szzh' into dev_hjq
|
2015-12-17 17:42:48 +08:00 |
lizanle
|
4bc68081ee
|
editor修改
|
2015-12-17 15:15:00 +08:00 |
cxt
|
90c7822c38
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-15 16:06:59 +08:00 |
cxt
|
72c475e8a2
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-15 16:03:26 +08:00 |
cxt
|
1f4454d908
|
课程左侧的在线测验统计数
|
2015-12-15 10:43:43 +08:00 |
lizanle
|
88c2db47b7
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/helpers/application_helper.rb
|
2015-12-15 08:48:08 +08:00 |
guange
|
d1315e35b5
|
merge
|
2015-12-14 17:26:40 +08:00 |
ouyangxuhua
|
a5fa68c928
|
资源栏目增加资源
|
2015-12-14 16:41:18 +08:00 |
cxt
|
85b11010d2
|
在线测验报500、 学生看不到已截止的测验、测验列表的样式调整
|
2015-12-14 16:18:39 +08:00 |
lizanle
|
f3013ca3e7
|
修改了搜索的提示描述
|
2015-12-14 11:22:36 +08:00 |
huang
|
5ca8d4cd66
|
修改http链接自动换域名
|
2015-12-14 10:54:37 +08:00 |
huang
|
670df76c70
|
注释掉项目邀请加入功能
|
2015-12-10 20:24:42 +08:00 |
huang
|
4f7f4acb1f
|
课程删除
|
2015-12-10 17:26:03 +08:00 |
ouyangxuhua
|
8b14e7c549
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-07 17:19:52 +08:00 |
huang
|
91fa3f6fab
|
解决项目样式冲突问题
|
2015-12-07 16:52:23 +08:00 |
ouyangxuhua
|
76db95aa03
|
1.组织页面中,退出后刷新组织页面;
2.组织页面中,点击“个人主页”,打开新的页面;
3.组织页面页首部分,用户名不链接用户页面。
|
2015-12-07 15:52:13 +08:00 |
ouyangxuhua
|
7057a4cfea
|
组织页首增加退出功能
|
2015-12-07 14:31:08 +08:00 |
ouyangxuhua
|
5034ddb4b6
|
修复组织的bug
|
2015-12-07 12:53:51 +08:00 |
guange
|
3d2ac4b59f
|
KE引用统一使用import_ke
|
2015-12-06 15:03:36 +08:00 |
huang
|
bd3d0547f5
|
组织样式修改
|
2015-12-05 14:34:16 +08:00 |
ouyangxuhua
|
108865968b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-12-05 12:01:49 +08:00 |
ouyangxuhua
|
12c57e7e4b
|
将Jquery引入组织首页
|
2015-12-05 12:01:04 +08:00 |
huang
|
9d68fd7d28
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-12-05 11:39:50 +08:00 |
huang
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
2015-12-05 11:39:40 +08:00 |
ouyangxuhua
|
37a7abea53
|
组织首页
|
2015-12-05 11:31:20 +08:00 |
ouyangxuhua
|
01b82e59d8
|
实现组织首页功能
|
2015-12-05 11:30:05 +08:00 |
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
2015-12-04 17:34:48 +08:00 |
lizanle
|
4c00312f45
|
Merge branch 'szzh' into dev_zanle
|
2015-12-04 16:42:02 +08:00 |
huang
|
4a41039fa6
|
课程英雄榜改成课程活跃度
|
2015-12-04 15:58:56 +08:00 |
ouyangxuhua
|
2855c0e409
|
修改项目动态,使其与课程动态及个人动态的样式一致,包括有回复框、过滤菜单、宽度、间距等
|
2015-12-04 10:59:09 +08:00 |
lizanle
|
7af82aac98
|
base_forums要加ajax-indicator ajax-model
|
2015-12-02 09:28:01 +08:00 |
lizanle
|
35b543cd22
|
论坛发帖 采用ajax提交。这样子网络不好的情况就不会丢失数据了。
|
2015-12-01 17:23:14 +08:00 |
huang
|
9d970036f6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-30 17:21:38 +08:00 |
huang
|
aa19f5f8d5
|
Merge branch 'gitlab_guange' into develop
Conflicts:
app/views/layouts/base_courses.html.erb
处理冲突
|
2015-11-30 15:43:05 +08:00 |
huang
|
582a7c47a4
|
修改英雄版为0显示的问题
|
2015-11-30 15:42:00 +08:00 |
lizanle
|
7eb5d2a8fa
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-30 14:59:59 +08:00 |