 nieguanghui
|
e4ae5e56fc
|
delete leave message .
|
2013-12-26 20:22:19 +08:00 |
|
nieguanghui
|
58ff68a9cc
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-26 19:58:10 +08:00 |
|
nieguanghui
|
8a0dc59f3e
|
welcome index helper.
|
2013-12-26 19:57:40 +08:00 |
yanxd
|
8a1316cf8f
|
删除留言操作
|
2013-12-26 19:28:18 +08:00 |
|
yanxd
|
7197e3d90c
|
论坛直接建立新帖传送文件不能成功
|
2013-12-26 16:34:50 +08:00 |
|
nieguanghui
|
809e7023ee
|
给留言增加删除功能；
_message.html.erb, _journal_reply_items.html.erb
调用words的destroy方法。
|
2013-12-26 16:06:59 +08:00 |
|
nieguanghui
|
4c9f9d9210
|
Merge branch 'wordh' into develop
|
2013-12-26 15:35:11 +08:00 |
|
nieguanghui
|
4fc47ce3a3
|
修改回复按钮表现方式
|
2013-12-26 15:32:34 +08:00 |
 wanglinchun
|
d48d17bece
|
留言邮件问题
|
2013-12-26 15:24:03 +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
|
6d1f395caf
|
mutil thread
|
2013-12-26 11:35:07 +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 |
|
nieguanghui
|
6d47031d72
|
改变样式
|
2013-12-26 11:13:30 +08:00 |
|
nieguanghui
|
d0c28a60bc
|
留言页面显示改进
|
2013-12-26 11:05:09 +08:00 |
|
yanxd
|
7130347f39
|
回复框 设置姓名 七八糟
|
2013-12-26 10:52:16 +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 |
|
nieguanghui
|
c05dd4f900
|
修改用户页面留言显示样式
|
2013-12-25 21:00:40 +08:00 |
|
yanxd
|
6b3c3516cd
|
去除给留言的回复显示在留言中
|
2013-12-25 16:04:14 +08:00 |
|
nieguanghui
|
b716b60c0b
|
修复回复框默认展开的bug
|
2013-12-25 15:57:19 +08:00 |
|
yanxd
|
60489bdbfd
|
'fix'
|
2013-12-25 15:45:14 +08:00 |
|
yanxd
|
2c5cd7a12a
|
'merge'
|
2013-12-25 15:43:28 +08:00 |
|
yanxd
|
f05d2131bd
|
组织留言数据方法
|
2013-12-25 15:40:34 +08:00 |
|
nieguanghui
|
fbf73de68b
|
1234
|
2013-12-25 15:37:03 +08:00 |
|
yanxd
|
a53e18dcc5
|
zz
|
2013-12-25 10:09:21 +08:00 |
|
nieguanghui
|
5b6f3b602a
|
参数
|
2013-12-25 09:45:16 +08:00 |
|
yanxd
|
6f0e3501b8
|
fix bug.
|
2013-12-25 09:25:22 +08:00 |
|
yanxd
|
ff317e48e9
|
words jourformessage design ing...
|
2013-12-25 09:17:15 +08:00 |
|
nieguanghui
|
c8bdbdce66
|
1234
|
2013-12-24 16:52:13 +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
|
5e5689d945
|
闭合素有标签
|
2013-12-24 11:19:20 +08:00 |
|
yanxd
|
2636d6b1e6
|
项目留言页面对齐
|
2013-12-24 10:57:59 +08:00 |
|
yanxd
|
fe2dc180ba
|
整理页面标签格式
|
2013-12-24 10:27:43 +08:00 |
|
wanglinchun
|
79571e8651
|
留言发邮件通知改进
|
2013-12-23 22:36:32 +08:00 |
|
yanxd
|
ec73bb144e
|
zz
|
2013-12-23 19:54:43 +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 |
|
yanxd
|
8be6e2f3d1
|
remove remark.
|
2013-12-23 10:59:04 +08:00 |
|
yanxd
|
55af88777b
|
issue#426 不是顺序乱，是没显示置顶
|
2013-12-23 09:30:15 +08:00 |
|
yanxd
|
cda9543849
|
帖子回复数量超过一页，首页动态点击过去无法跳转到相应页面定位，锚点失效
|
2013-12-23 09:28:28 +08:00 |
|
yanxd
|
99686ec269
|
留言不能是空字符
|
2013-12-21 10:15:41 +08:00 |
|
wanglinchun
|
775f07a89d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-20 22:04:49 +08:00 |
|
wanglinchun
|
e16fea9387
|
fix:项目提交留言出错
|
2013-12-20 22:04:13 +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
|
7226186316
|
to login using validate with email.
|
2013-12-20 10:30:41 +08:00 |
|
yanxd
|
3f82203735
|
it can be summited project with same name.
|
2013-12-20 09:52:10 +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
|
7068359e9e
|
attachment.nil?
|
2013-12-19 16:04:01 +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 |
|
yanxd
|
35745f3e6e
|
.
|
2013-12-17 21:26:34 +08:00 |
|
yanxd
|
c06b4f2704
|
bug with memo paginate.
|
2013-12-17 21:09:20 +08:00 |
|
nieguanghui
|
967fb6dc9a
|
1、 实践课程->“课程作业”中的“提交情况”,”作业”后应该加数量【光辉 周二】
2、 实践课程->url错误，应该是course【光辉 周二】
3、 竞赛—参与项目 参与项目显示时间是UTC格式，应该与其他的时间格式一致；【周二 光辉】
4、 创新竞赛—>参与项目列表中每个项目名后面的“参与了应标“应改为”参与了竞赛“，“应标人”改为“参赛人”【光辉周二解决】
|
2013-12-17 20:49:23 +08:00 |
|
yanxd
|
ea55cbe462
|
修复讨论区新建不能回复问题
|
2013-12-17 20:00:57 +08:00 |
|
yanxd
|
e1e2e6e986
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-17 18:26:15 +08:00 |
|
yanxd
|
4d2fd01cf9
|
进入附件列表
|
2013-12-17 18:25:51 +08:00 |
|
nieguanghui
|
c6f657ed8c
|
重构排序代码
|
2013-12-17 16:59:07 +08:00 |
|
yanxd
|
f8f5ed3f9a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-17 16:02:20 +08:00 |
|
yanxd
|
b0efdefa7d
|
学号显示问题
|
2013-12-17 16:01:46 +08:00 |
xianbo
|
da74c97b7d
|
fix the show of manager web
|
2013-12-17 11:26:56 +08:00 |
|
yanxd
|
10c37b4693
|
zz
|
2013-12-17 09:30:24 +08:00 |
|
yanxd
|
fcfb8ea270
|
...
|
2013-12-16 19:36:50 +08:00 |
|
yanxd
|
246ab25bf0
|
部分sql语句写成rails形式
|
2013-12-16 19:08:00 +08:00 |
|
yanxd
|
4f9686fc57
|
活动不显示留言。
|
2013-12-16 18:38:23 +08:00 |
|
nieguanghui
|
071738c54e
|
留言框样式调整，实践课程“的课程名下的（加入课程 关注）、”创新竞赛“的竞赛名下的（加入竞赛 关注）、”软件众包“的名称下的（选为作业 关注），这三个模块的格式统一
|
2013-12-16 17:03:18 +08:00 |
|
nieguanghui
|
41fd14c074
|
1234
|
2013-12-16 16:46:01 +08:00 |
|
yanxd
|
8043c527ce
|
项目-设置-问题-居中;
|
2013-12-16 14:50:46 +08:00 |
|
yanxd
|
5e9bb9a99f
|
删除提示框作业，作业提交的问题。附件提交之后还会存在。
|
2013-12-16 14:39:02 +08:00 |
|
yanxd
|
f79cc4e597
|
记录帖子查看次数
|
2013-12-15 15:10:29 +08:00 |
 huangjingquan
|
e3898ee39d
|
修改了竞赛项目提交不一致问题
|
2013-12-14 12:21:13 +08:00 |
|
yanxd
|
fcc2dd7952
|
首页版本库，sth.
|
2013-12-14 11:41:53 +08:00 |
|
yanxd
|
586f112b4f
|
i用户互动留言不显示
|
2013-12-14 10:22:11 +08:00 |
|
yanxd
|
3484632ce8
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-13 20:02:20 +08:00 |
|
yanxd
|
b703c65033
|
关注取消关注位置漂移
个人主页学号的隐藏
|
2013-12-13 20:01:27 +08:00 |
|
nieguanghui
|
5b044ec872
|
修改显示内容
|
2013-12-13 19:26:13 +08:00 |
|
nieguanghui
|
f2d392de1d
|
调整主页界面显示
|
2013-12-13 16:08:29 +08:00 |
|
yanxd
|
b8e95ffc67
|
修改查询过滤样式
|
2013-12-13 14:31:28 +08:00 |
|
wanglinchun
|
10177618f0
|
message send email
|
2013-12-13 11:31:12 +08:00 |
|
yanxd
|
dcc47ae989
|
amigo
|
2013-12-12 17:18:55 +08:00 |
|
yanxd
|
b29dcb0446
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-12 17:11:44 +08:00 |
|
yanxd
|
767a6b36cb
|
fix bug
|
2013-12-12 17:11:29 +08:00 |
|
nieguanghui
|
4002ec99e0
|
修改项目和课程中点击上传附件的活动后直接下载的问题！
|
2013-12-12 17:00:14 +08:00 |
|
yanxd
|
59b2c408e7
|
sa
|
2013-12-12 10:10:30 +08:00 |
|
yanxd
|
5cae2010c1
|
download access
|
2013-12-12 09:23:08 +08:00 |
|
nieguanghui
|
0416902cde
|
修改个人动态显示内容
|
2013-12-12 09:19:31 +08:00 |
|
nieguanghui
|
b9b089fb27
|
完善主页个人动态部分汉化问题
|
2013-12-12 08:40:18 +08:00 |
|
yanxd
|
ca2f5c6705
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-11 22:19:58 +08:00 |
|
yanxd
|
cefddb635a
|
e
|
2013-12-11 22:19:41 +08:00 |
|
nieguanghui
|
f23451e4bb
|
add something
|
2013-12-11 20:34:29 +08:00 |
|
yanxd
|
f73ea104bb
|
remove my comment.
|
2013-12-11 17:02:05 +08:00 |
|
yanxd
|
02dc580e1e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-11 16:51:39 +08:00 |
|
yanxd
|
f29b2cfe12
|
整理issues界面，问题列表左移
|
2013-12-11 16:50:45 +08:00 |
 baiyu
|
8af92ef29b
|
修正了非本课程的用户能看见学生学号
修正了项目成员里能看见学号
|
2013-12-11 16:40:52 +08:00 |
|
yanxd
|
dcb16cb789
|
fix bug"
|
2013-12-11 16:19:18 +08:00 |
|
nieguanghui
|
c27528ffb7
|
1234
|
2013-12-11 16:14:51 +08:00 |
|
yanxd
|
f7a6798b73
|
.
|
2013-12-11 16:15:10 +08:00 |
|
yanxd
|
fb64b47ba6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-11 14:52:59 +08:00 |
|
yanxd
|
bf17ad3048
|
件下载界面描述剧终
|
2013-12-11 14:52:18 +08:00 |
xianbo
|
07e9615ac3
|
fix
|
2013-12-11 10:31:49 +08:00 |
|
yanxd
|
265e0f246b
|
问题六
|
2013-12-11 10:00:38 +08:00 |
|
yanxd
|
75451fa785
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-11 08:53:32 +08:00 |
|
yanxd
|
0bc2b8f2b3
|
项目论坛丢失了的编辑功能
贴吧的置顶锁定功能，目前只针对管理员开放
贴吧列表搜索功能重构
增加1/2帖子显示数目
取出楼主，防止输入帖子id让回复作为主贴显示
首页取新帖子
帖子下载内容随意删除功能
|
2013-12-11 08:52:55 +08:00 |
|
xianbo
|
caeee11eab
|
add explain to git
|
2013-12-11 07:56:42 +08:00 |
|
yanxd
|
23785999f1
|
fix fetch time
|
2013-12-10 20:36:19 +08:00 |
|
xianbo
|
0f93065ac4
|
imitate github show help doucument
|
2013-12-10 20:18:21 +08:00 |
|
yanxd
|
4f6cd0800a
|
welcome helper fetch new memos
|
2013-12-10 20:11:50 +08:00 |
|
nieguanghui
|
25baf61185
|
to do
|
2013-12-10 19:45:38 +08:00 |
|
yanxd
|
e5010d118b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-09 18:31:52 +08:00 |
|
yanxd
|
4eeb7c3ea8
|
look at daily log.
|
2013-12-09 18:31:08 +08:00 |
|
huangjingquan
|
0c5c07a5a3
|
对留言在动态里面的显示进行了修改！
|
2013-12-09 17:10:10 +08:00 |
|
huangjingquan
|
f99e5dcc64
|
修改了之前留言回复双重显示的问
|
2013-12-09 16:01:50 +08:00 |
 fanqiang
|
85351ee7e3
|
修改留言
|
2013-12-09 08:36:31 +08:00 |
|
xianbo
|
f6b97eed48
|
modify spider say
|
2013-12-09 08:18:03 +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 |
|
yanxd
|
d29154cc24
|
hot memo merged board/topic.
|
2013-12-06 11:19:15 +08:00 |
|
yanxd
|
16fd02abc0
|
index string .
|
2013-12-05 17:16:52 +08:00 |
|
yanxd
|
2a6288dfa5
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-05 17:15:39 +08:00 |
|
yanxd
|
7e479c33e4
|
string something.
|
2013-12-05 17:15:18 +08:00 |
|
nieguanghui
|
04f42fc2e5
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-05 17:04:18 +08:00 |
|
nieguanghui
|
02bea99646
|
主页改进
|
2013-12-05 17:03:55 +08:00 |
|
yanxd
|
eec3997c18
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-05 16:54:30 +08:00 |
|
yanxd
|
ad1e36b896
|
dxx it.
|
2013-12-05 16:53:03 +08:00 |
|
fanqiang
|
e990a17fdb
|
修改留言功能
1.个人主页留言样式丢失问题
2.对用户留言回复，会同时在该用户主页进行留言
|
2013-12-05 15:50:24 +08:00 |
|
nieguanghui
|
69c113f386
|
修改主页显示
|
2013-12-05 15:26:29 +08:00 |
|
yanxd
|
31a4ecc8e8
|
welcome activity, eventtypes: Forum=>Memo, Memo=>Reply.
|
2013-12-05 08:52:41 +08:00 |
|
huangjingquan
|
096f0eed03
|
添加了留言结果在用户动态里面显示
|
2013-12-04 21:24:52 +08:00 |
|
yanxd
|
6cede3d2be
|
计算评论数量，修复按照时间查找bug,etc...
|
2013-12-04 16:46:16 +08:00 |
|
nieguanghui
|
1ef5059708
|
主页
|
2013-12-04 16:01:20 +08:00 |
|
nieguanghui
|
9c192f5a92
|
主页界面修改
|
2013-12-04 15:49:21 +08:00 |
|
yanxd
|
28978b88b2
|
首页用户动态加入讨论区内容，点击之后定位到帖子。
|
2013-12-04 15:31:18 +08:00 |
|
yanxd
|
6a2a82d30e
|
全角分号改为半角.
|
2013-12-03 15:17:06 +08:00 |
|
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 |