Commit Graph

443 Commits

Author SHA1 Message Date
cxt 43331b526c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_bigdata 2017-03-20 09:33:50 +08:00
daiao d562864835 搜索报500 2017-03-16 10:15:31 +08:00
cxt c4d9f3c67c Merge branch 'develop' into dev_bigdata
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-15 15:28:56 +08:00
daiao c84383b357 导航栏搜索页面样式调整 2017-03-02 10:38:32 +08:00
daiao 212fbc4e27 顶部导航搜索的项目,显示不正常 2017-03-02 09:42:35 +08:00
huang a7efa67343 样式调整 2017-01-25 10:47:45 +08:00
huang 9dc6b6a5ce 样式修改 2017-01-25 10:31:44 +08:00
huang a9429a81ef 样式调整 2017-01-24 10:46:41 +08:00
huang 2009520c7a 首页改版 2017-01-23 15:44:09 +08:00
yuanke 068a66ac35 搜索修改 2016-10-13 09:42:53 +08:00
yuanke b94553edcd 搜索修改及代码优化 2016-10-10 09:38:21 +08:00
yuanke 9ca685ea94 搜索课程 2016-10-09 16:10:33 +08:00
yuanke c4de8cf948 调试 2016-10-09 16:00:41 +08:00
yuanke 85e0a1df67 搜索课程 2016-10-09 15:20:52 +08:00
yuanke fdcb13a3de 搜索 2016-10-09 13:57:27 +08:00
yuanke 11edc93c0f 搜索课程 2016-10-09 13:48:38 +08:00
yuanke c90d8d6bea 搜索课程 2016-10-09 13:32:31 +08:00
yuanke cd34388909 搜索课程 2016-10-09 11:01:52 +08:00
yuanke d407b5ab10 搜索中加入课程 2016-10-09 10:35:43 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course
Conflicts:
	db/schema.rb
2016-07-05 16:49:50 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
daiao ad3626d53a 将搜索页面:“登陆”改为“登录” 2016-06-27 15:36:31 +08:00
alan 0998ca3974 Merge branch 'develop' into FX-alan-search-404 2016-03-14 10:25:39 +08:00
alan ce6d63ccaf 重构user.find 2016-03-14 10:24:50 +08:00
alan 1f5c90185a 修复《顶部搜索“分析”报404错误》 2016-03-11 13:14:32 +08:00
linchun b7f4b584f2 完成管理员界面课程资源列表 2016-03-07 16:46:02 +08:00
huang faf1fcaf22 issue回复局部刷新
附件浏览问题
昵称改成登录名
2016-01-22 17:27:21 +08:00
lizanle 9aebafee09 课程添加更新时间 2015-12-14 11:11:09 +08:00
lizanle f6867068f5 项目 帖子 更新时间
资源 下载次数
用户 最后登陆时间
2015-12-14 10:27:30 +08:00
lizanle 9b86ec3044 更新时间 2015-12-14 10:07:55 +08:00
lizanle ef2ef7111c 添加对帖子的全文搜索 2015-12-07 14:31:05 +08:00
lizanle 62399b6d72 资源课程搜索结果添加 标签 2015-11-30 11:21:21 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
sw 87ee2e744f 公共贴吧、课程、项目相关界面导航栏和底部导航栏修改 2015-08-25 15:09:02 +08:00
sw 81c942a792 整理代码 2015-07-27 15:06:00 +08:00
huang ad43c76ce7 修改项目首页可配置
包括图片大小、描述
2015-07-24 10:21:52 +08:00
sw 66eba14dfe 课程首页加入课程样式
课程首页    公开资源-->资源
2015-06-26 14:46:37 +08:00
sw e1d6891895 课程默认logo 2015-06-25 16:13:42 +08:00
yutao 21ff990c65 bug#2812:forge主页、course主页搜索建议做成下拉按钮的样式 2015-06-15 11:18:44 +08:00
yutao 2e7c6c4afb 修复bug#2725 :用户搜索--默认用户名和姓名一起匹配 2015-06-05 11:39:55 +08:00
sw b2cdcf4bbe 课程首页缓存 2015-06-03 10:57:51 +08:00
sw 84a79ac8e2 去掉课程、项目首页缓存 2015-06-03 10:53:08 +08:00
guange e786873061 还是缓存问题 2015-06-01 13:58:37 +08:00
guange 7bbd85f8c2 去除首页贴吧回复缓存 2015-06-01 13:50:06 +08:00
sw 8dd6bb4afa 课程首页公开资料数显示错误 2015-05-29 18:11:31 +08:00
alan a76b345495 课程首页优化
Signed-off-by: alan <547533434@qq.com>
2015-05-29 11:40:12 +08:00
alan 6835fb29cd Signed-off-by: alan <547533434@qq.com> 2015-05-29 10:34:04 +08:00
alan f47d30f22a 项目首页缓存设置
Signed-off-by: alan <547533434@qq.com>
2015-05-28 15:14:38 +08:00
yutao 5cb9cc0903 修复bug#2211:course主页--还有空间显示课程老师的姓名就不要以省略号结束 2015-05-19 10:35:17 +08:00
alanlong9278 336b59f606 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
	.gitignore
	Gemfile
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/tags/_tag_name.html.erb

Signed-off-by: alanlong9278 <547533434@qq.com>
2015-05-08 09:15:50 +08:00