Commit Graph

26 Commits

Author SHA1 Message Date
xianbo ca0f63a817 del the link of .head portrait 2013-11-01 15:48:23 +08:00
huangjingquan 00cef03049 修改了个人主页里关注需求全部需求改成只关注的需求 2013-10-12 16:23:25 +08:00
huangjingquan c49209cbfb 将课程和作业分开
作业单独一个tabs
2013-10-11 20:25:24 +08:00
baiyu 13a2cfe644 修改了fork页面,增加了教师超链接 2013-10-10 23:02:15 +08:00
xianbo 633104b493 modify some bug about course and add db migrate 2013-09-24 12:15:24 +08:00
xianbo 806fae7b19 Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
Conflicts:
	app/controllers/account_controller.rb
	app/controllers/my_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/users_controller.rb
	app/helpers/projects_helper.rb
	app/helpers/users_helper.rb
	app/models/project.rb
	app/models/user.rb
	app/models/user_extensions.rb
	app/views/account/register.html.erb
	app/views/bids/_bid_show.html.erb
	app/views/bids/_history.html.erb
	app/views/bids/_project_list.html.erb
	app/views/bids/show.html.erb
	app/views/files/index.html.erb
	app/views/layouts/base_bids.html.erb
	app/views/layouts/base_users.html.erb
	app/views/my/account.html.erb
	app/views/users/watch_bids.html.erb
	config/locales/en.yml
	config/locales/zh.yml
	config/routes.rb
	db/schema.rb
	lib/redmine.rb
	public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
huangjingquan 278cb57ab9 修改了项目里面一些bug 2013-09-23 13:35:29 +08:00
huangjingquan 466922d13b 修改了上次会议提出的几点 2013-09-16 08:49:39 +08:00
kaizheng 4684217097 解决英文页面项目列表中提交时间分行的问题,以及修复缺失的国际化 2013-09-12 21:09:44 +08:00
huangjingquan 261c3fc337 new version 2013-09-12 10:41:15 +08:00
huangjingquan faef617a45 tabs显示
图像链接
2013-08-30 22:09:23 +08:00
huangjingquan 47185bdcc2 修改用户 -用户反馈显示异常 2013-08-30 16:07:51 +08:00
zhangyang 4d82cad51d move 2013.8.29 2013-08-30 09:34:21 +08:00
baiyu a04528116c 1、回复框
2、主页字体及位置调整
2013-08-28 21:15:54 +08:00
kaizheng 0d447cae2c 活动显示分类国际化,需求反馈图标引用、删除国际化,留言图标引用、删除国际化 2013-08-27 16:17:52 +08:00
fanqiang cd41653747 修改关注需求的显示 2013-08-26 11:07:17 +08:00
kaizheng 69119f73fe 国际化修改 2013-08-19 20:09:43 +08:00
huangjingquan af10ae8306 修改所有无活动、项目、反馈时显示的字体 2013-08-15 10:13:47 +08:00
kaizheng 53c6a981e9 稍该国际化 2013-08-13 10:45:01 +08:00
fanqiang a9cfeb6a9a 修改用户主页中没内容显示时的页面 2013-08-13 00:02:12 +08:00
huangjingquan 5e4bd75335 user页面修改“需求页面” 2013-08-12 22:10:12 +08:00
huangjingquan b0c813df69 将所有的刘表横线改成下划线 2013-08-12 16:17:03 +08:00
fanqiang 69e3dcee6c 修改用户活动,用户主页的其他部分添加分页 2013-08-12 15:37:42 +08:00
kaizheng b8a3d3f673 把现有需求国际化 2013-08-09 11:24:42 +08:00
fanqiang bb5052cf30 修改了用户活动,可以查看关注好友的活动,并且将需求加入到活动中
修复了一些需求中的BUG
2013-08-05 22:47:01 +08:00
fanqiang a97935a8ac 添加了用户主页中的关注需求界面,url为users/:id/watch_bids 2013-08-02 08:53:07 +08:00