yanxd
|
fea1cdff53
|
首页时间排序,可能会引起其他调用event_datetime的问题。待观察
|
2013-12-27 13:54:57 +08:00 |
nieguanghui
|
e4ae5e56fc
|
delete leave message .
|
2013-12-26 20:22:19 +08:00 |
yanxd
|
8a1316cf8f
|
删除留言操作
|
2013-12-26 19:28:18 +08:00 |
yanxd
|
a01123c5bf
|
d
|
2013-12-26 08:43:16 +08:00 |
yanxd
|
605d7ec565
|
ajax message fix
|
2013-12-26 08:39:43 +08:00 |
yanxd
|
64d85a9ab2
|
一部分ajax留言实现
|
2013-12-25 22:21:16 +08:00 |
yanxd
|
6b3c3516cd
|
去除给留言的回复显示在留言中
|
2013-12-25 16:04:14 +08:00 |
yanxd
|
f05d2131bd
|
组织留言数据方法
|
2013-12-25 15:40:34 +08:00 |
yanxd
|
a53e18dcc5
|
zz
|
2013-12-25 10:09:21 +08:00 |
yanxd
|
ff317e48e9
|
words jourformessage design ing...
|
2013-12-25 09:17:15 +08:00 |
nieguanghui
|
f3ce918699
|
留言修改
|
2013-12-24 16:42:56 +08:00 |
yanxd
|
cda9543849
|
帖子回复数量超过一页,首页动态点击过去无法跳转到相应页面定位,锚点失效
|
2013-12-23 09:28:28 +08:00 |
yanxd
|
99686ec269
|
留言不能是空字符
|
2013-12-21 10:15:41 +08:00 |
yanxd
|
24b14d76e7
|
fix aplication paginate my bug.
|
2013-12-20 21:39:33 +08:00 |
yanxd
|
ca16f01fd7
|
fix global paginate helper in application helper.
|
2013-12-20 11:10:40 +08:00 |
yanxd
|
845937592f
|
4、个人主页的的 动态中要包括留言的信息
|
2013-12-20 11:03:57 +08:00 |
yanxd
|
3f82203735
|
it can be summited project with same name.
|
2013-12-20 09:52:10 +08:00 |
yanxd
|
60be338848
|
作业提交的部分问题
禁止js的情况
修复一些路由错误
ie提交的问题.
|
2013-12-19 15:59:10 +08:00 |
nieguanghui
|
c6f657ed8c
|
重构排序代码
|
2013-12-17 16:59:07 +08:00 |
yanxd
|
4f9686fc57
|
活动不显示留言。
|
2013-12-16 18:38:23 +08:00 |
yanxd
|
5e9bb9a99f
|
删除提示框作业,作业提交的问题。附件提交之后还会存在。
|
2013-12-16 14:39:02 +08:00 |
yanxd
|
f79cc4e597
|
记录帖子查看次数
|
2013-12-15 15:10:29 +08:00 |
yanxd
|
cefddb635a
|
e
|
2013-12-11 22:19:41 +08:00 |
yanxd
|
265e0f246b
|
问题六
|
2013-12-11 10:00:38 +08:00 |
yanxd
|
0bc2b8f2b3
|
项目论坛丢失了的编辑功能
贴吧的置顶锁定功能,目前只针对管理员开放
贴吧列表搜索功能重构
增加1/2帖子显示数目
取出楼主,防止输入帖子id让回复作为主贴显示
首页取新帖子
帖子下载内容随意删除功能
|
2013-12-11 08:52:55 +08:00 |
xianbo
|
0f93065ac4
|
imitate github show help doucument
|
2013-12-10 20:18:21 +08:00 |
yanxd
|
4eeb7c3ea8
|
look at daily log.
|
2013-12-09 18:31:08 +08:00 |
fanqiang
|
85351ee7e3
|
修改留言
|
2013-12-09 08:36:31 +08:00 |
yanxd
|
c86b85cb3d
|
.bug
|
2013-12-07 10:43:31 +08:00 |
yanxd
|
c9c5a18b41
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-07 10:16:59 +08:00 |
yanxd
|
c272783f1c
|
工具栏边距调整,讨论区的修改删除功能,项目竞赛边框顶出页面的问题。
|
2013-12-07 10:15:55 +08:00 |
nieguanghui
|
5b10981754
|
解决项目按时间排序bug
|
2013-12-07 10:10:54 +08:00 |
nieguanghui
|
02b5f2bafa
|
解决项目跑到课程里面的bug
|
2013-12-07 09:47:54 +08:00 |
fanqiang
|
e990a17fdb
|
修改留言功能
1.个人主页留言样式丢失问题
2.对用户留言回复,会同时在该用户主页进行留言
|
2013-12-05 15:50:24 +08:00 |
yanxd
|
28978b88b2
|
首页用户动态加入讨论区内容,点击之后定位到帖子。
|
2013-12-04 15:31:18 +08:00 |
yanxd
|
0609c5c7ea
|
1.增加帖子回复时间查询语句
2.帖子回复的数量在数据库中有字段
3.新建帖子失败错误提示
4.下载里程碑top_menu删掉,
5.学生分页,分页方法封装
|
2013-12-02 17:27:15 +08:00 |
yanxd
|
825b1e7fd7
|
点击tag之后的索引功能.
|
2013-11-30 10:46:32 +08:00 |
yanxd
|
ed13e09875
|
fix any bug.
|
2013-11-30 08:06:52 +08:00 |
yanxd
|
9aa7294f5a
|
forum/memo fix
|
2013-11-29 18:14:49 +08:00 |
yanxd
|
c74c7c44d1
|
默认进入第一讨论区..
|
2013-11-28 18:31:09 +08:00 |
yanxd
|
5d77f2031e
|
主页去除影响性能的代码
|
2013-11-28 16:14:23 +08:00 |
xianbo
|
47a7bcaa31
|
add every user_agent infomation to production.log
|
2013-11-28 09:39:48 +08:00 |
yanxd
|
16c218ccae
|
隐藏搜索栏 and something...
|
2013-11-27 14:52:36 +08:00 |
yanxd
|
5d02d0adc1
|
封装memo
|
2013-11-27 10:16:35 +08:00 |
yanxd
|
ae8e81fd46
|
zh.yml
|
2013-11-26 20:14:06 +08:00 |
yanxd
|
f0b6c33217
|
修改一些删除权限问题
|
2013-11-26 16:55:46 +08:00 |
yanxd
|
16c0bc3ac3
|
memo edit/destory.
|
2013-11-26 16:32:08 +08:00 |
yanxd
|
24a12115b0
|
Merge branch 'forum' of 10.0.47.245:/home/trustie2 into forum
|
2013-11-25 15:06:18 +08:00 |
yanxd
|
8218fde509
|
memo controller.
|
2013-11-25 15:05:42 +08:00 |
fanqiang
|
cb494f460a
|
Merge branch 'forum' of 10.0.47.245:/home/trustie2 into forum
|
2013-11-24 20:46:17 +08:00 |
fanqiang
|
4f00b12016
|
添加了论坛加tag功能
|
2013-11-24 20:45:04 +08:00 |
yanxd
|
bc76ed2f4b
|
Merge remote-tracking branch 'origin/forum' into forum
|
2013-11-24 20:09:39 +08:00 |
yanxd
|
54c6ed72c1
|
memos
|
2013-11-24 20:09:24 +08:00 |
fanqiang
|
d77fed5d34
|
不好说啊,赶紧结束吧~~~~~~~~~~~~~
|
2013-11-24 20:02:53 +08:00 |
yanxd
|
c6f4dbbafa
|
10%
|
2013-11-23 21:13:59 +08:00 |
fanqiang
|
6e1913d00d
|
修改新建topic界面
|
2013-11-23 20:56:22 +08:00 |
fanqiang
|
17cb97828d
|
修改forum的show界面
|
2013-11-23 20:31:48 +08:00 |
yanxd
|
69d3ab5bef
|
add memo controller
|
2013-11-23 10:47:28 +08:00 |
fanqiang
|
c50c77a7ca
|
frame
|
2013-11-23 08:20:03 +08:00 |
yanxd
|
48650a2a91
|
init forum. again.
|
2013-11-22 21:55:21 +08:00 |
yanxd
|
c03f17e3b4
|
Revert "小改怡情,大改伤身,强改灰飞烟灭"
This reverts commit 4a4d1159f8 .
|
2013-11-22 20:03:56 +08:00 |
fanqiang
|
4a4d1159f8
|
小改怡情,大改伤身,强改灰飞烟灭
|
2013-11-22 11:19:08 +08:00 |
fanqiang
|
16f70437d1
|
forum init.
|
2013-11-22 10:24:15 +08:00 |
huangjingquan
|
b8db0f59d2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-21 17:12:00 +08:00 |
xianbo
|
9f1c03ee10
|
fix edit about forum
|
2013-11-21 10:48:11 +08:00 |
fanqiang
|
6a0d362241
|
修改了以附件形式提交作业时,当作业为空时也能提交的BUG
修改了匿名用户提交作业的BUG
|
2013-11-21 09:44:54 +08:00 |
huangjingquan
|
45fad95d48
|
冲突处理
|
2013-11-21 09:41:30 +08:00 |
yanxd
|
0381179536
|
自动添加讨论区当项目课程创建的时候,学生是否能回复需要在全线报表里配置.
|
2013-11-20 17:02:47 +08:00 |
yanxd
|
9491781b45
|
.
|
2013-11-20 15:54:52 +08:00 |
yanxd
|
8ec2d8342b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-20 10:46:59 +08:00 |
yanxd
|
349020182a
|
.
|
2013-11-20 10:44:54 +08:00 |
baiyu
|
1a42cdd013
|
增加了课程与竞赛的人名超链接
|
2013-11-20 08:57:37 +08:00 |
baiyu
|
9293ef53b9
|
修正了竞赛配置的问题
|
2013-11-19 16:05:52 +08:00 |
baiyu
|
6c9c849e7c
|
1、增加了竞赛的配置功能
2、增加了课程的成员学号显示
|
2013-11-19 15:15:54 +08:00 |
yanxd
|
356a48caa8
|
move constant to module, fixed some translate.
|
2013-11-18 08:48:38 +08:00 |
huangjingquan
|
16611d8eff
|
修改了管理员权限
|
2013-11-16 11:09:10 +08:00 |
yanxd
|
2932f5a940
|
第一次db:migrate时创建admin的用户扩展表,防止第一次部署出错;为项目版本库diff增加过滤器。
|
2013-11-16 10:37:47 +08:00 |
huangjingquan
|
bfcb68efab
|
课程添加了讨论区
限制学生下作业
讨论区权限设置
|
2013-11-14 19:29:42 +08:00 |
baiyu
|
2f8ef03d32
|
1、增加了参与竞赛的用户列表
2、区分了个人主页里“粉丝”列表里的项目与课程的计数与显示
3、竞赛发布人的名字改为了全称
|
2013-11-14 17:01:06 +08:00 |
baiyu
|
005e0802d4
|
增加了竞赛的“加入”
|
2013-11-14 15:55:56 +08:00 |
xianbo
|
5366b50c56
|
modify admin show
BY nieguanfei && huangjinquan
|
2013-11-13 20:17:11 +08:00 |
yanxd
|
88b9f943fc
|
fix issue#353
|
2013-11-13 09:56:38 +08:00 |
yanxd
|
0ddd259fea
|
refactor: access controller move to filter.
|
2013-11-12 15:13:48 +08:00 |
yanxd
|
8f59e035b0
|
Merge branch 'hidden_repo' into develop
|
2013-11-12 10:28:41 +08:00 |
yanxd
|
98ccc97b27
|
add hidden repository function
|
2013-11-12 10:27:36 +08:00 |
xianbo
|
02ff8b8955
|
take off course fomre form the projrct ehich is watched
|
2013-11-12 09:04:39 +08:00 |
yanxd
|
5fb29c150b
|
refactory projectController#new
|
2013-11-11 09:27:51 +08:00 |
yanxd
|
a101be344c
|
add any remark
|
2013-11-11 09:06:53 +08:00 |
nieguanghui
|
6352ae7aa6
|
fix bug
|
2013-11-09 09:26:02 +08:00 |
nieguanghui
|
adf8a7bc92
|
修改课程活跃度排序方式,解决课程列表文件链接错误
|
2013-11-09 08:26:23 +08:00 |
xianbo
|
1cfba644f5
|
fix show of someone who watch and fxi the show of homework exdit
|
2013-11-08 17:19:57 +08:00 |
xianbo
|
607eb2c2ff
|
modify shoew of project
|
2013-11-07 17:04:37 +08:00 |
nieguanghui
|
50b91e3942
|
修改按钮样式,增加附件过滤
|
2013-11-07 15:58:15 +08:00 |
yanxd
|
239a1484ae
|
remove useless code block
|
2013-11-07 14:38:37 +08:00 |
fanqiang
|
9996386fe4
|
增加课程留言与项目反馈功能,修改了点击课程作业时tab页显示问题
|
2013-11-07 11:02:32 +08:00 |
huangjingquan
|
17317da314
|
修改了项目和课程里面配置成员bug
|
2013-11-06 09:13:02 +08:00 |
yanxd
|
2d4b9f8c52
|
nothing
|
2013-11-05 21:00:16 +08:00 |
yanxd
|
9526f6d67a
|
remove string unkown
|
2013-11-05 20:57:11 +08:00 |
nieguanghui
|
2b10258ae1
|
修改课程列表显示样式
|
2013-11-05 20:46:38 +08:00 |
yanxd
|
397eb11dca
|
refactor memberlist
|
2013-11-04 22:00:06 +08:00 |
nieguanghui
|
cab092cd04
|
修改课程默认排序方式
|
2013-11-01 11:17:24 +08:00 |
nieguanghui
|
583c022048
|
修复作业列表搜索bug
|
2013-11-01 10:48:02 +08:00 |
huangjingquan
|
5febe8a58d
|
个人主页课程列表加入了“退出课程”和加入课程按钮
|
2013-11-01 09:06:06 +08:00 |
baiyu
|
b2080a4470
|
加入了开课时间,结课时间选项
增加了课时文本框
相应的增加了显示
|
2013-11-01 08:45:24 +08:00 |
nieguanghui
|
db25900336
|
修复新建项目的时候相关信息写入丢失bug
|
2013-10-31 22:07:31 +08:00 |
nieguanghui
|
75c0480071
|
增加个人活动列表,作业过滤功能,删除课程作业搜索框,修复课程页面以学生角色搜索也会出现新建课程的bug
|
2013-10-31 21:44:10 +08:00 |
xianbo
|
67d228142a
|
add the root in bid modify about homework
|
2013-10-31 16:33:15 +08:00 |
huangjingquan
|
477e299e24
|
修改了用户主页课程列表显示
去掉了作业和关注需求,将关注需求统计显示
|
2013-10-31 15:18:42 +08:00 |
yanxd
|
0b04b28024
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-31 10:58:20 +08:00 |
yanxd
|
2286fbeff5
|
members split (teacher,student) in course
|
2013-10-31 10:57:46 +08:00 |
xianbo
|
5dfac1d8e3
|
add modify about homework and modify the show of toll bar
|
2013-10-30 22:17:51 +08:00 |
baiyu
|
9b9745ea0a
|
对于应标需求,提交作业,提交竞赛作品成功后闪出的flash做了区别
|
2013-10-30 21:46:40 +08:00 |
yanxd
|
67216ca463
|
fix back_url bug
|
2013-10-30 20:56:24 +08:00 |
nieguanghui
|
224a194759
|
修复成员 bug,修复作业显示bug‘
|
2013-10-30 10:45:37 +08:00 |
xianbo
|
1f09bfbab1
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-28 20:09:43 +08:00 |
xianbo
|
e9856b3524
|
modify the style of the projects witch show
|
2013-10-28 20:09:15 +08:00 |
nieguanghui
|
1f8c10e48a
|
修复bug
|
2013-10-28 08:51:15 +08:00 |
xianbo
|
a50aff3fb4
|
1.add special reward
2.give a root controller in bid controller && give the administrator the root can change the reward who is deadine.
|
2013-10-24 20:36:57 +08:00 |
xianbo
|
2fa6276829
|
fix natural
|
2013-10-24 10:13:37 +08:00 |
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 |
nieguanghui
|
5ce9bcdb2c
|
解决竞赛,需求,作业列表搜索bug
|
2013-10-21 21:16:41 +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 |
yanxd
|
ab5d8853b5
|
fixed issue#314
|
2013-10-17 16:14:35 +08:00 |
yanxd
|
081a8e9825
|
fixed issue#319
|
2013-10-17 10:31:41 +08:00 |
yanxd
|
69869a05c9
|
reverse projects list, add explain to role.
|
2013-10-16 10:58:21 +08:00 |
nieguanghui
|
17a4f14f2a
|
修复课程和项目搜索bug
|
2013-10-15 16:29:35 +08:00 |
huangjingquan
|
bcb66f2b32
|
在个人主页项目里面添加新建按钮
|
2013-10-13 15:26:41 +08:00 |
huangjingquan
|
673850bd03
|
fix
|
2013-10-12 17:42:19 +08:00 |
huangjingquan
|
19ebd48a95
|
修改了作业列表无法显示
|
2013-10-12 17:21:50 +08:00 |
huangjingquan
|
00cef03049
|
修改了个人主页里关注需求全部需求改成只关注的需求
|
2013-10-12 16:23:25 +08:00 |
huangjingquan
|
8082bb456f
|
为竞赛添加新的页面
|
2013-10-12 10:45:48 +08:00 |
yanxd
|
a5cdbc8e92
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-12 10:37:37 +08:00 |
yanxd
|
f1a31c7f6b
|
提升头像图片显示分辨力
|
2013-10-12 10:36:50 +08:00 |
xianbo
|
d3f46adc34
|
fix
|
2013-10-12 10:08:45 +08:00 |
xianbo
|
fd14457446
|
add delete homework in course
|
2013-10-12 10:05:31 +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 |
fanqiang
|
962842d841
|
修改了提交作业数量显示问题,修改了创建需求的种类选择问题
|
2013-10-10 21:56:27 +08:00 |
xianbo
|
956aa3d0c1
|
remove forum block in course setting
|
2013-10-10 21:41:42 +08:00 |
huangjingquan
|
e25425d9a7
|
用户看别人课程主页时显示问题
|
2013-10-10 21:33:52 +08:00 |
nieguanghui
|
8703709bd0
|
解决了课程创建时设置私有依旧显示在课程列表的bug
|
2013-10-10 21:11:42 +08:00 |
huangjingquan
|
a0c6a183fe
|
修改了个人主页的关注需求里面只显示需求不显示作业
|
2013-10-10 16:04:59 +08:00 |
xianbo
|
543279eb84
|
add course filter
|
2013-10-10 15:05:27 +08:00 |
huangjingquan
|
64cddc8687
|
修改了课程设置里面bug
角色改成英文
|
2013-10-10 10:36:56 +08:00 |
xianbo
|
b0d413a216
|
modify the admin select
|
2013-10-10 10:22:32 +08:00 |
xianbo
|
3b6f0e3d34
|
modify delete project and user and define a course is a public
|
2013-10-09 22:26:03 +08:00 |
huangjingquan
|
bf081b95bd
|
学生自己的主页课程里面添加加入课程链接
竞赛里面 修复列表排序bug
新建竞赛的时候 修复了几个bug
|
2013-10-09 17:27:42 +08:00 |
huangjingquan
|
9e77d3e001
|
修改了作业课程里面一些Bug
|
2013-10-09 16:14:11 +08:00 |
huangjingquan
|
2c45fb8760
|
竞赛
|
2013-10-08 22:12:17 +08:00 |
fanqiang
|
8e51ea7327
|
修改了企业注册与修改企业资料过程,以及一些企业主页中的显示细节
|
2013-10-08 16: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 |
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
|
43a0a875f4
|
修改课程创建问题
|
2013-09-30 10:38:30 +08:00 |
huangjingquan
|
9c0b68460a
|
修改课程与企业样式
|
2013-09-30 09:42:13 +08:00 |
huangjingquan
|
b6ca2c3d74
|
修改了讨论区bug
|
2013-09-29 20:04:03 +08:00 |
fanqiang
|
838894a19c
|
修改了需求评分功能,以及作业的提交
|
2013-09-29 19:58:57 +08:00 |
huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
2013-09-29 19:46:59 +08:00 |
fanqiang
|
9fbccfbb6d
|
改了一些问题
创建课程问题
添加了需求的FORK功能
|
2013-09-28 23:08:24 +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 |
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 |
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
|
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 |
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 |
fanqiang
|
50894d8950
|
将新闻添加进活动
|
2013-09-15 09:33:51 +08:00 |
huangjingquan
|
11370329dd
|
修改了部分功能
|
2013-09-14 17:25:57 +08:00 |
baiyu
|
2768c935be
|
1、增加了“我的状态”
|
2013-09-14 17:22:44 +08:00 |
huangjingquan
|
e4cbc7533e
|
tabs显示
|
2013-09-14 09:51:26 +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 |