yanxd
|
7085e502d6
|
revert memo lz download <a>(has problems with delete.)
|
2013-12-03 11:26:05 +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 |
 nieguanghui
|
2b3138f23b
|
1
|
2013-12-03 09:37:34 +08:00 |
|
nieguanghui
|
25fd898623
|
修改部分内容
|
2013-12-03 08:42:54 +08:00 |
|
yanxd
|
0609c5c7ea
|
1.增加帖子回复时间查询语句
2.帖子回复的数量在数据库中有字段
3.新建帖子失败错误提示
4.下载里程碑top_menu删掉，
5.学生分页，分页方法封装
|
2013-12-02 17:27:15 +08:00 |
|
nieguanghui
|
b4fb17a467
|
修复论坛热帖折行的bug，修改热门项目列表分数部分显示内容
|
2013-12-02 15:44:11 +08:00 |
|
yanxd
|
825b1e7fd7
|
点击tag之后的索引功能.
|
2013-11-30 10:46:32 +08:00 |
|
nieguanghui
|
344e51105a
|
qq
|
2013-11-30 10:41:14 +08:00 |
|
nieguanghui
|
39bf4ff188
|
解决鼠标bug
|
2013-11-30 09:29:02 +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 |
|
nieguanghui
|
3700294890
|
门户网站页面微调
|
2013-11-29 10:48:16 +08:00 |
|
yanxd
|
929bb2bd70
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-28 18:31:39 +08:00 |
|
yanxd
|
c74c7c44d1
|
默认进入第一讨论区..
|
2013-11-28 18:31:09 +08:00 |
 huangjingquan
|
c1ea53faf0
|
修改了主页里面页面漂移问题
|
2013-11-28 18:27:18 +08:00 |
|
yanxd
|
f14f73414e
|
Merge branch 'welcome' into develop
|
2013-11-28 17:29:28 +08:00 |
|
nieguanghui
|
aa4596e170
|
增加图标显示
|
2013-11-28 17:22:24 +08:00 |
|
huangjingquan
|
2ba8bb8fd0
|
修改了forums主页显示，限制了讨论区用户图片显示大小
|
2013-11-28 17:15:42 +08:00 |
|
yanxd
|
5d77f2031e
|
主页去除影响性能的代码
|
2013-11-28 16:14:23 +08:00 |
|
nieguanghui
|
90b38cf5e8
|
s
|
2013-11-28 16:00:53 +08:00 |
|
yanxd
|
cc9dca4012
|
主题帖子数量不算在回复数之中
|
2013-11-28 15:51:38 +08:00 |
|
yanxd
|
8f707f3987
|
修复帖子统计问题
|
2013-11-28 15:29:19 +08:00 |
|
yanxd
|
49327905f8
|
refactor welcome help
|
2013-11-28 11:29:21 +08:00 |
|
yanxd
|
9f3d29a1f9
|
time spell error.
|
2013-11-28 10:40:19 +08:00 |
|
yanxd
|
e4162bbff9
|
bug
|
2013-11-28 10:14:03 +08:00 |
|
nieguanghui
|
c4d1b884e8
|
aaa
|
2013-11-28 10:07:49 +08:00 |
|
nieguanghui
|
6e704872be
|
1
|
2013-11-28 09:49:20 +08:00 |
|
nieguanghui
|
fb9e9aa8ee
|
修改显示
|
2013-11-28 09:48:26 +08:00 |
xianbo
|
47a7bcaa31
|
add every user_agent infomation to production.log
|
2013-11-28 09:39:48 +08:00 |
|
yanxd
|
579e78df9b
|
讨论区回复最多的主题帖
|
2013-11-28 09:34:51 +08:00 |
|
yanxd
|
6a97cb69a8
|
welcome activity.
|
2013-11-28 09:29:59 +08:00 |
|
nieguanghui
|
eb2bf5b879
|
增加方法
|
2013-11-28 08:39:58 +08:00 |
|
nieguanghui
|
1f83ca612b
|
显示部分数据
|
2013-11-28 08:34:20 +08:00 |
|
huangjingquan
|
6dc692bb6a
|
修改了主页、论坛显示
|
2013-11-27 16:40:47 +08:00 |
|
nieguanghui
|
f0b17a1a10
|
主页界面设计
|
2013-11-27 15:37:43 +08:00 |
|
yanxd
|
16c218ccae
|
隐藏搜索栏 and something...
|
2013-11-27 14:52:36 +08:00 |
|
yanxd
|
7fe8d46bfc
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-27 10:35:04 +08:00 |
|
yanxd
|
348946c363
|
fix img overflow bug.
|
2013-11-27 10:34:41 +08:00 |
|
huangjingquan
|
860c46e1c7
|
修改了字体大小
|
2013-11-27 10:31:12 +08:00 |
|
yanxd
|
5d02d0adc1
|
封装memo
|
2013-11-27 10:16:35 +08:00 |
|
huangjingquan
|
3165e7c7c3
|
添加了讨论区menu
|
2013-11-26 20:46:51 +08:00 |
|
yanxd
|
617f31de39
|
show img bug
|
2013-11-26 20:33:15 +08:00 |
|
yanxd
|
ae8e81fd46
|
zh.yml
|
2013-11-26 20:14:06 +08:00 |
|
yanxd
|
cdbc26e8df
|
Merge branch 'forum' into develop
|
2013-11-26 17:32:28 +08:00 |
|
yanxd
|
f0b6c33217
|
修改一些删除权限问题
|
2013-11-26 16:55:46 +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 |
|
huangjingquan
|
19f183cb2b
|
讨论区message样式
|
2013-11-25 15:07:34 +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
|
0a88d16a7d
|
one more chance.
|
2013-11-24 20:11:55 +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
|
d882dde164
|
one more time
|
2013-11-24 20:03:19 +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 |
|
fanqiang
|
a4d4dd5d97
|
haha
|
2013-11-23 20:04:26 +08:00 |
|
yanxd
|
4a51f08009
|
memos unfinish.
|
2013-11-23 20:02:15 +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 |
xianbo
|
9e6414e810
|
add the show about student number
|
2013-11-22 17:21:27 +08:00 |
|
yanxd
|
f5b61a8db0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-22 14:34:48 +08:00 |
|
yanxd
|
ae1fe0027a
|
optimization project helper.
|
2013-11-22 14:34:05 +08:00 |
|
fanqiang
|
4a4d1159f8
|
小改怡情，大改伤身，强改灰飞烟灭
|
2013-11-22 11:19:08 +08:00 |
 baiyu
|
1944cb5bcf
|
1、修改了个人主页里关注列表的项目和课程的显示错误
2、修改了竞赛里里竞赛参与者的项目和课程的显示错误
|
2013-11-22 10:37:58 +08:00 |
|
fanqiang
|
16f70437d1
|
forum init.
|
2013-11-22 10:24:15 +08:00 |
|
yanxd
|
5de8e1c2f2
|
new welcome index.
|
2013-11-22 08:19:40 +08:00 |
|
huangjingquan
|
0f652b4955
|
首页显示样式
|
2013-11-21 17:27:14 +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
|
67bec27f34
|
.
|
2013-11-21 17:11:55 +08:00 |
|
yanxd
|
a6d0482804
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-21 14:46:01 +08:00 |
|
xianbo
|
6ae9f2bd5f
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-21 10:48:36 +08:00 |
|
xianbo
|
9f1c03ee10
|
fix edit about forum
|
2013-11-21 10:48:11 +08:00 |
|
baiyu
|
c17148a151
|
给竞赛添加了“参与人”与“参与竞赛”的大号数字显示
|
2013-11-21 10:18:46 +08:00 |
|
fanqiang
|
6a0d362241
|
修改了以附件形式提交作业时，当作业为空时也能提交的BUG
修改了匿名用户提交作业的BUG
|
2013-11-21 09:44:54 +08:00 |
|
huangjingquan
|
45fad95d48
|
冲突处理
|
2013-11-21 09:41:30 +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
|
0381179536
|
自动添加讨论区当项目课程创建的时候，学生是否能回复需要在全线报表里配置.
|
2013-11-20 17:02:47 +08:00 |
|
yanxd
|
9491781b45
|
.
|
2013-11-20 15:54:52 +08:00 |
|
yanxd
|
d7f0b42bb7
|
.
|
2013-11-20 15:26:26 +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 |
|
huangjingquan
|
ec9e989361
|
修改了课程学号显示
|
2013-11-20 09:30:30 +08:00 |
|
baiyu
|
1a42cdd013
|
增加了课程与竞赛的人名超链接
|
2013-11-20 08:57:37 +08:00 |
|
baiyu
|
e8aa5633d8
|
修正了竞赛配置的问题
|
2013-11-19 16:08:55 +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 |
|
baiyu
|
eb36cb40ce
|
竞赛参与者的人数统计
|
2013-11-16 10:51:22 +08:00 |
|
yanxd
|
2932f5a940
|
第一次db:migrate时创建admin的用户扩展表，防止第一次部署出错;为项目版本库diff增加过滤器。
|
2013-11-16 10:37:47 +08:00 |
|
yanxd
|
dd1f972edd
|
Revert "move courses mixed To projecthelper From applicantionHelper"
This reverts commit 42332201f2.
|
2013-11-15 16:10:09 +08:00 |
|
yanxd
|
42332201f2
|
move courses mixed To projecthelper From applicantionHelper
|
2013-11-15 15:48:48 +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 |
|
baiyu
|
e5baf0959b
|
1、竞赛里的参与者名字显示全称
2、个人主页里的“关注”与“粉丝”列表名字显示全称
3、区别了“关注”里个人参与的项目与课程
4、竞赛里的参与者的项目与课程数量的显示做出了区分
5、竞赛的参与者列表增加了学员学号
|
2013-11-15 10:25:07 +08:00 |
|
huangjingquan
|
48f34f25ae
|
修改了自己能看到自己下载的文件
|
2013-11-14 21:03:11 +08:00 |
|
xianbo
|
abea7add69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-14 20:15:24 +08:00 |
|
xianbo
|
6279041361
|
fix links
|
2013-11-14 20:15:08 +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 |
|
xianbo
|
5366b50c56
|
modify admin show
BY nieguanfei && huangjinquan
|
2013-11-13 20:17:11 +08:00 |
|
huangjingquan
|
2d90215de2
|
修改了个人主页课程列表权限
|
2013-11-13 11:03:51 +08:00 |
|
yanxd
|
811106aca0
|
fix bug on submit homework after
|
2013-11-13 10:36:35 +08:00 |
|
huangjingquan
|
3055286cdd
|
修改了作业不能提交bug
|
2013-11-13 10:19:47 +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
|
bcaaaf1f5a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-12 11:40:18 +08:00 |
|
huangjingquan
|
7935520612
|
对课程、项目、作业页面 当前位置显示做了隐藏
|
2013-11-12 10:44:15 +08:00 |
|
xianbo
|
89f01e2aba
|
modify the show of messages
|
2013-11-12 10:31:21 +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 |
|
huangjingquan
|
1a8af21846
|
修改了提交按钮样式
|
2013-11-12 09:32:08 +08:00 |
|
xianbo
|
df628aff9d
|
modify curse nil error
|
2013-11-12 09:16:25 +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
|
57c28102e9
|
fix some thing
|
2013-11-09 09:04:23 +08:00 |
|
huangjingquan
|
59d0cc8e7a
|
修改了个人主页项目列表
|
2013-11-09 08:56:34 +08:00 |
|
nieguanghui
|
f6c3f3609a
|
搜索显示改进
|
2013-11-09 08:46:50 +08:00 |
|
yanxd
|
3b52936d17
|
roadmap -> milestone
|
2013-11-09 08:34:44 +08:00 |
|
nieguanghui
|
adf8a7bc92
|
修改课程活跃度排序方式，解决课程列表文件链接错误
|
2013-11-09 08:26:23 +08:00 |
|
huangjingquan
|
22ce616a78
|
修改了按钮样式
|
2013-11-08 22:02:52 +08:00 |
|
huangjingquan
|
718fa65fc4
|
整个界面样式协调
|
2013-11-08 20:54:45 +08:00 |
|
huangjingquan
|
e8153c86ad
|
修改了项目里面各个子页面的样式
|
2013-11-08 20:09:21 +08:00 |
|
yanxd
|
56cbca3ce8
|
fix little words
|
2013-11-08 17:29:08 +08:00 |
|
huangjingquan
|
f13665959a
|
作业列表样式修改
项目新闻样式修改
|
2013-11-08 17:26:47 +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
|
6e9f3d53e5
|
新增一个user列表页面
|
2013-11-08 11:25:33 +08:00 |
|
nieguanghui
|
dd6563cf8c
|
优化用户搜索
|
2013-11-08 11:01:28 +08:00 |
|
baiyu
|
8f216a6723
|
统一了各个模块的按钮，修改了部分国际化
|
2013-11-08 10:53:18 +08:00 |
|
huangjingquan
|
165c392f31
|
各个列表添加当前位置
|
2013-11-08 10:29:29 +08:00 |
|
baiyu
|
a52944811b
|
修正了用户列表里“参与了xx个项目”改为“参与了XX个项目”和“参与了XX个课程”
|
2013-11-08 09:02:14 +08:00 |