yanxd
|
099fffab51
|
Merge branch 'bigchange' into develop
|
2014-01-17 08:23:15 +08:00 |
yanxd
|
951666a1ed
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-01-16 21:15:24 +08:00 |
baiyu
|
13fdbde1cf
|
个人分数
|
2014-01-16 10:34:39 +08:00 |
yanxd
|
76f69973b4
|
fix search incalid byte sequence in utf-8
|
2014-01-15 21:00:07 +08:00 |
yanxd
|
a5c9d9c31e
|
um...
|
2014-01-15 17:28:53 +08:00 |
yanxd
|
2bb44456d6
|
search
|
2014-01-14 20:48:43 +08:00 |
yanxd
|
289b0581df
|
stores css
|
2014-01-11 09:08:15 +08:00 |
yanxd
|
9dd6bdc0ae
|
store framework => route, and refactory debug params in html/footer.
|
2014-01-10 09:19:50 +08:00 |
baiyu
|
db1874fa07
|
评分
|
2014-01-09 10:58:05 +08:00 |
wanglinchun
|
6b5f1827a6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-01-09 08:45:26 +08:00 |
wanglinchun
|
7a4fe59978
|
实践课程=>课程实践
|
2014-01-09 08:45:16 +08:00 |
yanxd
|
b9967074dc
|
新闻界面修改,new页面bug修复
|
2014-01-08 20:18:32 +08:00 |
wanglinchun
|
97749cfd8e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-01-03 21:44:25 +08:00 |
yanxd
|
fccd83e199
|
it i
|
2014-01-03 21:41:54 +08:00 |
yanxd
|
4c0acc5f3e
|
welcome css
|
2014-01-03 21:02:30 +08:00 |
wanglinchun
|
0c8e1e19e6
|
"软件众包"和“创新竞赛”中“关注”及前面星号的隐藏属性设置
|
2013-12-31 15:36:35 +08:00 |
wanglinchun
|
fdcb68bd69
|
当用户未登陆的时候,隐藏掉了“软件众包”中的“选为作业”
当用户未登陆的时候,隐藏掉了“项目托管”、“创新竞赛”以及“软件众包” 关注 前的星号
|
2013-12-31 11:12:39 +08:00 |
yanxd
|
e12922544a
|
链接bug,去掉动态里的文档内容
|
2013-12-27 09:00:50 +08:00 |
yanxd
|
7b895e5cde
|
Merge branch 'wordh' into develop
Conflicts:
app/views/layouts/base_users.html.erb
|
2013-12-26 11:36:09 +08:00 |
wanglinchun
|
a3ef595099
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/models/journals_for_message_observer.rb
|
2013-12-26 11:31:30 +08:00 |
wanglinchun
|
3707af3810
|
mail
|
2013-12-26 11:30:31 +08:00 |
yanxd
|
deaae6998c
|
Merge remote-tracking branch 'origin/develop' into wordh
|
2013-12-24 16:47:57 +08:00 |
nieguanghui
|
f3ce918699
|
留言修改
|
2013-12-24 16:42:56 +08:00 |
yanxd
|
2636d6b1e6
|
项目留言页面对齐
|
2013-12-24 10:57:59 +08:00 |
yanxd
|
1af4e4f712
|
welcome index css.
|
2013-12-23 19:45:51 +08:00 |
yanxd
|
36d7068ba3
|
闭合forum标签
|
2013-12-23 16:44:20 +08:00 |
nieguanghui
|
2db1067158
|
1、 网站中的搜索几乎都没有搜索后的提示语,这里应该加提示语,提示重新搜索。
2、 竞赛—关注 参与项目 用户反馈 这行应该去掉。
4. 去掉竞赛参与项目页面中”参与了竞赛”的 a 标签。
5.竞赛侧边栏显示方式的统一。
6. 解决竞赛侧边栏关注部分不显示头像的bug.修复侧边栏参与者部分没有参与者也不会显示提示的bug。
7. 增加竞赛中关注一栏的”more”链接。
7. 重构竞赛layouts代码。
|
2013-12-19 19:54:39 +08:00 |
yanxd
|
60be338848
|
作业提交的部分问题
禁止js的情况
修复一些路由错误
ie提交的问题.
|
2013-12-19 15:59:10 +08:00 |
nieguanghui
|
ca9da99f7e
|
1、 实践课程->课程动态 列表 动态显示(有了最新动态后)应该为:如果是项目则显示新闻,课程则显示通知【光辉 周三】
2、 系统中需要加空格地方:留言时间后加空格;作业截止日期前加空格;项目-缺陷:指派给**加空格;项目动态-发布时间加空格,而且去掉a标签;项目-新闻(更新时间后缺空格)【光辉 周三】
3、 竞赛—左下角 参与项目后面的“更多“位置应该调整【光辉 周三】
4、 看别人的主页时没有标签【光辉 周三】
|
2013-12-18 20:24:01 +08:00 |
yanxd
|
6bab3a95a7
|
add analytics.
|
2013-12-18 07:56:19 +08:00 |
nieguanghui
|
071738c54e
|
留言框样式调整,实践课程“的课程名下的(加入课程 关注)、”创新竞赛“的竞赛名下的(加入竞赛 关注)、”软件众包“的名称下的(选为作业 关注),这三个模块的格式统一
|
2013-12-16 17:03:18 +08:00 |
nieguanghui
|
41fd14c074
|
1234
|
2013-12-16 16:46:01 +08:00 |
huangjingquan
|
e3898ee39d
|
修改了竞赛项目提交不一致问题
|
2013-12-14 12:21:13 +08:00 |
yanxd
|
586f112b4f
|
i用户互动留言不显示
|
2013-12-14 10:22:11 +08:00 |
yanxd
|
b703c65033
|
关注取消关注位置漂移
个人主页学号的隐藏
|
2013-12-13 20:01:27 +08:00 |
yanxd
|
265e0f246b
|
问题六
|
2013-12-11 10:00:38 +08:00 |
yanxd
|
4eeb7c3ea8
|
look at daily log.
|
2013-12-09 18:31:08 +08:00 |
yanxd
|
7e479c33e4
|
string something.
|
2013-12-05 17:15:18 +08:00 |
yanxd
|
ad1e36b896
|
dxx it.
|
2013-12-05 16:53:03 +08:00 |
yanxd
|
28978b88b2
|
首页用户动态加入讨论区内容,点击之后定位到帖子。
|
2013-12-04 15:31:18 +08:00 |
yanxd
|
5914fb218c
|
add method to show download link
show download count in /project/:id/files
|
2013-12-03 10:37:19 +08:00 |
yanxd
|
0609c5c7ea
|
1.增加帖子回复时间查询语句
2.帖子回复的数量在数据库中有字段
3.新建帖子失败错误提示
4.下载里程碑top_menu删掉,
5.学生分页,分页方法封装
|
2013-12-02 17:27:15 +08:00 |
yanxd
|
9aa7294f5a
|
forum/memo fix
|
2013-11-29 18:14:49 +08:00 |
huangjingquan
|
2ba8bb8fd0
|
修改了forums主页显示,限制了讨论区用户图片显示大小
|
2013-11-28 17:15:42 +08:00 |
yanxd
|
16c218ccae
|
隐藏搜索栏 and something...
|
2013-11-27 14:52:36 +08:00 |
yanxd
|
cdbc26e8df
|
Merge branch 'forum' into develop
|
2013-11-26 17:32:28 +08:00 |
yanxd
|
b06abd0b83
|
Merge remote-tracking branch 'origin/forum' into forum
Conflicts:
app/views/memos/show.html.erb
|
2013-11-26 16:37:30 +08:00 |
yanxd
|
16c0bc3ac3
|
memo edit/destory.
|
2013-11-26 16:32:08 +08:00 |
huangjingquan
|
10ce6a87c2
|
修改了一些新建、编辑权限
|
2013-11-26 16:27:56 +08:00 |
huangjingquan
|
dc00216603
|
修改了谈论区框架、列表等
|
2013-11-25 21:42:59 +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
|
54c6ed72c1
|
memos
|
2013-11-24 20:09:24 +08:00 |
fanqiang
|
a4d4dd5d97
|
haha
|
2013-11-23 20:04:26 +08:00 |
yanxd
|
4a51f08009
|
memos unfinish.
|
2013-11-23 20:02:15 +08:00 |
xianbo
|
9e6414e810
|
add the show about student number
|
2013-11-22 17:21:27 +08:00 |
baiyu
|
1944cb5bcf
|
1、修改了个人主页里关注列表的项目和课程的显示错误
2、修改了竞赛里里竞赛参与者的项目和课程的显示错误
|
2013-11-22 10:37:58 +08:00 |
huangjingquan
|
b8db0f59d2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-21 17:12:00 +08:00 |
yanxd
|
a6d0482804
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-21 14:46:01 +08:00 |
baiyu
|
c17148a151
|
给竞赛添加了“参与人”与“参与竞赛”的大号数字显示
|
2013-11-21 10:18:46 +08:00 |
huangjingquan
|
9b044f8d13
|
修改了讨论区显示
|
2013-11-21 09:38:03 +08:00 |
yanxd
|
78b65f363f
|
move boards to tab_new, remove board from tool list on sidebar.
|
2013-11-21 08:59:58 +08:00 |
yanxd
|
d7f0b42bb7
|
.
|
2013-11-20 15:26:26 +08:00 |
baiyu
|
6c9c849e7c
|
1、增加了竞赛的配置功能
2、增加了课程的成员学号显示
|
2013-11-19 15:15:54 +08:00 |
huangjingquan
|
16611d8eff
|
修改了管理员权限
|
2013-11-16 11:09:10 +08:00 |
yanxd
|
c4bf9a8f72
|
refactor gender avatar html.erb => helper
|
2013-11-15 15:36:45 +08:00 |
yanxd
|
26d75af51a
|
fix homework uri error ,after joined xxx_show.html.erb.
|
2013-11-15 11:23:28 +08:00 |
yanxd
|
a9ec58f245
|
prepare fix admin/
new file: app/views/layouts/base_admin.html.erb
|
2013-11-15 10:55:11 +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 |
huangjingquan
|
b22077033a
|
链接到课程列表
|
2013-11-14 09:14:38 +08:00 |
huangjingquan
|
06e24fa38a
|
修改了提交作业范围
|
2013-11-14 09:07:55 +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 |
yanxd
|
56cbca3ce8
|
fix little words
|
2013-11-08 17:29:08 +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 |
huangjingquan
|
534c252bcb
|
修改了课程列表样式,部分国际化
|
2013-11-08 15:59:08 +08:00 |
xianbo
|
7da2f421e0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/bids/_new.html.erb
app/views/projects/feedback.html.erb
|
2013-11-08 15:50:28 +08:00 |
xianbo
|
3253f1cf28
|
modify show of some style
|
2013-11-08 15:49:08 +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 |
fanqiang
|
9996386fe4
|
增加课程留言与项目反馈功能,修改了点击课程作业时tab页显示问题
|
2013-11-07 11:02:32 +08:00 |
xianbo
|
73424b0c59
|
fix
|
2013-11-06 11:14:42 +08:00 |
xianbo
|
8d75d87ef5
|
fix the link of photo
|
2013-11-06 10:49:38 +08:00 |
xianbo
|
10a14d5e82
|
add the link to thieris homepage
|
2013-11-06 10:36:58 +08:00 |
huangjingquan
|
14445d0801
|
页面链接
|
2013-11-06 10:31:20 +08:00 |
huangjingquan
|
9d2f7d1c28
|
add the link to projects
|
2013-11-06 09:44:10 +08:00 |
huangjingquan
|
17317da314
|
修改了项目和课程里面配置成员bug
|
2013-11-06 09:13:02 +08:00 |
huangjingquan
|
49c22fbec3
|
个人主页课程列表里面添加了学期
|
2013-11-05 20:04:45 +08:00 |
xianbo
|
82c597a163
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-05 15:40:51 +08:00 |
huangjingquan
|
d6aa6550d7
|
调整了主页及六个界面的样式
|
2013-11-05 15:38:12 +08:00 |
xianbo
|
83b30b1f9e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-05 12:54:57 +08:00 |
xianbo
|
b61f3ce79f
|
fix showw
|
2013-11-05 12:54:48 +08:00 |
huangjingquan
|
2a4539dc2c
|
几个主要页面样式
|
2013-11-05 12:49:57 +08:00 |
huangjingquan
|
b9b0b06185
|
修改了一些链接bug
|
2013-11-05 10:58:23 +08:00 |
baiyu
|
231d1f2c4b
|
增加样式修改了各个模块导航条颜色
|
2013-11-05 09:17:36 +08:00 |
xianbo
|
c8c4cecccd
|
fix course link location
|
2013-11-05 09:17:50 +08:00 |
huangjingquan
|
ee33583ae1
|
修改了竞赛页面
添加了搜索功能
|
2013-11-04 22:09:03 +08:00 |
huangjingquan
|
ea8a87c3a6
|
需求里面增加了搜索功能
|
2013-11-04 21:55:47 +08:00 |
baiyu
|
be20b2c7fe
|
增加了需求导航,超链接
|
2013-11-04 21:52:01 +08:00 |
baiyu
|
f113cb7667
|
增加了需求导航,样式,超链接
|
2013-11-04 21:39:45 +08:00 |
huangjingquan
|
bb994f8b7d
|
修改了搜索结果显示
|
2013-11-04 21:38:14 +08:00 |
baiyu
|
be14669f6b
|
修改了个人主页导航超链接不能显示全名
|
2013-11-04 20:54:20 +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
|
29f058efba
|
修改了新建课程的时候报错
|
2013-11-04 15:30:02 +08:00 |
huangjingquan
|
27299586c2
|
修改了top——mune
|
2013-11-04 15:20:22 +08:00 |
yanxd
|
0b61b4ef5b
|
move flash message to page top in course/setting
|
2013-11-02 14:22:40 +08:00 |
yanxd
|
19b983e103
|
move flash message to top on base_project
|
2013-11-02 14:17:15 +08:00 |
xianbo
|
003b4704cc
|
fix link to
|
2013-11-02 12:42:30 +08:00 |
xianbo
|
c7b38e5bf2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/news/index.html.erb
|
2013-11-01 15:53:38 +08:00 |
xianbo
|
ca0f63a817
|
del the link of .head portrait
|
2013-11-01 15:48:23 +08:00 |
baiyu
|
b2080a4470
|
加入了开课时间,结课时间选项
增加了课时文本框
相应的增加了显示
|
2013-11-01 08:45:24 +08:00 |
nieguanghui
|
75c0480071
|
增加个人活动列表,作业过滤功能,删除课程作业搜索框,修复课程页面以学生角色搜索也会出现新建课程的bug
|
2013-10-31 21:44:10 +08:00 |
xianbo
|
c7d96dd183
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-31 17:29:04 +08:00 |
xianbo
|
743ef9856a
|
only teacher can know his tag and modify it
|
2013-10-31 17:28:10 +08:00 |
yanxd
|
369e5eccc0
|
member_list ,group by roles in course#show
|
2013-10-31 16:52:06 +08:00 |
xianbo
|
08f1453dbd
|
modify some show in create course and project
|
2013-10-31 16:44:05 +08:00 |
xianbo
|
0706fdd6dc
|
let the homework show under class in homeworkpager
|
2013-10-31 15:58:14 +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
|
5fb0bc945c
|
修改了删除“我的账号”后的小问题
|
2013-10-30 21:22:44 +08:00 |
baiyu
|
9319a7f87b
|
去掉了top_bar上“我的账号”
|
2013-10-30 21:10:28 +08:00 |
huangjingquan
|
b113719b46
|
课程里面添加了图片上传功能
|
2013-10-30 20:50:35 +08:00 |
yanxd
|
4bef2eee24
|
course can be shared files by project's member
|
2013-10-22 09:02:48 +08:00 |
yanxd
|
5d0b5812b3
|
share completed with fq, xianbo
|
2013-10-21 08:57:55 +08:00 |
baiyu
|
a44713ba6d
|
修改了需求页面显示
|
2013-10-19 16:16:54 +08:00 |
baiyu
|
0206d3f2c3
|
需求里面添加了用户和项目与需求的联系
|
2013-10-19 09:35:14 +08:00 |
baiyu
|
9fa9aa0fb8
|
“返回课程”“返回主页”按钮变色。改边距,边框变圆润
|
2013-10-17 16:22:26 +08:00 |
yanxd
|
081a8e9825
|
fixed issue#319
|
2013-10-17 10:31:41 +08:00 |
baiyu
|
1be0a7d23f
|
修改了“返回个人主页”和“返回课程”,修改了样式
|
2013-10-16 22:02:05 +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 |
xianbo
|
5a234e6fb2
|
add the link of project contributers&&followers count number
|
2013-10-15 17:11:10 +08:00 |
nieguanghui
|
17a4f14f2a
|
修复课程和项目搜索bug
|
2013-10-15 16:29:35 +08:00 |
xianbo
|
13e7280245
|
1.modify show of data
2.modify tool bar show when differ user login
|
2013-10-15 09:40:26 +08:00 |
yanxd
|
20883b92a5
|
add button css, fix js bug, add create project to push homework.
|
2013-10-14 21:45:10 +08:00 |
xianbo
|
8c675c2a96
|
add show about setting about course
|
2013-10-14 16:38:52 +08:00 |
xianbo
|
2bd110c550
|
delete the icon show about course
|
2013-10-12 14:35:19 +08:00 |
huangjingquan
|
8082bb456f
|
为竞赛添加新的页面
|
2013-10-12 10:45:48 +08:00 |
baiyu
|
13a2cfe644
|
修改了fork页面,增加了教师超链接
|
2013-10-10 23:02:15 +08:00 |
huangjingquan
|
3ff443b7b6
|
修改了自己的作业不能关注
只能关注别人的作业
|
2013-10-10 22:45:00 +08:00 |
huangjingquan
|
0a5013edd1
|
修改了作业界面显示
修改了发布作业的时候在个人动态里面显示做(之前显示需求)
|
2013-10-10 22:36:35 +08:00 |
wanglinchun
|
48a0f2f409
|
个人主页,课程相关国际化
|
2013-10-10 17:07:43 +08:00 |
huangjingquan
|
72f2793b0a
|
修改了关注的显示
|
2013-10-09 21:53:07 +08:00 |
baiyu
|
0226785f51
|
作业“关注”居左
|
2013-10-09 17:00:09 +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 |
fanqiang
|
7d2bdbc935
|
在课程列表中添加加入课程按钮
在课程主页中添加关注按钮,修改加入课程和关注的样式
修改作业列表中提交作业的数量显示问题
|
2013-10-09 16:04:23 +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 |
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
|
19962f2695
|
修改了主页的显示样式,
修改了我的课程,使得可以直接创建课程
|
2013-09-30 16:20:56 +08:00 |
baiyu
|
2a9cb28c4e
|
1、修改了国际化
2、增加了课程“年度”“学期”
3、主讲教师显示bug
|
2013-09-30 11:02:04 +08:00 |
huangjingquan
|
5c6bf7f9c8
|
修改课程退出的权限
|
2013-09-30 10:30:43 +08:00 |
huangjingquan
|
9c0b68460a
|
修改课程与企业样式
|
2013-09-30 09:42:13 +08:00 |
huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
2013-09-29 19:46:59 +08:00 |
fanqiang
|
4641f8cd63
|
修改引用作业中的显示样式
|
2013-09-26 10:10:53 +08:00 |
fanqiang
|
781fa32dbb
|
添加了需求的fork功能
|
2013-09-26 09:06:29 +08:00 |
xianbo
|
75c9921231
|
modify work place in null but can create course
|
2013-09-24 16:18:50 +08:00 |
xianbo
|
633104b493
|
modify some bug about course and add db migrate
|
2013-09-24 12:15:24 +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 |
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
|
a7b500f5e7
|
修正了“注册”和“我的账号”的显示格式
|
2013-09-16 21:56:12 +08:00 |
huangjingquan
|
960b59c807
|
修改了部分小bug
|
2013-09-16 10:56:37 +08:00 |
huangjingquan
|
466922d13b
|
修改了上次会议提出的几点
|
2013-09-16 08:49:39 +08:00 |
fanqiang
|
671b81035c
|
修改课程部分的权限设置,并且修改了作业的侧边栏显示
|
2013-09-15 16:49:19 +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
|
9221d1b376
|
dfh
|
2013-09-13 21:29:58 +08:00 |
huangjingquan
|
767231c202
|
fg
|
2013-09-13 16:36:36 +08:00 |
huangjingquan
|
ffa412d290
|
x
|
2013-09-13 10:11:36 +08:00 |
kaizheng
|
4684217097
|
解决英文页面项目列表中提交时间分行的问题,以及修复缺失的国际化
|
2013-09-12 21:09:44 +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 |
huangjingquan
|
261c3fc337
|
new version
|
2013-09-12 10:41:15 +08:00 |
kaizheng
|
4dfffabb67
|
用户列表,需求列表,项目列表,用户粉丝列表,欢迎页面等英文页面解决单复数问题
|
2013-09-11 20:54:01 +08:00 |
xianbo
|
1e7d127998
|
new course table
|
2013-09-06 16:39:38 +08:00 |
huangjingquan
|
ca09583fa5
|
修改了英文关注和粉丝重复显示错误
|
2013-09-03 09:16:40 +08:00 |
huangjingquan
|
f2ead4dae2
|
项目界面sidebar
|
2013-09-02 22:02:47 +08:00 |