 cxt
|
151c08ac5c
|
复制学期
|
10 years ago |
 ouyangxuhua
|
806e4caf5a
|
1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。
|
10 years ago |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
10 years ago |
 huang
|
743950d264
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
c3ddbcfddf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
5d2c760a8e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
2e41e9890a
|
将riserved改成reserved
|
10 years ago |
|
huang
|
41cd038758
|
讨论区帖子添加锁定
|
10 years ago |
|
cxt
|
6bdd6d3e03
|
课程添加设置菜单，设置页面的信息更改
|
10 years ago |
|
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
|
10 years ago |
 Tim
|
445d5dc379
|
组织下拉菜单修改
|
10 years ago |
|
huang
|
801651cba6
|
解决组织两个footer冲突问题
|
10 years ago |
|
huang
|
533be61cf7
|
添加底部样式
|
10 years ago |
|
huang
|
5d1b63d6fa
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
7412c1caf6
|
添加footer
|
10 years ago |
|
Tim
|
1a24505eac
|
footer新增图片，样式修改
|
10 years ago |
|
cxt
|
3e39eacd19
|
新建课程通知时通知标题框自动获取焦点
|
10 years ago |
|
cxt
|
61b5cf41d0
|
取消课程首页的开设单位超链接
|
10 years ago |
|
Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
10 years ago |
|
Tim
|
eb7d0761cb
|
组织菜单栏修改成和个人首页相同
|
10 years ago |
|
ouyangxuhua
|
9e0b88c186
|
项目讨论区样式改成方块样式
|
10 years ago |
|
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
 lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
ouyangxuhua
|
ef46191c80
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
lizanle
|
4bc68081ee
|
editor修改
|
10 years ago |
|
cxt
|
90c7822c38
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
72c475e8a2
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
1f4454d908
|
课程左侧的在线测验统计数
|
10 years ago |
|
lizanle
|
88c2db47b7
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
guange
|
d1315e35b5
|
merge
|
10 years ago |
|
ouyangxuhua
|
a5fa68c928
|
资源栏目增加资源
|
10 years ago |
|
cxt
|
85b11010d2
|
在线测验报500、 学生看不到已截止的测验、测验列表的样式调整
|
10 years ago |
|
lizanle
|
f3013ca3e7
|
修改了搜索的提示描述
|
10 years ago |
|
huang
|
5ca8d4cd66
|
修改http链接自动换域名
|
10 years ago |
|
huang
|
670df76c70
|
注释掉项目邀请加入功能
|
10 years ago |
|
huang
|
4f7f4acb1f
|
课程删除
|
10 years ago |
|
ouyangxuhua
|
8b14e7c549
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
huang
|
91fa3f6fab
|
解决项目样式冲突问题
|
10 years ago |
|
ouyangxuhua
|
76db95aa03
|
1.组织页面中，退出后刷新组织页面；
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
|
10 years ago |
|
ouyangxuhua
|
7057a4cfea
|
组织页首增加退出功能
|
10 years ago |
|
ouyangxuhua
|
5034ddb4b6
|
修复组织的bug
|
10 years ago |
|
guange
|
3d2ac4b59f
|
KE引用统一使用import_ke
|
10 years ago |
|
huang
|
bd3d0547f5
|
组织样式修改
|
10 years ago |
|
ouyangxuhua
|
108865968b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
12c57e7e4b
|
将Jquery引入组织首页
|
10 years ago |
|
huang
|
9d68fd7d28
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
37a7abea53
|
组织首页
|
10 years ago |
|
ouyangxuhua
|
01b82e59d8
|
实现组织首页功能
|
10 years ago |
|
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
10 years ago |
