xianbo
|
ba12ff19eb
|
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
|
2013-09-24 08:56:44 +08:00 |
|
baiyu
|
540f06c769
|
add_student_id_to user
|
2013-09-24 08:52:57 +08:00 |
 william
|
006f381a05
|
新增需求结束方式
|
2013-09-23 20:19:42 +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 |
 baiyu
|
6ce27271e3
|
修改了身份
增加了职称、学号
|
2013-09-23 09:41:36 +08:00 |
|
huangjingquan
|
3536883248
|
课程合并
|
2013-09-23 08:44:48 +08:00 |
 baiyu
|
c2302dc0c7
|
增加了附件删除功能
修改用户主页中课程与项目之间的关系
用户课程页面中的作业进行了按课程分组
|
2013-09-18 22:56:01 +08:00 |
 nieguanghui
|
45178e178f
|
fix the projects's present bug
|
2013-09-16 21:47:46 +08:00 |
 fanqiang
|
805ad6600b
|
添加了提交作业
|
2013-09-13 21:52:24 +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 |
|
xianbo
|
7dbcc1520c
|
course add data
|
2013-09-06 16:40:07 +08:00 |
|
xianbo
|
1e7d127998
|
new course table
|
2013-09-06 16:39:38 +08:00 |
|
zhangyang
|
4d82cad51d
|
move 2013.8.29
|
2013-08-30 09:34:21 +08:00 |
|
nieguanghui
|
03415891f5
|
增加需求描述
|
2013-08-28 20:16:40 +08:00 |
|
nieguanghui
|
fa27d3bf32
|
增加项目和用户的排序功能
|
2013-08-28 09:34:54 +08:00 |
|
baiyu
|
1290a008fc
|
修改新建需求界面
|
2013-08-20 16:32:45 +08:00 |
|
william
|
7850a2e6f0
|
修改user_extension
|
2013-08-14 21:37:55 +08:00 |
|
fanqiang
|
7287e151d0
|
将issue加入活动中，添加读取活动数据的方法
|
2013-08-13 16:29:02 +08:00 |
 baiyu
|
51249e26f3
|
修复tag的bug
|
2013-08-12 23:06:50 +08:00 |
|
nieguanghui
|
c00575ce84
|
修改新建项目显示，优化列表显示速度
|
2013-08-12 17:11:41 +08:00 |
|
fanqiang
|
69e3dcee6c
|
修改用户活动，用户主页的其他部分添加分页
|
2013-08-12 15:37:42 +08:00 |
|
fanqiang
|
238b9a416f
|
修改用户主页中与我相关部分的功能，现在可以查找在问题中的引用以及对指派给我的问题中的所有反馈
|
2013-08-11 10:36:55 +08:00 |
 kaizheng
|
79b5544bc0
|
将一些中文国际化
|
2013-08-08 22:26:46 +08:00 |
|
william
|
9cc86f3cd8
|
移除seems_ratabale插件。
|
2013-08-08 17:26:37 +08:00 |
|
william
|
0b5ea87f11
|
加入了对赞功能模块，同时预留了踩功能，但暂时不使用。
|
2013-08-08 17:01:56 +08:00 |
|
fanqiang
|
bb5052cf30
|
修改了用户活动，可以查看关注好友的活动，并且将需求加入到活动中
修复了一些需求中的BUG
|
2013-08-05 22:47:01 +08:00 |
|
kaizheng
|
3d8aa620a5
|
添加分享按钮
|
2013-08-03 20:09:04 +08:00 |
|
kaizheng
|
e635237acd
|
添加app\controllers\shares_controller.rb及相关文件用来作为api演示的小例子，Client.html放在根目录下作为演示客户端
|
2013-08-01 20:26:19 +08:00 |
|
huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |