 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 |
 huangjingquan
|
278cb57ab9
|
修改了项目里面一些bug
|
2013-09-23 13:35:29 +08:00 |
 baiyu
|
6ce27271e3
|
修改了身份
增加了职称、学号
|
2013-09-23 09:41:36 +08:00 |
|
huangjingquan
|
3536883248
|
课程合并
|
2013-09-23 08:44:48 +08:00 |
 baiyu
|
1c4f7f99e8
|
一些修订
|
2013-09-22 16:11:39 +08:00 |
|
baiyu
|
c2302dc0c7
|
增加了附件删除功能
修改用户主页中课程与项目之间的关系
用户课程页面中的作业进行了按课程分组
|
2013-09-18 22:56:01 +08:00 |
|
baiyu
|
a7b500f5e7
|
修正了“注册”和“我的账号”的显示格式
|
2013-09-16 21:56:12 +08:00 |
 nieguanghui
|
45178e178f
|
fix the projects's present bug
|
2013-09-16 21:47:46 +08:00 |
|
huangjingquan
|
466922d13b
|
修改了上次会议提出的几点
|
2013-09-16 08:49:39 +08:00 |
|
huangjingquan
|
11370329dd
|
修改了部分功能
|
2013-09-14 17:25:57 +08:00 |
|
baiyu
|
2768c935be
|
1、增加了“我的状态”
|
2013-09-14 17:22:44 +08:00 |
 fanqiang
|
131c5ba31b
|
修改留言功能
|
2013-09-14 08:45:18 +08:00 |
|
baiyu
|
313e66537e
|
增加了“地区”
|
2013-09-13 22:47:14 +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
|
767231c202
|
fg
|
2013-09-13 16:36:36 +08:00 |
|
huangjingquan
|
ffa412d290
|
x
|
2013-09-13 10:11:36 +08:00 |
|
baiyu
|
3ae85e93ad
|
1、修复了丢失的国际化
2、增加了性别
|
2013-09-12 20:19:49 +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
|
7e40999e06
|
1、增加了“注册”里的“身份”
2、增加了“我的账号”里的“工作单位”
|
2013-09-12 09:06:21 +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 |
|
kaizheng
|
7283131688
|
项目配置模块英文显示页面修复
|
2013-09-09 20:31:46 +08:00 |
|
xianbo
|
1e7d127998
|
new course table
|
2013-09-06 16:39:38 +08:00 |
|
xianbo
|
3eecffa6f7
|
fix little bug
|
2013-09-06 09:27:49 +08:00 |
|
huangjingquan
|
ca09583fa5
|
修改了英文关注和粉丝重复显示错误
|
2013-09-03 09:16:40 +08:00 |
|
baiyu
|
e4d726bbfa
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-09-02 22:02:25 +08:00 |
|
huangjingquan
|
f2ead4dae2
|
项目界面sidebar
|
2013-09-02 22:02:47 +08:00 |
|
baiyu
|
f41bf93242
|
修改了国际化。
|
2013-09-02 22:01:51 +08:00 |
|
baiyu
|
f66e57e5b5
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-09-02 22:00:49 +08:00 |
Administrator
|
f0791fe132
|
modify created project info as a fist activity
|
2013-09-02 21:32:15 +08:00 |
|
baiyu
|
5dd8ca1f37
|
1、修改了git的用法
2、修改了国际化
|
2013-09-02 21:06:08 +08:00 |
|
huangjingquan
|
77a47797d2
|
user列表
|
2013-09-02 15:01:20 +08:00 |
|
huangjingquan
|
0aeb56f8f7
|
修改了按钮/用户反馈框显示错误
|
2013-09-02 13:29:46 +08:00 |
|
kaizheng
|
f077fd397b
|
字体修复
|
2013-09-02 13:07:23 +08:00 |
|
baiyu
|
844f1d2dcf
|
修改了不合理的地方
|
2013-08-31 21:45:20 +08:00 |
|
kaizheng
|
3d729df268
|
页面字体统一，登陆框异常排除，部分国际化
|
2013-08-31 17:04:11 +08:00 |
|
baiyu
|
4b43373d7c
|
修改了国际化及部分位置调整
|
2013-08-30 22:07:25 +08:00 |
|
baiyu
|
8be0703b6e
|
修改了国际化
|
2013-08-30 20:03:25 +08:00 |
zhangyang
|
4d82cad51d
|
move 2013.8.29
|
2013-08-30 09:34:21 +08:00 |
|
baiyu
|
006e534ccc
|
修改了国际化
|
2013-08-29 20:45:59 +08:00 |
|
baiyu
|
7918127da6
|
对主页字体进行了修改
框框内图片字体居中
回复框变圆润
|
2013-08-29 20:42:02 +08:00 |
|
baiyu
|
b26fec0749
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
config/locales/zh.yml
|
2013-08-28 21:19:55 +08:00 |