yanxd
|
3d2c0ba721
|
add activityBox to project/course/contest html
|
2014-01-13 08:23:35 +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 |
|
yanxd
|
28bc3c1894
|
图标and页面不换行顶出边界
|
2014-01-09 16:57:28 +08:00 |
 baiyu
|
db1874fa07
|
评分
|
2014-01-09 10:58:05 +08:00 |
|
yanxd
|
f728061d05
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-01-09 09:16:09 +08:00 |
|
yanxd
|
16c4b0e18c
|
board#new css
|
2014-01-09 09:15:58 +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
|
71775000a4
|
新建新闻css，教师新建课程
|
2014-01-09 08:34:30 +08:00 |
|
yanxd
|
ea289ae036
|
竞赛中，创建项目404问题
|
2014-01-08 20:53:37 +08:00 |
|
yanxd
|
b9967074dc
|
新闻界面修改，new页面bug修复
|
2014-01-08 20:18:32 +08:00 |
|
yanxd
|
789acee429
|
缺陷查询飘来飘去
|
2014-01-07 08:20:26 +08:00 |
|
yanxd
|
eafbb20807
|
匿名用户禁止回复
|
2014-01-06 21:11:20 +08:00 |
|
yanxd
|
4b8a4c82c9
|
学号在作业里显示问题，首页时间显示不确定问题，项目缺陷滑动效果乱跳问题。
|
2014-01-06 19:29:18 +08:00 |
|
yanxd
|
38b1f69aa5
|
fix bug in homework.html/ with admin or user who is belong to jfm.
|
2014-01-04 17:29:35 +08:00 |
|
yanxd
|
343b656c0f
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-01-03 22:18:40 +08:00 |
|
yanxd
|
d23b196eaa
|
zz
|
2014-01-03 22:18:22 +08:00 |
|
wanglinchun
|
97749cfd8e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-01-03 21:44:25 +08:00 |
|
wanglinchun
|
1c374a4530
|
Merge branch 'wordh' into develop
|
2014-01-03 21:43:55 +08:00 |
|
yanxd
|
fccd83e199
|
it i
|
2014-01-03 21:41:54 +08:00 |
|
wanglinchun
|
4167e8bb8f
|
修改了门户网站中用户动态的[进入附件列表]显示颜色
|
2014-01-03 21:36:47 +08:00 |
|
yanxd
|
4587c840b1
|
a
|
2014-01-03 21:33:01 +08:00 |
|
yanxd
|
4c0acc5f3e
|
welcome css
|
2014-01-03 21:02:30 +08:00 |
|
yanxd
|
61f0eef6f3
|
words/new reply insteads of project new reply form
|
2014-01-03 11:27:16 +08:00 |
|
yanxd
|
d0601aa671
|
Merge branch 'wordh' into develop
|
2014-01-03 10:34:17 +08:00 |
 nieguanghui
|
1581a3a153
|
Merge branch 'wordh' of 10.0.47.245:/home/trustie2 into wordh
|
2014-01-03 10:29:42 +08:00 |
|
nieguanghui
|
d0908c9132
|
front page
|
2014-01-03 10:29:29 +08:00 |
|
yanxd
|
4abea36f3b
|
remove label_leave_me_message from user show erb
|
2014-01-03 08:53:09 +08:00 |
|
yanxd
|
1881e9726c
|
zz
|
2014-01-02 21:36:51 +08:00 |
|
yanxd
|
123817df93
|
tools 顺序
首页讨论区去掉项目讨论区
所有留言删除功能
标题显示错误
|
2014-01-02 21:20:57 +08:00 |
|
yanxd
|
e577e1713f
|
Merge branch 'wordh' of 10.0.47.245:/home/trustie2 into wordh
|
2014-01-02 17:29:57 +08:00 |
|
yanxd
|
90a37a5f4e
|
竞赛众包的留言修改
|
2014-01-02 17:29:46 +08:00 |
|
nieguanghui
|
8b1264c99e
|
replace table with div + css ---- bids/show
|
2014-01-02 16:07:59 +08:00 |
|
yanxd
|
6d82d2ce17
|
remove table with oneline
|
2014-01-02 15:37:12 +08:00 |
|
nieguanghui
|
2c1e53bfec
|
Merge branch 'wordh' of 10.0.47.245:/home/trustie2 into wordh
|
2014-01-02 15:21:14 +08:00 |
|
nieguanghui
|
f77ecf71f1
|
mpdified project and contest message
|
2014-01-02 15:21:03 +08:00 |
|
yanxd
|
32510028aa
|
论坛留言里发帖的分界
|
2014-01-02 14:48:01 +08:00 |
|
wanglinchun
|
0c8e1e19e6
|
"软件众包"和“创新竞赛”中“关注”及前面星号的隐藏属性设置
|
2013-12-31 15:36:35 +08:00 |
|
wanglinchun
|
fdcb68bd69
|
当用户未登陆的时候，隐藏掉了“软件众包”中的“选为作业”
当用户未登陆的时候，隐藏掉了“项目托管”、“创新竞赛”以及“软件众包” 关注 前的星号
|
2013-12-31 11:12:39 +08:00 |
|
yanxd
|
9cd931cb7f
|
ajax
|
2013-12-30 20:53:48 +08:00 |
|
yanxd
|
ebc803a88a
|
项目留言.
|
2013-12-30 17:13:44 +08:00 |
|
wanglinchun
|
80f40cd1c0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-30 16:28:04 +08:00 |
|
nieguanghui
|
36289eba41
|
modified projects
|
2013-12-30 16:03:28 +08:00 |
|
yanxd
|
4c4e725b5c
|
project leave message.
|
2013-12-30 08:47:45 +08:00 |
|
yanxd
|
42fa7eb4c1
|
dd
|
2013-12-28 13:40:22 +08:00 |
|
yanxd
|
8cb3756bbc
|
首页帖子数量
|
2013-12-28 13:33:04 +08:00 |
|
nieguanghui
|
61116b0495
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/words/_new_respond.html.erb
|
2013-12-28 13:17:00 +08:00 |
|
yanxd
|
69448b36ea
|
字数统计
|
2013-12-28 13:16:22 +08:00 |
|
nieguanghui
|
ae094bde28
|
主页界面修改
|
2013-12-28 13:14:38 +08:00 |
|
yanxd
|
1996283bd4
|
invoke char length js.
|
2013-12-28 12:27:35 +08:00 |
|
yanxd
|
112a2b4da6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/words/_message.html.erb
app/views/words/_new_respond.html.erb
|
2013-12-28 12:19:37 +08:00 |
|
yanxd
|
1b389586ad
|
留言回复人错误
|
2013-12-28 12:16:08 +08:00 |
|
nieguanghui
|
b0bb8b4a48
|
主页界面修改
|
2013-12-28 12:09:56 +08:00 |
|
nieguanghui
|
ed55fe0175
|
1
|
2013-12-28 10:57:56 +08:00 |
|
nieguanghui
|
398e35cf19
|
留言增加字数限制
|
2013-12-28 10:48:10 +08:00 |
|
wanglinchun
|
6ad3505b14
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-27 15:09:56 +08:00 |
|
wanglinchun
|
5b00db37de
|
添加无作业提交时的提示语
|
2013-12-27 13:46:19 +08:00 |
|
yanxd
|
e12922544a
|
链接bug，去掉动态里的文档内容
|
2013-12-27 09:00:50 +08:00 |
|
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 |
|
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 |
|
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
|
64d85a9ab2
|
一部分ajax留言实现
|
2013-12-25 22:21:16 +08:00 |
|
nieguanghui
|
c05dd4f900
|
修改用户页面留言显示样式
|
2013-12-25 21:00:40 +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 |
|
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
|
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
|
99686ec269
|
留言不能是空字符
|
2013-12-21 10:15: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
|
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 |
 huangjingquan
|
e3898ee39d
|
修改了竞赛项目提交不一致问题
|
2013-12-14 12:21:13 +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 |
|
yanxd
|
cefddb635a
|
e
|
2013-12-11 22:19:41 +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 |
|
nieguanghui
|
c27528ffb7
|
1234
|
2013-12-11 16:14:51 +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 |
|
xianbo
|
0f93065ac4
|
imitate github show help doucument
|
2013-12-10 20:18:21 +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
|
f99e5dcc64
|
修改了之前留言回复双重显示的问
|
2013-12-09 16:01:50 +08:00 |
|
xianbo
|
f6b97eed48
|
modify spider say
|
2013-12-09 08:18:03 +08:00 |
|
yanxd
|
c272783f1c
|
工具栏边距调整，讨论区的修改删除功能，项目竞赛边框顶出页面的问题。
|
2013-12-07 10:15:55 +08:00 |