xianbo
|
21ffbe637e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/projects/_project.html.erb
app/views/projects/member.html.erb
app/views/users/index.html.erb
config/locales/zh.yml
db/schema.rb
files/2013/10/131007102834__my_course.html.erb
|
2013-10-24 08:33:07 +08:00 |
|
xianbo
|
2589d429b0
|
add the project what one watch
|
2013-10-24 08:24:56 +08:00 |
yanxd
|
4bef2eee24
|
course can be shared files by project's member
|
2013-10-22 09:02:48 +08:00 |
|
xianbo
|
5a1bb0f2d4
|
fix bug in arrange to net
|
2013-10-21 11:21:07 +08:00 |
 nieguanghui
|
b04fe3d1bb
|
增加项目评分 个人评分 ，个人在项目中的评分机制
|
2013-10-21 09:42:09 +08:00 |
|
yanxd
|
5d0b5812b3
|
share completed with fq, xianbo
|
2013-10-21 08:57:55 +08:00 |
baiyu
|
ecdeaf123e
|
修改了部分国际化
|
2013-10-19 15:39:53 +08:00 |
 baiyu
|
0206d3f2c3
|
需求里面添加了用户和项目与需求的联系
|
2013-10-19 09:35:14 +08:00 |
|
baiyu
|
9fa9aa0fb8
|
“返回课程”“返回主页”按钮变色。改边距，边框变圆润
|
2013-10-17 16:22:26 +08:00 |
|
xianbo
|
520c5843ce
|
modify homework show and the link of style
|
2013-10-16 17:02:38 +08:00 |
 huangjingquan
|
29e2a4c70b
|
修改了作业提交时学号显示错误
作业页面增加了内容
|
2013-10-16 10:53:11 +08:00 |
|
huangjingquan
|
41a74a5254
|
提示信息国际化
|
2013-10-16 09:20:37 +08:00 |
|
xianbo
|
5a234e6fb2
|
add the link of project contributers&&followers count number
|
2013-10-15 17:11:10 +08:00 |
|
huangjingquan
|
8082bb456f
|
为竞赛添加新的页面
|
2013-10-12 10:45:48 +08:00 |
|
xianbo
|
d7f7ff5fa9
|
delete homework
|
2013-10-12 10:05:30 +08:00 |
|
huangjingquan
|
c49209cbfb
|
将课程和作业分开
作业单独一个tabs
|
2013-10-11 20:25:24 +08:00 |
|
baiyu
|
13a2cfe644
|
修改了fork页面，增加了教师超链接
|
2013-10-10 23:02:15 +08:00 |
|
huangjingquan
|
0a5013edd1
|
修改了作业界面显示
修改了发布作业的时候在个人动态里面显示做（之前显示需求）
|
2013-10-10 22:36:35 +08:00 |
 wanglinchun
|
48a0f2f409
|
个人主页，课程相关国际化
|
2013-10-10 17:07:43 +08:00 |
|
xianbo
|
928dedae65
|
move to new database
|
2013-10-10 15:48:00 +08:00 |
|
huangjingquan
|
bf081b95bd
|
学生自己的主页课程里面添加加入课程链接
竞赛里面 修复列表排序bug
新建竞赛的时候 修复了几个bug
|
2013-10-09 17:27:42 +08:00 |
|
baiyu
|
39c45dff30
|
1、修改了注册里的问题
2、作业名称改为靠左
3、修改了提交作业、参加竞赛等混乱
4、修改了top bar的字体大小
|
2013-10-09 16:41:02 +08:00 |
|
huangjingquan
|
9e77d3e001
|
修改了作业课程里面一些Bug
|
2013-10-09 16:14:11 +08:00 |
|
baiyu
|
aefd9b545b
|
1、删除了“企业”里的“课程”
2、减小了顶和踩的图标
3、更改了课程图标
|
2013-10-08 22:15:50 +08:00 |
|
huangjingquan
|
2c45fb8760
|
竞赛
|
2013-10-08 22:12:17 +08:00 |
 fanqiang
|
8e51ea7327
|
修改了企业注册与修改企业资料过程，以及一些企业主页中的显示细节
|
2013-10-08 16:31:28 +08:00 |
|
baiyu
|
e5d06702c4
|
修改了新建“需求”的提示
修改了课程图标
|
2013-10-07 22:31:28 +08:00 |
|
huangjingquan
|
cab5fb8b52
|
新的
|
2013-10-07 22:23:42 +08:00 |
|
nieguanghui
|
606c998247
|
修改课程列表显示内容，修复作业列表显示bug
|
2013-10-07 18:55:19 +08:00 |
|
fanqiang
|
bf6fe70ec9
|
修改了作业的fork界面显示提示内容
|
2013-10-07 11:02:23 +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 |
|
baiyu
|
aed36229f8
|
修改了issues里“顶”和“踩”图标的位置
|
2013-09-28 16:03:23 +08:00 |
|
xianbo
|
a88cb3ad2b
|
fix nature
|
2013-09-28 10:51:28 +08:00 |
 william
|
da82a630e9
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into tmp1
Conflicts:
app/controllers/bids_controller.rb
app/helpers/bids_helper.rb
config/locales/zh.yml
db/schema.rb
|
2013-09-28 10:36:44 +08:00 |
|
william
|
2079c87362
|
增加tag删除。
|
2013-09-27 14:58:51 +08:00 |
|
baiyu
|
6e4e5ec577
|
修改了“顶”和“踩”的图标
|
2013-09-26 21:01:17 +08:00 |
|
fanqiang
|
781fa32dbb
|
添加了需求的fork功能
|
2013-09-26 09:06:29 +08:00 |
|
baiyu
|
436569c88d
|
1、修改了location和identity不能显示的问题
2、修改了学号框样式
|
2013-09-25 17:20:40 +08:00 |
|
xianbo
|
099c916bf5
|
modify setting
|
2013-09-25 08:37:18 +08:00 |
|
xianbo
|
633104b493
|
modify some bug about course and add db migrate
|
2013-09-24 12:15: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 |
|
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 |
|
baiyu
|
a04528116c
|
1、回复框
2、主页字体及位置调整
|
2013-08-28 21:15:54 +08:00 |
|
fanqiang
|
0e2121b956
|
添加项目反馈中的回复功能
|
2013-08-28 21:10:42 +08:00 |
|
kaizheng
|
cce0b299b7
|
修改了路由
|
2013-08-27 22:23:58 +08:00 |
|
kaizheng
|
1510a6466e
|
主页链接，国际化，显示
|
2013-08-27 22:19:07 +08:00 |
|
fanqiang
|
d043a1fb9d
|
登录提示bug
|
2013-08-27 22:15:12 +08:00 |
|
baiyu
|
cd29cd588e
|
修改“如何提交代码”为“查看如何提交代码”
修改导航栏的边角，变圆润
|
2013-08-27 20:43:30 +08:00 |