Commit Graph

389 Commits

Author SHA1 Message Date
ganyiang 786481e144 新建问题-主题-autocomplete-选中跳转 2014-05-07 20:30:42 +08:00
yanxd 8770599352 css typo 2014-05-07 10:58:49 +08:00
yanxd eb19b0cb1f welcome css改标点错误 2014-05-06 17:14:36 +08:00
yanxd 05baffe4f3 issue导航,首页贴吧动态html,加入了最后回复 2014-05-06 17:04:24 +08:00
wanglinchun 0634f36c10 "打分后不要显示英文,而且还要提示:您可以重新打分"问题解决 2014-05-05 09:00:10 +08:00
Wen c893227609 个人资料页面学校选择框更改 2014-04-30 17:47:20 +08:00
yanxd 0cfd5929d8 Revert "tag todo"
eee

This reverts commit 08b27f38a7.
2014-04-30 00:35:50 +08:00
Wen 50745d5d21 course首页布局上的小调整 2014-04-29 09:49:51 +08:00
Wen 815e7cf3af 个人资料修改页面 限制了学校列表的高度并添加了滚动条 2014-04-28 16:20:55 +08:00
Wen 10fdcbb050 一个简单的后台上传学校logo的页面. 2014-04-28 16:13:37 +08:00
Wen a8e029da58 数据库迁移:更改了默认的学校logo 2014-04-28 09:44:40 +08:00
yanxd 939e4cc100 footer 下方距离
welcome调整下主页
2014-04-26 09:03:25 +08:00
Wen ba80593ab0 别忘了改数据库!= = 2014-04-25 10:42:57 +08:00
Wen 02295e5ca9 给严总调试用 2014-04-25 09:40:05 +08:00
yanxd 08b27f38a7 tag todo 2014-04-24 20:41:45 +08:00
Wen 6a2626c90e Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-04-23 21:41:02 +08:00
Wen 473a44d11a 学校-课程模式! 2014-04-23 21:20:03 +08:00
wanglinchun 9af6c03547 Merge branch 'competition' into develop
Conflicts:
	Gemfile.lock
	app/views/layouts/_base_footer.html.erb
2014-04-23 17:18:53 +08:00
yanxd e2a5e2f730 footer 2014-04-23 16:37:19 +08:00
yanxd 60bc3bb1b2 seem_rateable to lib, using Engine setting routes 2014-04-23 08:51:46 +08:00
wanglinchun 05c0d2a5ac 替换竞赛模块首页中竞赛和应用的图标并调整相应的格式 2014-04-22 19:27:31 +08:00
yanxd b4209b7cc5 jrating 2014-04-21 15:41:51 +08:00
yanxd 8775eab3dd iscas modify 2014-04-19 12:47:59 +08:00
yanxd 83f039a014 modify pku.png 2014-04-19 11:22:33 +08:00
yanxd a4ab29f49d footer logo modify 2014-04-19 11:04:44 +08:00
kg 158c950b78 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-04-18 17:57:58 +08:00
kg bdefa322cc modify foot 2014-04-18 17:57:11 +08:00
wanglinchun 76ccfe8ac4 fix 2014-04-18 16:35:48 +08:00
wanglinchun 9ac0cbe6a3 Merge branch 'competition' into develop
Conflicts:
	Gemfile
	app/controllers/tags_controller.rb
	app/views/layouts/_base_header.html.erb
	config/routes.rb
	db/schema.rb
2014-04-18 16:03:52 +08:00
wanglinchun 8f6d9fc6a5 0418 2014-04-18 10:46:29 +08:00
kg d450da9df8 footer , footer of base_course,upload files count and delete all upload 2014-04-17 08:33:44 +08:00
kg 3f096f9167 add pdl logo 2014-04-16 22:15:32 +08:00
kg 69dbd5a85e add logos and modify footer;footer position problem of some projects and courses 2014-04-16 22:15:31 +08:00
wanglinchun 1a6a20e761 竞赛模块首页布局和显示效果调整好 2014-04-16 20:23:38 +08:00
yanxd 6f5fcd0dee 测试作业下载 2014-04-16 10:44:06 +08:00
wanglinchun 6421f02ac8 调整了参赛应用列表布局显示样式 2014-04-16 08:46:04 +08:00
yanxd 28bebb1ee7 add Gem
zip
root path firefox bug
2014-04-15 21:15:10 +08:00
Wen 44560a679f 工作单位更改为下拉框选择
级联问题解决中 0.0
2014-04-15 09:36:29 +08:00
wanglinchun b4b61a3422 修改小bug;设计打分和评论唯一性前提交版 2014-04-14 21:54:54 +08:00
yanxd a5743cd987 button加作用域 2014-04-09 17:23:56 +08:00
yanxd 2a62bc822a 修改ajax提交过程中,等待indicator被覆盖的问题 2014-04-09 15:33:21 +08:00
wanglinchun dfad0448e1 单个应用显示页面 2014-04-09 11:14:54 +08:00
yanxd 1b6cdeac05 列表上提交作业,大概好了吧 2014-04-09 11:06:13 +08:00
yanxd 3fad5abb5c modal init 2014-04-08 16:56:53 +08:00
yanxd 045b55236f 作业提交临时解决方案 2014-04-08 14:53:11 +08:00
wanglinchun a9e9171441 通过脚手架新建了一套应用的东西,包括数据库的相应表,新建了发布应用的页面,上传图片功能未实现,界面格式还需调整 2014-04-04 17:54:20 +08:00
yanxd 84c5032eb2 整理下,加个推荐tag 2014-03-31 15:36:51 +08:00
yanxd ad23ba646e 理理css 2014-03-28 18:12:46 +08:00
yanxd 35d1c33a29 ... 2014-03-27 10:53:45 +08:00
yanxd dba674dfec 首页调整 2014-03-26 08:24:12 +08:00
yanxd 937d594c41 首页字体 2014-03-25 21:12:04 +08:00
yanxd a8d1608603 nil 2014-03-25 14:40:47 +08:00
wanglinchun 8d2bbfe320 调整首页主题部分字体格式 2014-03-24 21:36:10 +08:00
wanglinchun 83b97ef71d 调整主页中主体部分字体为粗体 2014-03-24 21:23:51 +08:00
wanglinchun 1fabad8c2f 修改项目托管主页和课程实践主页主题句 2014-03-24 16:27:18 +08:00
yanxd b5215e95e0 store table用div重构 2014-03-14 17:39:16 +08:00
yanxd 6cbd0f874c store table用div重构 2014-03-14 17:29:45 +08:00
yanxd 592d704a6d 主页 文件上传bug 2014-03-12 17:09:26 +08:00
yanxd 0b385cdbbb 毛的资源库关联文件 2014-03-06 16:47:28 +08:00
yanxd 21e55492fa 小改怡情 大改伤身 强改灰飞烟灭 2014-03-01 10:14:01 +08:00
yanxd 2ca1362e83 “按用户搜索”和“搜索”的区别,分别可以搜索什么? 上面搜索删掉
1、标签的格式需 要优化(所有涉及到标签的地方的标签的格式都需要调整) tag周围距离
“课程通知“应该调整到“课程作业”后面  改!
2014-02-25 15:43:03 +08:00
yanxd 7deeab62bc course.trustie.net 2014-02-24 10:40:45 +08:00
yanxd cf2689917b 三天两头反复改 不如自挂东南枝 2014-02-22 09:47:59 +08:00
Wen 2aa6a14289 回复按钮的位置调整 2014-01-24 19:38:46 +08:00
Wen 12314de130 Redo 2014-01-24 19:25:25 +08:00
yanxd e7dab11250 wc modify 2014-01-24 18:58:04 +08:00
nieguanghui a850cc8a04 修复侧边栏bug 2014-01-24 15:45:13 +08:00
yanxd f96428ef20 fix word break bug 2014-01-24 15:35:36 +08:00
yanxd f549645dce 字符超出边界问题, 新建课程404问题 2014-01-24 15:33:01 +08:00
nieguanghui c26cb56193 主页调整 2014-01-24 15:01:15 +08:00
yanxd 0ed2e19268 项目列表 2014-01-24 10:55:25 +08:00
yanxd 710adb8fed Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-01-23 21:55:48 +08:00
yanxd eb7e2539b8 留言问题 2014-01-23 21:55:39 +08:00
Wen ed922dd192 删除了引用、删除之前的图标 2014-01-23 16:19:17 +08:00
Wen c231f3bd35 项目和课程的讨论区界面中,引用、编辑、删除均改为文字,且放置在楼层数旁边;
回复数量距离铸铁增加了四行的距离;
发表人及时间位置更改为主贴左下角,右下角改为“回复”
2014-01-23 15:13:38 +08:00
wanglinchun b621d15aaf 1485 2014-01-21 17:16:16 +08:00
wanglinchun f0132a0f5f 在“课程实践->讨论区”为匿名用户不能进行评论添加登陆的提示以及登陆的链接
在“课程实践->留言”中的用户反馈改为用户留言
将“课程实践”中讨论区、资源库、课程通知和留言中提示语格式进行统一
2014-01-21 17:02:33 +08:00
yanxd d202c84b44 导航条下拉菜单. [Version] alpha v0.1 2014-01-20 20:25:27 +08:00
yanxd 0d9453080c bug 2014-01-18 10:52:05 +08:00
yanxd 099fffab51 Merge branch 'bigchange' into develop 2014-01-17 08:23:15 +08:00
yanxd 951666a1ed Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-01-16 21:15:24 +08:00
yanxd 0e3dcf88ff conflict 2014-01-16 15:52:48 +08:00
yanxd bacddf00d9 logo 2014-01-16 15:46:09 +08:00
yanxd 52cffd3864 icon 2014-01-16 11:04:11 +08:00
baiyu 13fdbde1cf 个人分数 2014-01-16 10:34:39 +08:00
nieguanghui 346e9574ca Merge branch 'bigchange' of 10.0.47.245:/home/trustie2 into bigchange 2014-01-16 10:17:51 +08:00
nieguanghui 18b4a3ff5c changge 2014-01-16 10:17:43 +08:00
yanxd 00022ce9fe icon search controller 2014-01-16 09:47:50 +08:00
nieguanghui 8d788fac45 modified 2014-01-15 20:38:58 +08:00
yanxd 7ee1b06462 change image 2014-01-15 19:33:36 +08:00
yanxd a5c9d9c31e um... 2014-01-15 17:28:53 +08:00
yanxd 3d2c0ba721 add activityBox to project/course/contest html 2014-01-13 08:23:35 +08:00
yanxd 289b0581df stores css 2014-01-11 09:08:15 +08:00
yanxd 16c4b0e18c board#new css 2014-01-09 09:15:58 +08:00
yanxd b9967074dc 新闻界面修改,new页面bug修复 2014-01-08 20:18:32 +08:00
wanglinchun 4be4fa5e9a welome css 2014-01-03 22:23:46 +08:00
wanglinchun 97749cfd8e Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-01-03 21:44:25 +08:00
wanglinchun 4167e8bb8f 修改了门户网站中用户动态的[进入附件列表]显示颜色 2014-01-03 21:36:47 +08:00
yanxd 4587c840b1 a 2014-01-03 21:33:01 +08:00
yanxd 4c0acc5f3e welcome css 2014-01-03 21:02:30 +08:00