 huang
|
6ec7769c0e
|
Merge branch 'dev_bigdata' into dev_shixun_project
Conflicts:
app/controllers/account_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/_logined_header.html.erb
app/views/layouts/base_contest_community.html.erb
app/views/layouts/base_contests.html.erb
app/views/layouts/base_course_community.html.erb
app/views/layouts/base_courses.html.erb
app/views/layouts/base_project_community.html.erb
app/views/layouts/base_syllabus.html.erb
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/layouts/new_base_user_show.html.erb
public/stylesheets/css/structure.css
|
2017-03-14 09:30:02 +08:00 |
 Linda
|
7451838509
|
syllablus.css和sy.public.css简化转移到 css文件夹；修改页面中引用这两个样式的路径
|
2017-02-21 14:51:48 +08:00 |
|
huang
|
de41150f26
|
新版一些改动
|
2017-01-23 18:34:33 +08:00 |
 daiao
|
96dfa4281d
|
修复：强制修改页面，左侧编辑个人资料可用
|
2016-09-09 15:03:46 +08:00 |
|
daiao
|
3dc0e8407a
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/views/organizations/_org_member_list.html.erb
app/views/organizations/setting.html.erb
app/views/users/_project_news.html.erb
|
2016-09-05 13:47:39 +08:00 |
|
daiao
|
9a3603c778
|
1.基本资料页面，身份为从业者时，直接点确定报提示问题
2.强制修改基本资料，修改资料按键错误
|
2016-09-02 16:11:14 +08:00 |
 cxt
|
aaefd8b4aa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
2016-09-02 15:24:55 +08:00 |
|
huang
|
2df6047b03
|
隐藏项目信息之 新用户注册但是未完善资料页面修改
|
2016-08-31 15:14:55 +08:00 |
|
cxt
|
a8575f2a15
|
暂时隐藏个人名片
|
2016-08-31 14:08:19 +08:00 |
|
daiao
|
a466fdd64e
|
强制修改基本资料：申请单位点击确定后，进入主页面；提问按钮不可用
|
2016-08-25 15:29:04 +08:00 |
|
daiao
|
4a9967674a
|
1. 强制编辑基本资料，在删除单位时给出消息通知
2. 单位名称申请提示一直显示
3. 申请单位的消息通知显示申请人头像，并连接到申请人主页
|
2016-08-13 14:29:33 +08:00 |