Commit Graph

82 Commits

Author SHA1 Message Date
yanxd 7c4e62cc40 add time describe 2013-11-07 17:21:32 +08:00
xianbo 607eb2c2ff modify shoew of project 2013-11-07 17:04:37 +08:00
xianbo c7b38e5bf2 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
	app/views/news/index.html.erb
2013-11-01 15:53:38 +08:00
xianbo ca0f63a817 del the link of .head portrait 2013-11-01 15:48:23 +08:00
yanxd b55c5d20a3 added activity info from event, warning. 2013-10-31 20:13:49 +08:00
yanxd 369e5eccc0 member_list ,group by roles in course#show 2013-10-31 16:52:06 +08:00
yanxd 5d0b5812b3 share completed with fq, xianbo 2013-10-21 08:57:55 +08:00
yanxd e2447b4c88 truncate textilizable 2013-10-18 10:00:06 +08:00
yanxd 332bc0765d 240 characters or less limited in activity info. ===> projects#show 2013-10-16 21:10:30 +08:00
baiyu 2a9cb28c4e 1、修改了国际化
2、增加了课程“年度”“学期”
3、主讲教师显示bug
2013-09-30 11:02:04 +08:00
fanqiang 9fbccfbb6d 改了一些问题
创建课程问题
添加了需求的FORK功能
2013-09-28 23:08:24 +08:00
william 61e4021625 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
	app/controllers/bids_controller.rb
	app/views/bids/_history.html.erb
	app/views/bids/_project_list.html.erb
	app/views/bids/show.html.erb
	config/locales/zh.yml
	config/routes.rb
	lib/redmine.rb
2013-09-24 09:52:08 +08:00
william 7d919fd3c3 Merge branch 'liuping' into develop
Conflicts:
	app/helpers/bids_helper.rb
	app/views/bids/_project_list.html.erb
	app/views/bids/show.html.erb
	config/locales/zh.yml
	db/schema.rb
2013-09-24 09:14:21 +08:00
william dcbaf1c02b 增加需求结束方法。 2013-09-23 20:12:32 +08:00
huangjingquan 261c3fc337 new version 2013-09-12 10:41:15 +08:00
Administrator 07b0409c57 delete UTC 2013-09-02 21:40:48 +08:00
Administrator f0791fe132 modify created project info as a fist activity 2013-09-02 21:32:15 +08:00
zhangyang 4d82cad51d move 2013.8.29 2013-08-30 09:34:21 +08:00
baiyu 3e711de070 修改国际化 2013-08-22 22:07:31 +08:00
nieguanghui 71d6dc6d21 增加用户活动评论数显示 2013-08-20 15:12:49 +08:00
nieguanghui 0f841abbd0 增加活动列表评论数显示 2013-08-19 20:53:19 +08:00
huangjingquan 0a3999b138 无动态时字体显示 2013-08-15 10:31:22 +08:00
nieguanghui 4077a91429 修正未登录用户界面显示bug;删除了部分多余注释 2013-08-13 20:39:47 +08:00
kaizheng 53c6a981e9 稍该国际化 2013-08-13 10:45:01 +08:00
huangjingquan 63a1c21b3d 项目里面无活动显示 2013-08-12 23:29:03 +08:00
huangjingquan 12090cdd80 修改 project-活动里面》》改成竖线 2013-08-12 20:51:21 +08:00
kaizheng db1815ba1a 主页国际化 2013-08-10 16:09:07 +08:00
zhangyang de7665049e 修改了“退出”返回页面设置;项目文档页面添加显示选择 2013-08-06 20:55:34 +08:00
zhangyang bb461cd244 添加了项目活动的分页 2013-08-06 16:44:43 +08:00
huangjingquan 19f351ef9c 添加了注释 2013-08-04 14:23:12 +08:00
huangjingquan 408a626ddd 修改了个人主页项目里面的链接
user和project界面
以及主页
2013-08-03 22:22:17 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00