jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
470 Commits 98 Branches 0 Tags 0 B
Commit Graph

82 Commits

Author SHA1 Message Date
huangjingquan cab5fb8b52 新的 2013-10-07 22:23:42 +08:00
nieguanghui 606c998247 修改课程列表显示内容，修复作业列表显示bug 2013-10-07 18:55:19 +08:00
baiyu 56e5e55589 修改了fork里的格式及若干国际化 
修改了给项目留言回复的权限
隐藏了作业列表的“发布作业”
 2013-10-02 21:47:18 +08:00
baiyu 64f36f2c9d 修改了一些BUG 2013-09-30 17:27:58 +08:00
baiyu 2a9cb28c4e 1、修改了国际化 
2、增加了课程“年度”“学期”
3、主讲教师显示bug
 2013-09-30 11:02:04 +08:00
huangjingquan 9c0b68460a 修改课程与企业样式 2013-09-30 09:42:13 +08:00
huangjingquan b19ed67d79 新的课程 
修改了一些bug
 2013-09-29 19:46:59 +08:00
fanqiang 9fbccfbb6d 改了一些问题 
创建课程问题
添加了需求的FORK功能
 2013-09-28 23:08:24 +08:00
baiyu aed36229f8 修改了issues里“顶”和“踩”图标的位置 2013-09-28 16:03:23 +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
xianbo 8ff8d0f4d4 modify some little bug && merge handle 2013-09-23 21:47:07 +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
william dcbaf1c02b 增加需求结束方法。 2013-09-23 20:12:32 +08:00
baiyu 4fb040bc61 modify register bug 2013-09-23 16:42:19 +08:00
huangjingquan 5dbef9e2c5 修改了日历和版本库bug 2013-09-23 15:12:06 +08:00
huangjingquan 3536883248 课程合并 2013-09-23 08:44:48 +08:00
nieguanghui 45178e178f fix the projects's present bug 2013-09-16 21:47:46 +08:00
fanqiang 9d2ea5639f 添加自动生成课程标识功能 2013-09-16 08:58:53 +08:00
huangjingquan 466922d13b 修改了上次会议提出的几点 2013-09-16 08:49:39 +08:00
fanqiang 671b81035c 修改课程部分的权限设置，并且修改了作业的侧边栏显示 2013-09-15 16:49:19 +08:00
huangjingquan 11370329dd 修改了部分功能 2013-09-14 17:25:57 +08:00
huangjingquan 3a6f055159 solve some little problem 2013-09-13 22:25:40 +08:00
fanqiang 805ad6600b 添加了提交作业 2013-09-13 21:52:24 +08:00
huangjingquan 9221d1b376 dfh 2013-09-13 21:29:58 +08:00
huangjingquan 767231c202 fg 2013-09-13 16:36:36 +08:00
huangjingquan 7aa5eef2e4 fds 2013-09-12 17:25:40 +08:00
fanqiang 602e3dc3fa 修改个人主页 2013-09-12 17:19:51 +08:00
huangjingquan 261c3fc337 new version 2013-09-12 10:41:15 +08:00
baiyu a2cc191a4e 1、增加“我的账号”里的了工作单位 
2、增加了“注册”里的“身份”
 2013-09-12 08:38:47 +08:00
kaizheng 4dfffabb67 用户列表，需求列表，项目列表，用户粉丝列表，欢迎页面等英文页面解决单复数问题 2013-09-11 20:54:01 +08:00
nieguanghui 68145ef5f7 优化排序显示，修改搜索页面显示 2013-09-10 21:02:29 +08:00
xianbo 1e7d127998 new course table 2013-09-06 16:39:38 +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
huangjingquan c4df893eab 修改了tabs页面，字体大小 2013-09-02 12:49:17 +08:00
huangjingquan faef617a45 tabs显示 
图像链接
 2013-08-30 22:09:23 +08:00
zhangyang 4d82cad51d move 2013.8.29 2013-08-30 09:34:21 +08:00
fanqiang 0e0ddba493 留言 2013-08-29 21:56:20 +08:00
fanqiang 0e2121b956 添加项目反馈中的回复功能 2013-08-28 21:10:42 +08:00
nieguanghui fa27d3bf32 增加项目和用户的排序功能 2013-08-28 09:34:54 +08:00
huangjingquan 92dfea34ad 增加项目关注人列表 2013-08-27 09:09:34 +08:00
xianbo 89150e8930 modify some little bug 2013-08-24 16:32:05 +08:00
Administrator 1b43ce386c modify 2013-08-22 22:30:24 +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
william d62ad9e863 给tag search结果添加了分页。 2013-08-19 17:28:59 +08:00
baiyu 2e0502c28e 修改项目留言的显示问题 2013-08-17 10:27:38 +08:00
baiyu e7716912b5 增加了git使用说明文档 
在主页增加了用户对系统的反馈
 2013-08-16 22:53:28 +08:00