 huangjingquan
|
b8db0f59d2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-21 17:12:00 +08:00 |
yanxd
|
67bec27f34
|
.
|
2013-11-21 17:11:55 +08:00 |
|
huangjingquan
|
9b044f8d13
|
修改了讨论区显示
|
2013-11-21 09:38:03 +08:00 |
 baiyu
|
6c9c849e7c
|
1、增加了竞赛的配置功能
2、增加了课程的成员学号显示
|
2013-11-19 15:15:54 +08:00 |
|
huangjingquan
|
16611d8eff
|
修改了管理员权限
|
2013-11-16 11:09:10 +08:00 |
|
huangjingquan
|
4d8345593d
|
将作业情况改成作业提交情况
|
2013-11-14 19:39:07 +08:00 |
|
huangjingquan
|
3055286cdd
|
修改了作业不能提交bug
|
2013-11-13 10:19:47 +08:00 |
|
huangjingquan
|
7935520612
|
对课程、项目、作业页面 当前位置显示做了隐藏
|
2013-11-12 10:44:15 +08:00 |
|
huangjingquan
|
59d0cc8e7a
|
修改了个人主页项目列表
|
2013-11-09 08:56:34 +08:00 |
|
huangjingquan
|
718fa65fc4
|
整个界面样式协调
|
2013-11-08 20:54:45 +08:00 |
|
huangjingquan
|
e8153c86ad
|
修改了项目里面各个子页面的样式
|
2013-11-08 20:09:21 +08:00 |
|
huangjingquan
|
f13665959a
|
作业列表样式修改
项目新闻样式修改
|
2013-11-08 17:26:47 +08:00 |
|
baiyu
|
8f216a6723
|
统一了各个模块的按钮，修改了部分国际化
|
2013-11-08 10:53:18 +08:00 |
|
huangjingquan
|
165c392f31
|
各个列表添加当前位置
|
2013-11-08 10:29:29 +08:00 |
xianbo
|
5032eaabcb
|
fix the show out of the frame and the location of show
|
2013-11-07 19:14:57 +08:00 |
|
xianbo
|
607eb2c2ff
|
modify shoew of project
|
2013-11-07 17:04:37 +08:00 |
|
huangjingquan
|
d71890526b
|
课程列表里面超出的部分自动隐藏
|
2013-11-07 16:35:20 +08:00 |
|
huangjingquan
|
f15619d99d
|
样式
|
2013-11-05 16:42:03 +08:00 |
|
huangjingquan
|
2a4539dc2c
|
几个主要页面样式
|
2013-11-05 12:49:57 +08:00 |
|
baiyu
|
231d1f2c4b
|
增加样式修改了各个模块导航条颜色
|
2013-11-05 09:17:36 +08:00 |
|
huangjingquan
|
c8427fe61e
|
修改了作业、项目、课程页面
|
2013-11-04 20:51:47 +08:00 |
|
baiyu
|
20c2feef30
|
增加了“项目门户”的当前位置导航、样式、配套的超链接
|
2013-11-04 20:18:44 +08:00 |
|
huangjingquan
|
8ee5381e44
|
修改了用户个人主页样式
|
2013-11-04 16:07:31 +08:00 |
|
huangjingquan
|
27299586c2
|
修改了top——mune
|
2013-11-04 15:20:22 +08:00 |
|
yanxd
|
19b983e103
|
move flash message to top on base_project
|
2013-11-02 14:17:15 +08:00 |
|
yanxd
|
5d431670a5
|
add new css to nyan.css
|
2013-11-02 13:41:46 +08:00 |
|
yanxd
|
6dec8a9312
|
share previews
|
2013-10-25 15:46:14 +08:00 |
|
yanxd
|
4bef2eee24
|
course can be shared files by project's member
|
2013-10-22 09:02:48 +08:00 |
baiyu
|
1be0a7d23f
|
修改了“返回个人主页”和“返回课程”，修改了样式
|
2013-10-16 22:02:05 +08:00 |
|
yanxd
|
ec63fc41bb
|
add link in project/course list page, joinBUtton renamed.
|
2013-10-15 14:46:20 +08:00 |
|
yanxd
|
e1d8c8a992
|
remove nyan css & move another file
|
2013-10-15 11:06:19 +08:00 |
|
yanxd
|
20883b92a5
|
add button css, fix js bug, add create project to push homework.
|
2013-10-14 21:45:10 +08:00 |
 huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
2013-09-29 19:46:59 +08:00 |
 william
|
2079c87362
|
增加tag删除。
|
2013-09-27 14:58:51 +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 |
baiyu
|
4fb040bc61
|
modify register bug
|
2013-09-23 16:42:19 +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
|
a7b500f5e7
|
修正了“注册”和“我的账号”的显示格式
|
2013-09-16 21:56:12 +08:00 |
|
huangjingquan
|
466922d13b
|
修改了上次会议提出的几点
|
2013-09-16 08:49:39 +08:00 |
|
baiyu
|
2768c935be
|
1、增加了“我的状态”
|
2013-09-14 17:22:44 +08:00 |
|
baiyu
|
313e66537e
|
增加了“地区”
|
2013-09-13 22:47:14 +08:00 |
|
huangjingquan
|
261c3fc337
|
new version
|
2013-09-12 10:41:15 +08:00 |
yanxd
|
43d43f22c0
|
fix icon position on issues/new
|
2013-09-03 08:37:16 +08:00 |
|
huangjingquan
|
a318266c60
|
修改用户列表tabs显示bug
|
2013-09-02 20:37:41 +08:00 |
|
huangjingquan
|
77a47797d2
|
user列表
|
2013-09-02 15:01:20 +08:00 |
 kaizheng
|
f077fd397b
|
字体修复
|
2013-09-02 13:07:23 +08:00 |
|
huangjingquan
|
c4df893eab
|
修改了tabs页面，字体大小
|
2013-09-02 12:49:17 +08:00 |
|
baiyu
|
844f1d2dcf
|
修改了不合理的地方
|
2013-08-31 21:45:20 +08:00 |