 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 |
|
yanxd
|
d26f274a96
|
Merge branch 'wordh' of 10.0.47.245:/home/trustie2 into wordh
|
2014-01-03 10:33:31 +08:00 |
|
yanxd
|
d114c6abed
|
add remark to words_controller
|
2014-01-03 10:33:06 +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
|
e8a313be6c
|
fixed bug in create leavemessage from bids
|
2014-01-02 20:18:39 +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 |
|
yanxd
|
a7c6461f03
|
move dstinguish origin message into private method
|
2013-12-31 16:09:50 +08:00 |
|
yanxd
|
2070e9dc7f
|
remove memo/messages info from welcome.index
|
2013-12-31 15:48:08 +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
|
8618ad3ede
|
add access methods for delete
|
2013-12-30 20:16:56 +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
|
1d962b98d3
|
model project leave message
|
2013-12-29 19:35:52 +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
|
d9a85e3508
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-28 10:59:01 +08:00 |
|
nieguanghui
|
ed55fe0175
|
1
|
2013-12-28 10:57:56 +08:00 |
|
yanxd
|
997c546083
|
remove html char
|
2013-12-28 10:48:22 +08:00 |
|
nieguanghui
|
398e35cf19
|
留言增加字数限制
|
2013-12-28 10:48:10 +08:00 |
|
yanxd
|
c3cbf87b3d
|
首页排序大概搞定
|
2013-12-27 16:30:45 +08:00 |
|
wanglinchun
|
6ad3505b14
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-27 15:09:56 +08:00 |
|
yanxd
|
8bc5b2ebf5
|
改了论坛回复不会触发修改update字段的问题
|
2013-12-27 15:04:05 +08:00 |
|
yanxd
|
fea1cdff53
|
首页时间排序，可能会引起其他调用event_datetime的问题。待观察
|
2013-12-27 13:54:57 +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 |
|
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 |
|
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 |
|
nieguanghui
|
3966e0bc0b
|
修复课程列表bug
|
2013-11-08 08:57:48 +08:00 |
|
xianbo
|
5032eaabcb
|
fix the show out of the frame and the location of show
|
2013-11-07 19:14:57 +08:00 |
|
yanxd
|
7c4e62cc40
|
add time describe
|
2013-11-07 17:21:32 +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 |
|
nieguanghui
|
50b91e3942
|
修改按钮样式，增加附件过滤
|
2013-11-07 15:58:15 +08:00 |
|
yanxd
|
239a1484ae
|
remove useless code block
|
2013-11-07 14:38:37 +08:00 |
|
fanqiang
|
9996386fe4
|
增加课程留言与项目反馈功能，修改了点击课程作业时tab页显示问题
|
2013-11-07 11:02:32 +08:00 |
|
huangjingquan
|
2fd63c80b3
|
修改了留言显示
|
2013-11-06 17:21:18 +08:00 |
|
huangjingquan
|
6499352d8e
|
修改了无项目时候 新建按钮重复提示
|
2013-11-06 17:00:14 +08:00 |
|
nieguanghui
|
8df3bcf76f
|
修改评分显示颜色，重构课程列表显示部分代码
|
2013-11-06 16:43:07 +08:00 |
|
nieguanghui
|
eeb22ab4a6
|
fix some little bug
|
2013-11-06 15:46:38 +08:00 |
|
xianbo
|
73424b0c59
|
fix
|
2013-11-06 11:14:42 +08:00 |
|
huangjingquan
|
bf2ae17e05
|
修改了数据读取错误
|
2013-11-06 11:10:26 +08:00 |
|
baiyu
|
3c9605c551
|
修复了课程配置里丢失的“开课时间”“结课时间”“课时”
|
2013-11-06 11:06:08 +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 |
|
nieguanghui
|
0c849c3216
|
解决按钮冲突
|
2013-11-06 10:28:18 +08:00 |
|
huangjingquan
|
9d2f7d1c28
|
add the link to projects
|
2013-11-06 09:44:10 +08:00 |
|
baiyu
|
0f3eb9cf87
|
kec
|
2013-11-06 09:25:05 +08:00 |
|
huangjingquan
|
17317da314
|
修改了项目和课程里面配置成员bug
|
2013-11-06 09:13:02 +08:00 |
|
yanxd
|
2d4b9f8c52
|
nothing
|
2013-11-05 21:00:16 +08:00 |
|
yanxd
|
9526f6d67a
|
remove string unkown
|
2013-11-05 20:57:11 +08:00 |
|
nieguanghui
|
be72746a80
|
样式微调
|
2013-11-05 20:51:33 +08:00 |
|
nieguanghui
|
2b10258ae1
|
修改课程列表显示样式
|
2013-11-05 20:46:38 +08:00 |
|
huangjingquan
|
49c22fbec3
|
个人主页课程列表里面添加了学期
|
2013-11-05 20:04:45 +08:00 |
|
yanxd
|
b7027405ce
|
fix some little bug!
|
2013-11-05 16:53:00 +08:00 |
|
xianbo
|
88084990bf
|
fix
|
2013-11-05 15:59:12 +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 |
|
yanxd
|
b6df32e029
|
fix files under_line
|
2013-11-05 11:14:45 +08:00 |
|
huangjingquan
|
b9b0b06185
|
修改了一些链接bug
|
2013-11-05 10:58:23 +08:00 |
|
baiyu
|
231d1f2c4b
|
增加样式修改了各个模块导航条颜色
|
2013-11-05 09:17:36 +08:00 |
|
xianbo
|
8e922ef273
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-05 09:19:52 +08:00 |
|
xianbo
|
c8c4cecccd
|
fix course link location
|
2013-11-05 09:17:50 +08:00 |
|
nieguanghui
|
a80e77bd01
|
修复bug
|
2013-11-05 08:30:33 +08:00 |
|
huangjingquan
|
ee33583ae1
|
修改了竞赛页面
添加了搜索功能
|
2013-11-04 22:09:03 +08:00 |
|
nieguanghui
|
5d83a03e5f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-04 22:01:06 +08:00 |
|
yanxd
|
397eb11dca
|
refactor memberlist
|
2013-11-04 22:00:06 +08:00 |
|
nieguanghui
|
c6824c539b
|
修复作业搜索条出现在竞赛，需求页面的bug
|
2013-11-04 21:58:40 +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
|
2a6171ca52
|
refactor course helper
|
2013-11-04 15:00:08 +08:00 |
|
huangjingquan
|
7e7534041e
|
课程列表新的权限设置
|
2013-11-04 09:57:36 +08:00 |
|
yanxd
|
ce7b2ceba0
|
fix teacher/student search Identifier
|
2013-11-04 09:45:56 +08:00 |
|
huangjingquan
|
c93ca4d2ed
|
添加了作业截止时间提醒功能！
|
2013-11-02 15:43:38 +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 |
|
huangjingquan
|
84327892a9
|
加入/退出课程权限修改
|
2013-11-02 13:00:32 +08:00 |
|
xianbo
|
003b4704cc
|
fix link to
|
2013-11-02 12:42:30 +08:00 |
|
baiyu
|
606b2d0587
|
在我的主页的“课程”列表里加入了“主讲教师”
|
2013-11-02 11:06:22 +08:00 |
|
huangjingquan
|
fb54fcbe86
|
修改了新闻页面两个图像重复bug
|
2013-11-02 10:45:58 +08:00 |
|
huangjingquan
|
09eb16ad9a
|
修改了项目和课程里面成员配置显示错误
|
2013-11-02 10:34:53 +08:00 |
|
huangjingquan
|
ac2b90ecfd
|
退出课程加入权限
|
2013-11-01 16:08:41 +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 |
|
nieguanghui
|
cab092cd04
|
修改课程默认排序方式
|
2013-11-01 11:17:24 +08:00 |
|
nieguanghui
|
583c022048
|
修复作业列表搜索bug
|
2013-11-01 10:48:02 +08:00 |
|
huangjingquan
|
775ebc3607
|
新闻界面添加删除功能
|
2013-11-01 10:01:16 +08:00 |
|
huangjingquan
|
5febe8a58d
|
个人主页课程列表加入了“退出课程”和加入课程按钮
|
2013-11-01 09:06:06 +08:00 |
|
baiyu
|
b2080a4470
|
加入了开课时间，结课时间选项
增加了课时文本框
相应的增加了显示
|
2013-11-01 08:45:24 +08:00 |
|
yanxd
|
0a21b87714
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-01 08:19:08 +08:00 |
|
nieguanghui
|
db25900336
|
修复新建项目的时候相关信息写入丢失bug
|
2013-10-31 22:07:31 +08:00 |
|
nieguanghui
|
75c0480071
|
增加个人活动列表，作业过滤功能，删除课程作业搜索框，修复课程页面以学生角色搜索也会出现新建课程的bug
|
2013-10-31 21:44:10 +08:00 |
|
yanxd
|
54d9566a7b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-31 20:14:27 +08:00 |
|
yanxd
|
b55c5d20a3
|
added activity info from event, warning.
|
2013-10-31 20:13:49 +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
|
67d228142a
|
add the root in bid modify about homework
|
2013-10-31 16:33:15 +08:00 |
|
xianbo
|
9f8c764053
|
modify new cresate is_piublic? and leave some module about select
|
2013-10-31 16:21:34 +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
|
f55a06e76d
|
1、"活动“变成了动态，”只看自己“改成了”我的动态“
2、解释了项目是什么
|
2013-10-30 22:04:47 +08:00 |
|
baiyu
|
9b9745ea0a
|
对于应标需求，提交作业，提交竞赛作品成功后闪出的flash做了区别
|
2013-10-30 21:46:40 +08:00 |
|
baiyu
|
5fb0bc945c
|
修改了删除“我的账号”后的小问题
|
2013-10-30 21:22:44 +08:00 |
|
yanxd
|
b617f3d42f
|
fix my welcome#index bug
|
2013-10-30 21:15:00 +08:00 |
|
baiyu
|
9319a7f87b
|
去掉了top_bar上“我的账号”
|
2013-10-30 21:10:28 +08:00 |
|
yanxd
|
868025bb40
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-30 20:57:17 +08:00 |
|
yanxd
|
67216ca463
|
fix back_url bug
|
2013-10-30 20:56:24 +08:00 |
|
huangjingquan
|
b113719b46
|
课程里面添加了图片上传功能
|
2013-10-30 20:50:35 +08:00 |
|
yanxd
|
8a37f924f9
|
remove nyancss
|
2013-10-30 20:30:56 +08:00 |
|
yanxd
|
dd0c087209
|
rest tan backurl
|
2013-10-30 11:23:40 +08:00 |
|
nieguanghui
|
224a194759
|
修复成员 bug，修复作业显示bug‘
|
2013-10-30 10:45:37 +08:00 |
|
xianbo
|
1f419c936d
|
del the back_url to let the different identity change has a correct url
|
2013-10-30 08:51:58 +08:00 |
|
xianbo
|
1f09bfbab1
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-28 20:09:43 +08:00 |
|
xianbo
|
e9856b3524
|
modify the style of the projects witch show
|
2013-10-28 20:09:15 +08:00 |
|
nieguanghui
|
1f8c10e48a
|
修复bug
|
2013-10-28 08:51:15 +08:00 |
|
xianbo
|
cbe22e4e60
|
modify the judge of the nil class of identity in app/views/bids/_project_list.html.erb
|
2013-10-26 15:04:00 +08:00 |
|
yanxd
|
6dec8a9312
|
share previews
|
2013-10-25 15:46:14 +08:00 |
|
xianbo
|
a50aff3fb4
|
1.add special reward
2.give a root controller in bid controller && give the administrator the root can change the reward who is deadine.
|
2013-10-24 20:36:57 +08:00 |
|
xianbo
|
2fa6276829
|
fix natural
|
2013-10-24 10:13:37 +08:00 |
|
nieguanghui
|
39580a04a2
|
修复项目列表成员显示bug
|
2013-10-24 09:46:22 +08:00 |
|
xianbo
|
21ffbe637e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/projects/_project.html.erb
app/views/projects/member.html.erb
app/views/users/index.html.erb
config/locales/zh.yml
db/schema.rb
files/2013/10/131007102834__my_course.html.erb
|
2013-10-24 08:33:07 +08:00 |
|
xianbo
|
2589d429b0
|
add the project what one watch
|
2013-10-24 08:24:56 +08:00 |
|
yanxd
|
666806ae28
|
fixed little bug
|
2013-10-22 16:15:27 +08:00 |
|
yanxd
|
df73f34e71
|
share linkto better
|
2013-10-22 14:46:33 +08:00 |
|
nieguanghui
|
cf40f9ff02
|
fix course list bug
|
2013-10-22 10:02:49 +08:00 |
|
yanxd
|
4bef2eee24
|
course can be shared files by project's member
|
2013-10-22 09:02:48 +08:00 |
|
nieguanghui
|
5ce9bcdb2c
|
解决竞赛，需求，作业列表搜索bug
|
2013-10-21 21:16:41 +08:00 |
|
xianbo
|
3f4a60b462
|
fix show
|
2013-10-21 14:43:22 +08:00 |
|
xianbo
|
5a1bb0f2d4
|
fix bug in arrange to net
|
2013-10-21 11:21:07 +08:00 |
|
nieguanghui
|
b04fe3d1bb
|
增加项目评分 个人评分 ，个人在项目中的评分机制
|
2013-10-21 09:42:09 +08:00 |
|
yanxd
|
5d0b5812b3
|
share completed with fq, xianbo
|
2013-10-21 08:57:55 +08:00 |
|
yanxd
|
dde65a5895
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-21 08:52:02 +08:00 |
baiyu
|
a44713ba6d
|
修改了需求页面显示
|
2013-10-19 16:16:54 +08:00 |
|
baiyu
|
ecdeaf123e
|
修改了部分国际化
|
2013-10-19 15:39:53 +08:00 |
|
baiyu
|
0206d3f2c3
|
需求里面添加了用户和项目与需求的联系
|
2013-10-19 09:35:14 +08:00 |
|
yanxd
|
e2447b4c88
|
truncate textilizable
|
2013-10-18 10:00:06 +08:00 |
|
baiyu
|
9fa9aa0fb8
|
“返回课程”“返回主页”按钮变色。改边距，边框变圆润
|
2013-10-17 16:22:26 +08:00 |
|
yanxd
|
ab5d8853b5
|
fixed issue#314
|
2013-10-17 16:14:35 +08:00 |
|
yanxd
|
081a8e9825
|
fixed issue#319
|
2013-10-17 10:31:41 +08:00 |
|
baiyu
|
8ec86a27c4
|
xuehao
|
2013-10-16 22:14:49 +08:00 |
|
baiyu
|
5b48826faf
|
修改了学号显示错误
|
2013-10-16 22:10:58 +08:00 |
|
baiyu
|
1be0a7d23f
|
修改了“返回个人主页”和“返回课程”，修改了样式
|
2013-10-16 22:02:05 +08:00 |
|
baiyu
|
19b030dd23
|
修改了需求和作业列表显示混乱
|
2013-10-16 21:46:54 +08:00 |
|
yanxd
|
abe52df8d0
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-16 21:11:46 +08:00 |
|
yanxd
|
332bc0765d
|
240 characters or less limited in activity info. ===> projects#show
|
2013-10-16 21:10:30 +08:00 |
|
xianbo
|
520c5843ce
|
modify homework show and the link of style
|
2013-10-16 17:02:38 +08:00 |
|
yanxd
|
534457547e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-16 10:59:49 +08:00 |
|
yanxd
|
69869a05c9
|
reverse projects list, add explain to role.
|
2013-10-16 10:58:21 +08:00 |
 huangjingquan
|
29e2a4c70b
|
修改了作业提交时学号显示错误
作业页面增加了内容
|
2013-10-16 10:53:11 +08:00 |
|
huangjingquan
|
41a74a5254
|
提示信息国际化
|
2013-10-16 09:20:37 +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 |
|
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 |
|
baiyu
|
8335c111c7
|
1、修改了“加入课程”位置
2、修改了我的账号里的格式
|
2013-10-15 09:42:27 +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 |
|
huangjingquan
|
6e10f16c68
|
添加了注释
修改了作业提交显示错误（显示成需求）
|
2013-10-14 22:40:34 +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
|
0238001721
|
modify destroy project and user can't destroy biding_project
|
2013-10-14 20:57:31 +08:00 |
|
xianbo
|
8c675c2a96
|
add show about setting about course
|
2013-10-14 16:38:52 +08:00 |
|
xianbo
|
abc163887e
|
fix
|
2013-10-14 16:38:51 +08:00 |
|
fanqiang
|
2fbf025c2f
|
调整需求的评价，隐藏个人账户的首选项内容
|
2013-10-14 10:09:10 +08:00 |
|
huangjingquan
|
bcb66f2b32
|
在个人主页项目里面添加新建按钮
|
2013-10-13 15:26:41 +08:00 |
|
huangjingquan
|
673850bd03
|
fix
|
2013-10-12 17:42:19 +08:00 |
|
huangjingquan
|
19ebd48a95
|
修改了作业列表无法显示
|
2013-10-12 17:21:50 +08:00 |
|
huangjingquan
|
00cef03049
|
修改了个人主页里关注需求全部需求改成只关注的需求
|
2013-10-12 16:23:25 +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 |
|
yanxd
|
a5cdbc8e92
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-12 10:37:37 +08:00 |
|
yanxd
|
f1a31c7f6b
|
提升头像图片显示分辨力
|
2013-10-12 10:36:50 +08:00 |
|
xianbo
|
d3f46adc34
|
fix
|
2013-10-12 10:08:45 +08:00 |
|
xianbo
|
fd14457446
|
add delete homework in course
|
2013-10-12 10:05:31 +08:00 |
|
xianbo
|
d7f7ff5fa9
|
delete homework
|
2013-10-12 10:05:30 +08:00 |
|
huangjingquan
|
8ce8de09cb
|
修改了个人主页课程列表
|
2013-10-12 08:53:45 +08:00 |
|
huangjingquan
|
c49209cbfb
|
将课程和作业分开
作业单独一个tabs
|
2013-10-11 20:25:24 +08:00 |
|
huangjingquan
|
508eee45f2
|
修改了加入课程弹框显示错误！
|
2013-10-11 09:27:07 +08:00 |
|
baiyu
|
6676110b11
|
修改了教授丢失
|
2013-10-11 09:05:03 +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 |
|
fanqiang
|
962842d841
|
修改了提交作业数量显示问题，修改了创建需求的种类选择问题
|
2013-10-10 21:56:27 +08:00 |
|
huangjingquan
|
ff21bca683
|
修改了老师访问学生页面的时候bug
|
2013-10-10 21:43:49 +08:00 |
|
xianbo
|
956aa3d0c1
|
remove forum block in course setting
|
2013-10-10 21:41:42 +08:00 |
|
huangjingquan
|
e25425d9a7
|
用户看别人课程主页时显示问题
|
2013-10-10 21:33:52 +08:00 |
|
nieguanghui
|
8703709bd0
|
解决了课程创建时设置私有依旧显示在课程列表的bug
|
2013-10-10 21:11:42 +08:00 |
 wanglinchun
|
48a0f2f409
|
个人主页，课程相关国际化
|
2013-10-10 17:07:43 +08:00 |
|
huangjingquan
|
a0c6a183fe
|
修改了个人主页的关注需求里面只显示需求不显示作业
|
2013-10-10 16:04:59 +08:00 |
|
xianbo
|
543279eb84
|
add course filter
|
2013-10-10 15:05:27 +08:00 |
|
huangjingquan
|
64cddc8687
|
修改了课程设置里面bug
角色改成英文
|
2013-10-10 10:36:56 +08:00 |
|
xianbo
|
b0d413a216
|
modify the admin select
|
2013-10-10 10:22:32 +08:00 |
|
xianbo
|
677bc4060b
|
fix bug about delete project
|
2013-10-09 22:31:57 +08:00 |
|
xianbo
|
3b6f0e3d34
|
modify delete project and user and define a course is a public
|
2013-10-09 22:26:03 +08:00 |
|
huangjingquan
|
72f2793b0a
|
修改了关注的显示
|
2013-10-09 21:53:07 +08:00 |
|
xianbo
|
ad597695f5
|
fix register user.current bug
and course is show or hidden
|
2013-10-09 20:56:15 +08:00 |
|
huangjingquan
|
bf081b95bd
|
学生自己的主页课程里面添加加入课程链接
竞赛里面 修复列表排序bug
新建竞赛的时候 修复了几个bug
|
2013-10-09 17:27:42 +08:00 |
|
baiyu
|
0226785f51
|
作业“关注”居左
|
2013-10-09 17:00:09 +08:00 |
|
baiyu
|
011c38988a
|
需求列表显示
|
2013-10-09 16:50:20 +08:00 |
|
fanqiang
|
c75391b3a0
|
修改了加入课程窗口里文本框的长度
|
2013-10-09 16:47:54 +08:00 |
|
huangjingquan
|
82ce0ac8da
|
修改了参加竞标成提交作业
|
2013-10-09 16:46:56 +08:00 |
|
baiyu
|
39c45dff30
|
1、修改了注册里的问题
2、作业名称改为靠左
3、修改了提交作业、参加竞赛等混乱
4、修改了top bar的字体大小
|
2013-10-09 16:41:02 +08:00 |
|
huangjingquan
|
2a959a9b65
|
添加了学号
|
2013-10-09 16:28:24 +08:00 |
|
huangjingquan
|
9e77d3e001
|
修改了作业课程里面一些Bug
|
2013-10-09 16:14:11 +08:00 |
|
fanqiang
|
7d2bdbc935
|
在课程列表中添加加入课程按钮
在课程主页中添加关注按钮，修改加入课程和关注的样式
修改作业列表中提交作业的数量显示问题
|
2013-10-09 16:04:23 +08:00 |
|
huangjingquan
|
b14f0e2901
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-08 22:21:24 +08:00 |
|
huangjingquan
|
e19fe844a2
|
新增
|
2013-10-08 22:20:48 +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 |
|
huangjingquan
|
08aa5be7df
|
解决我的作业不显示问题
|
2013-10-07 22:50:20 +08:00 |
|
baiyu
|
e5d06702c4
|
修改了新建“需求”的提示
修改了课程图标
|
2013-10-07 22:31:28 +08:00 |
|
huangjingquan
|
cab5fb8b52
|
新的
|
2013-10-07 22:23:42 +08:00 |
|
nieguanghui
|
606c998247
|
修改课程列表显示内容，修复作业列表显示bug
|
2013-10-07 18:55:19 +08:00 |
|
fanqiang
|
bf6fe70ec9
|
修改了作业的fork界面显示提示内容
|
2013-10-07 11:02:23 +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 |
|
yanxd
|
3ec4e14bfd
|
fix sources bugs from zhangyang tmp code
|
2013-09-30 15:31:46 +08:00 |
|
baiyu
|
2a9cb28c4e
|
1、修改了国际化
2、增加了课程“年度”“学期”
3、主讲教师显示bug
|
2013-09-30 11:02:04 +08:00 |
|
huangjingquan
|
43a0a875f4
|
修改课程创建问题
|
2013-09-30 10:38:30 +08:00 |
|
huangjingquan
|
5c6bf7f9c8
|
修改课程退出的权限
|
2013-09-30 10:30:43 +08:00 |
|
huangjingquan
|
9c0b68460a
|
修改课程与企业样式
|
2013-09-30 09:42:13 +08:00 |
|
huangjingquan
|
b6ca2c3d74
|
修改了讨论区bug
|
2013-09-29 20:04:03 +08:00 |
|
fanqiang
|
838894a19c
|
修改了需求评分功能，以及作业的提交
|
2013-09-29 19:58:57 +08:00 |
|
huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
2013-09-29 19:46:59 +08:00 |
|
fanqiang
|
9fbccfbb6d
|
改了一些问题
创建课程问题
添加了需求的FORK功能
|
2013-09-28 23:08:24 +08:00 |
|
baiyu
|
aed36229f8
|
修改了issues里“顶”和“踩”图标的位置
|
2013-09-28 16:03:23 +08:00 |
 william
|
da82a630e9
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into tmp1
Conflicts:
app/controllers/bids_controller.rb
app/helpers/bids_helper.rb
config/locales/zh.yml
db/schema.rb
|
2013-09-28 10:36:44 +08:00 |
|
william
|
a8c3808053
|
优化需求结束的展示方式。另外需求的货币奖励方式暂缺。
|
2013-09-28 10:00:40 +08:00 |
|
william
|
0be9de3a17
|
tag搜索中相关tag改成只显示10个，另外统一了按钮风格（除去留言按钮）
|
2013-09-27 16:02:49 +08:00 |
|
william
|
4f72b68442
|
bug 修复。
|
2013-09-27 15:02:22 +08:00 |
|
william
|
2079c87362
|
增加tag删除。
|
2013-09-27 14:58:51 +08:00 |
|
baiyu
|
6e4e5ec577
|
修改了“顶”和“踩”的图标
|
2013-09-26 21:01:17 +08:00 |
|
fanqiang
|
4641f8cd63
|
修改引用作业中的显示样式
|
2013-09-26 10:10:53 +08:00 |
|
fanqiang
|
781fa32dbb
|
添加了需求的fork功能
|
2013-09-26 09:06:29 +08:00 |
|
baiyu
|
436569c88d
|
1、修改了location和identity不能显示的问题
2、修改了学号框样式
|
2013-09-25 17:20:40 +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 |
|
william
|
61e4021625
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/controllers/bids_controller.rb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
config/locales/zh.yml
config/routes.rb
lib/redmine.rb
|
2013-09-24 09:52:08 +08:00 |
|
william
|
7d919fd3c3
|
Merge branch 'liuping' into develop
Conflicts:
app/helpers/bids_helper.rb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
config/locales/zh.yml
db/schema.rb
|
2013-09-24 09:14:21 +08:00 |
|
william
|
09fb972c96
|
分支合并
|
2013-09-24 09:05:07 +08:00 |
|
william
|
cdad47f0cc
|
切换分支 添加应标项目评价显示
|
2013-09-23 21:54:07 +08:00 |
|
xianbo
|
8ff8d0f4d4
|
modify some little bug && merge handle
|
2013-09-23 21:47:07 +08:00 |
|
william
|
006f381a05
|
新增需求结束方式
|
2013-09-23 20:19:42 +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 |
|
william
|
dcbaf1c02b
|
增加需求结束方法。
|
2013-09-23 20:12:32 +08:00 |
baiyu
|
4fb040bc61
|
modify register bug
|
2013-09-23 16:42:19 +08:00 |
|
huangjingquan
|
c7c5ae54e5
|
课程里面新建会跳到项目里面！
|
2013-09-23 15:44:32 +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
|
2d6fdc1d5a
|
资料权限问题
|
2013-09-23 09:32:04 +08:00 |
|
huangjingquan
|
3536883248
|
课程合并
|
2013-09-23 08:44:48 +08:00 |
 baiyu
|
1c4f7f99e8
|
一些修订
|
2013-09-22 16:11:39 +08:00 |
|
baiyu
|
c2302dc0c7
|
增加了附件删除功能
修改用户主页中课程与项目之间的关系
用户课程页面中的作业进行了按课程分组
|
2013-09-18 22:56:01 +08:00 |
|
baiyu
|
a7b500f5e7
|
修正了“注册”和“我的账号”的显示格式
|
2013-09-16 21:56:12 +08:00 |
|
nieguanghui
|
45178e178f
|
fix the projects's present bug
|
2013-09-16 21:47:46 +08:00 |
|
huangjingquan
|
960b59c807
|
修改了部分小bug
|
2013-09-16 10:56:37 +08:00 |
|
fanqiang
|
17dc3bc3a9
|
修改新建需求界面
|
2013-09-16 09:36:38 +08:00 |
|
fanqiang
|
9d2ea5639f
|
添加自动生成课程标识功能
|
2013-09-16 08:58:53 +08:00 |
|
huangjingquan
|
466922d13b
|
修改了上次会议提出的几点
|
2013-09-16 08:49:39 +08:00 |
|
fanqiang
|
671b81035c
|
修改课程部分的权限设置，并且修改了作业的侧边栏显示
|
2013-09-15 16:49:19 +08:00 |
|
fanqiang
|
50894d8950
|
将新闻添加进活动
|
2013-09-15 09:33:51 +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 |
|
fanqiang
|
131c5ba31b
|
修改留言功能
|
2013-09-14 08:45:18 +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 |
|
fanqiang
|
602e3dc3fa
|
修改个人主页
|
2013-09-12 17:19:51 +08:00 |
|
huangjingquan
|
261c3fc337
|
new version
|
2013-09-12 10:41:15 +08:00 |
|
baiyu
|
7e40999e06
|
1、增加了“注册”里的“身份”
2、增加了“我的账号”里的“工作单位”
|
2013-09-12 09:06:21 +08:00 |
|
baiyu
|
a2cc191a4e
|
1、增加“我的账号”里的了工作单位
2、增加了“注册”里的“身份”
|
2013-09-12 08:38:47 +08:00 |
|
kaizheng
|
4dfffabb67
|
用户列表，需求列表，项目列表，用户粉丝列表，欢迎页面等英文页面解决单复数问题
|
2013-09-11 20:54:01 +08:00 |
|
nieguanghui
|
d14b88f07f
|
修复管理员界面搜索bug
|
2013-09-10 21:09:42 +08:00 |
|
nieguanghui
|
68145ef5f7
|
优化排序显示，修改搜索页面显示
|
2013-09-10 21:02:29 +08:00 |
|
baiyu
|
9c6ab39527
|
修改了issue的history不换行问题
|
2013-09-09 10:24:32 +08:00 |
|
xianbo
|
7dbcc1520c
|
course add data
|
2013-09-06 16:40:07 +08:00 |
|
xianbo
|
1e7d127998
|
new course table
|
2013-09-06 16:39:38 +08:00 |
|
nieguanghui
|
7490806bf3
|
默认排序方式更改
|
2013-09-06 09:25:02 +08:00 |
|
huangjingquan
|
578c757e29
|
统一了时间格式
|
2013-09-04 22:34:17 +08:00 |
|
baiyu
|
939da70402
|
修改了git使用方法
|
2013-09-04 22:22:56 +08:00 |
|
huangjingquan
|
55499db0ab
|
修改了英文版新闻评论被挤换行问题
英文版项目setting显示超出
|
2013-09-04 22:19:59 +08:00 |
|
nieguanghui
|
d34df19a7a
|
fix watch little bug
|
2013-09-04 17:36:08 +08:00 |
yanxd
|
5c1926f186
|
fix issue189
|
2013-09-03 22:26:33 +08:00 |
|
huangjingquan
|
ca09583fa5
|
修改了英文关注和粉丝重复显示错误
|
2013-09-03 09:16:40 +08:00 |
|
baiyu
|
e4d726bbfa
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-09-02 22:02:25 +08:00 |
|
huangjingquan
|
f2ead4dae2
|
项目界面sidebar
|
2013-09-02 22:02:47 +08:00 |
|
baiyu
|
f66e57e5b5
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-09-02 22:00:49 +08:00 |
|
xianbo
|
e0336e6d9e
|
modify the usage of git
|
2013-09-02 21:45:27 +08:00 |
Administrator
|
07b0409c57
|
delete UTC
|
2013-09-02 21:40:48 +08:00 |
|
Administrator
|
f0791fe132
|
modify created project info as a fist activity
|
2013-09-02 21:32:15 +08:00 |
|
baiyu
|
a7983fec8f
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-09-02 21:06:26 +08:00 |
|
baiyu
|
5dd8ca1f37
|
1、修改了git的用法
2、修改了国际化
|
2013-09-02 21:06:08 +08:00 |
|
huangjingquan
|
a318266c60
|
修改用户列表tabs显示bug
|
2013-09-02 20:37:41 +08:00 |
|
xianbo
|
f882a2d9b4
|
modify 国际化
|
2013-09-02 15:11:40 +08:00 |
|
huangjingquan
|
77a47797d2
|
user列表
|
2013-09-02 15:01:20 +08:00 |
|
huangjingquan
|
0aeb56f8f7
|
修改了按钮/用户反馈框显示错误
|
2013-09-02 13:29:46 +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 |
|
kaizheng
|
3d729df268
|
页面字体统一，登陆框异常排除，部分国际化
|
2013-08-31 17:04:11 +08:00 |
|
huangjingquan
|
faef617a45
|
tabs显示
图像链接
|
2013-08-30 22:09:23 +08:00 |
|
huangjingquan
|
47185bdcc2
|
修改用户 -用户反馈显示异常
|
2013-08-30 16:07:51 +08:00 |
|
huangjingquan
|
fe0845d475
|
天剑图片链接，tabs样式
|
2013-08-30 15:19:52 +08:00 |
zhangyang
|
4d82cad51d
|
move 2013.8.29
|
2013-08-30 09:34:21 +08:00 |
|
fanqiang
|
0e0ddba493
|
留言
|
2013-08-29 21:56:20 +08:00 |
|
yan
|
7b2a73f55d
|
fix news/ attachment
|
2013-08-29 20:30:24 +08:00 |
|
baiyu
|
b26fec0749
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
config/locales/zh.yml
|
2013-08-28 21:19:55 +08:00 |
|
baiyu
|
a04528116c
|
1、回复框
2、主页字体及位置调整
|
2013-08-28 21:15:54 +08:00 |
|
fanqiang
|
0e2121b956
|
添加项目反馈中的回复功能
|
2013-08-28 21:10:42 +08:00 |
|
kaizheng
|
482600e2ed
|
项目按钮位置修正
|
2013-08-28 20:57:02 +08:00 |
|
william
|
bb96536a1e
|
1.完全重写了tag搜索页面的显示方式，修复了由于分页引起的bug；
2.给需求添加了赞和踩；
|
2013-08-28 20:36:27 +08:00 |
|
Administrator
|
ee551d220d
|
问题中留言按钮改为文字
|
2013-08-28 20:22:57 +08:00 |
|
nieguanghui
|
03415891f5
|
增加需求描述
|
2013-08-28 20:16:40 +08:00 |
|
kaizheng
|
574362dcf6
|
修改了menu按钮错误
logo图片
|
2013-08-28 16:25:13 +08:00 |
|
fanqiang
|
b4b4956ab7
|
添加留言删除前身份确认，修改活动列表中问题部分的显示，添加了项目信息
|
2013-08-28 15:29:18 +08:00 |
|
william
|
7fbe7f4de6
|
修改标签的搜索显示
|
2013-08-28 10:57:06 +08:00 |
|
nieguanghui
|
fa27d3bf32
|
增加项目和用户的排序功能
|
2013-08-28 09:34:54 +08:00 |
|
kaizheng
|
1510a6466e
|
主页链接，国际化，显示
|
2013-08-27 22:19:07 +08:00 |
|
fanqiang
|
d043a1fb9d
|
登录提示bug
|
2013-08-27 22:15:12 +08:00 |
|
fanqiang
|
7350b692d5
|
修改用户与需求的侧边栏
|
2013-08-27 21:06:02 +08:00 |
|
baiyu
|
cd29cd588e
|
修改“如何提交代码”为“查看如何提交代码”
修改导航栏的边角，变圆润
|
2013-08-27 20:43:30 +08:00 |
|
fanqiang
|
4729c68933
|
修改了一个样式
|
2013-08-27 20:07:01 +08:00 |
|
kaizheng
|
bb0ebf06d8
|
Lauout留言国际化
|
2013-08-27 16:36:09 +08:00 |
|
fanqiang
|
2210378bc7
|
修改留言提醒样式
|
2013-08-27 16:26:35 +08:00 |
|
kaizheng
|
0d447cae2c
|
活动显示分类国际化，需求反馈图标引用、删除国际化，留言图标引用、删除国际化
|
2013-08-27 16:17:52 +08:00 |
|
fanqiang
|
129fe6a2fc
|
修改项目应标显示问题
|
2013-08-27 15:28:39 +08:00 |
|
william
|
638c74b177
|
添加了2个rb文件 tags/_pagination.html.erb,tags/_sidebar_tags.html.erb
|
2013-08-27 11:28:20 +08:00 |
|
william
|
0c22d409fc
|
添加写project_status和user_status两表的方法，
在关注中写这2个表，
重构了tag的过滤方法，
拿掉了user_extension.rb.
|
2013-08-27 11:27:25 +08:00 |
|
fanqiang
|
c7beefa556
|
修改用户活动页面，添加了过滤功能。修改留言中引用和删除功能的显示问题
|
2013-08-27 11:09:34 +08:00 |
|
baiyu
|
eacb4ff66a
|
修改了git用法的样式
|
2013-08-27 10:39:44 +08:00 |
|
huangjingquan
|
11c52fde6d
|
统一了用户、项目主页所有用户列表风格
|
2013-08-27 09:26:56 +08:00 |
|
huangjingquan
|
92dfea34ad
|
增加项目关注人列表
|
2013-08-27 09:09:34 +08:00 |
|
huangjingquan
|
70f7e8423a
|
去掉用户主页不必要的链接
|
2013-08-26 20:38:10 +08:00 |
|
fanqiang
|
cd41653747
|
修改关注需求的显示
|
2013-08-26 11:07:17 +08:00 |
|
zhangyang
|
4f2b26a9c5
|
修正问题bug
|
2013-08-25 21:53:26 +08:00 |
|
huangjingquan
|
8b82115941
|
修改留言提醒样式
|
2013-08-25 21:47:40 +08:00 |
|
baiyu
|
72b37a915a
|
添加留言提醒
|
2013-08-25 20:19:44 +08:00 |
|
xianbo
|
89150e8930
|
modify some little bug
|
2013-08-24 16:32:05 +08:00 |
|
huangjingquan
|
ed261d6207
|
tabs“设置”按钮显示，需求字体颜色
|
2013-08-24 15:41:58 +08:00 |
|
huangjingquan
|
c210ec462c
|
门户最终版本
|
2013-08-22 23:39:21 +08:00 |
|
huangjingquan
|
eaf354adad
|
主页修改
|
2013-08-22 23:15:28 +08:00 |
|
kaizheng
|
765c9fd6e8
|
稍该国际化
|
2013-08-22 22:43:40 +08:00 |
|
huangjingquan
|
832e075d58
|
主页描述
|
2013-08-22 22:39:35 +08:00 |
|
Administrator
|
1b43ce386c
|
modify
|
2013-08-22 22:30:24 +08:00 |
|
baiyu
|
3e711de070
|
修改国际化
|
2013-08-22 22:07:31 +08:00 |
|
huangjingquan
|
767e9b75a4
|
粉丝/关注列表用户时间修改，用户反馈修改普通用户能删除它们反馈！
|
2013-08-22 21:54:52 +08:00 |
|
huangjingquan
|
9949a281ec
|
修改问题-历史相关 描述
|
2013-08-22 20:54:55 +08:00 |
|
kaizheng
|
d7f4363db6
|
新建需求修改国际化
|
2013-08-22 20:38:54 +08:00 |
|
baiyu
|
074e8adfdd
|
修改需求页面的一些细节，修改了更新问题的权限，现在更新问题的角色包括超级管理员，管理员，问题创建者，问题指派人员
|
2013-08-22 20:26:56 +08:00 |
|
Administrator
|
83ff8a31c1
|
test
|
2013-08-22 16:42:13 +08:00 |
|
Administrator
|
36e0113f73
|
modify
|
2013-08-21 22:14:02 +08:00 |
|
kaizheng
|
e53a9634a2
|
新建需求国际化
|
2013-08-21 21:02:28 +08:00 |
|
kaizheng
|
997e4a1751
|
稍该国际化。
|
2013-08-21 16:53:40 +08:00 |
|
zhangyang
|
38ed91746f
|
修正了讨论区部分问题；version部分问题
|
2013-08-21 16:43:47 +08:00 |
|
baiyu
|
d92755f805
|
修改需求列表
|
2013-08-21 09:46:22 +08:00 |
|
william
|
2f338b352a
|
给管理员添加了tag删除功能
|
2013-08-21 08:57:15 +08:00 |
|
baiyu
|
96dfe0a6da
|
修改需求列表
|
2013-08-20 22:05:11 +08:00 |
|
baiyu
|
6670ddcf9d
|
修改新建需求界面
|
2013-08-20 21:43:29 +08:00 |
|
kaizheng
|
b74acf7d7e
|
主页需求部分国际化
|
2013-08-20 21:25:02 +08:00 |
|
kaizheng
|
4566525956
|
稍微国际化
|
2013-08-20 20:45:21 +08:00 |
|
huangjingquan
|
2af1c2ed90
|
需求列表无“关注”、“应标项目”时，显示暂无...
|
2013-08-20 20:33:35 +08:00 |
|
huangjingquan
|
b100754b96
|
无“标签”时显示“暂无标签”
|
2013-08-20 20:20:51 +08:00 |
|
huangjingquan
|
68240c6f8f
|
需求列表
|
2013-08-20 20:00:52 +08:00 |
|
baiyu
|
e12b04dd4f
|
需求
|
2013-08-20 19:48:39 +08:00 |
|
baiyu
|
a14460cef9
|
修改新建需求时的校验问题
|
2013-08-20 17:34:33 +08:00 |
|
baiyu
|
1290a008fc
|
修改新建需求界面
|
2013-08-20 16:32:45 +08:00 |
|
nieguanghui
|
71d6dc6d21
|
增加用户活动评论数显示
|
2013-08-20 15:12:49 +08:00 |
|
kaizheng
|
fba39b4b00
|
稍该国际化
|
2013-08-20 09:39:36 +08:00 |
|
nieguanghui
|
0f841abbd0
|
增加活动列表评论数显示
|
2013-08-19 20:53:19 +08:00 |
|
william
|
7caa5673e7
|
修改js bug。
|
2013-08-19 20:54:58 +08:00 |
|
kaizheng
|
8c3d3bdeda
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-19 20:11:04 +08:00 |
|
kaizheng
|
69119f73fe
|
国际化修改
|
2013-08-19 20:09:43 +08:00 |
|
baiyu
|
276a57695b
|
修改了git使用说明（中英文）
|
2013-08-19 20:04:32 +08:00 |
|
zhangyang
|
9a3f362a47
|
再一次提交
|
2013-08-19 19:55:37 +08:00 |
|
zhangyang
|
775dbb313c
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-19 19:54:34 +08:00 |
|
zhangyang
|
d97624b07e
|
问题过滤
|
2013-08-19 19:54:00 +08:00 |
|
william
|
d62ad9e863
|
给tag search结果添加了分页。
|
2013-08-19 17:28:59 +08:00 |
|
Administrator
|
dc83d2e7e9
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-19 17:07:32 +08:00 |
|
Administrator
|
02239e8cd2
|
modify
|
2013-08-19 17:07:07 +08:00 |
|
nieguanghui
|
a126083579
|
用户主页头像显示改进
|
2013-08-19 16:41:22 +08:00 |
|
Administrator
|
9dc4fcaa8e
|
add logger info
|
2013-08-19 10:24:02 +08:00 |
|
Administrator
|
fee81455db
|
修改国际化
|
2013-08-19 08:48:21 +08:00 |
|
william
|
09b98cbcc6
|
tag search bugs modified。
|
2013-08-19 08:44:01 +08:00 |
|
william
|
6521ab2ce9
|
更换顶踩图标，添加对需求的tag搜索，重新美化了tag的搜索页面
|
2013-08-17 11:16:42 +08:00 |
|
william
|
711a32e929
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-17 11:15:24 +08:00 |
|
kaizheng
|
5115d606ff
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-17 11:03:59 +08:00 |
|
nieguanghui
|
ffbef4fbb7
|
bid图片显示名字
|
2013-08-17 10:57:58 +08:00 |
|
kaizheng
|
516d213ac4
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-17 10:49:56 +08:00 |
|
kaizheng
|
7c634dc5f3
|
稍该国际化
|
2013-08-17 10:45:14 +08:00 |
|
nieguanghui
|
647781effa
|
增加粉丝和关注处更多的链接
|
2013-08-17 10:44:25 +08:00 |
|
Administrator
|
14fb820df3
|
修正 注册
|
2013-08-17 10:34:19 +08:00 |
|
baiyu
|
2e0502c28e
|
修改项目留言的显示问题
|
2013-08-17 10:27:38 +08:00 |
|
zhangyang
|
6498d6913a
|
添加新建项目主题查询功能
|
2013-08-17 10:24:00 +08:00 |
|
zhangyang
|
df1c578ff3
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-17 10:21:03 +08:00 |
|
zhangyang
|
9ec927d215
|
添加新建问题主题查询
|
2013-08-17 10:17:26 +08:00 |
|
zhangyang
|
eceecc1380
|
新建问题主题添加查询
|
2013-08-17 10:10:52 +08:00 |
|
william
|
c610f7c1ce
|
顶和踩图标更换
|
2013-08-17 08:35:55 +08:00 |
|
baiyu
|
e7716912b5
|
增加了git使用说明文档
在主页增加了用户对系统的反馈
|
2013-08-16 22:53:28 +08:00 |
|
Administrator
|
8dd2d4a39a
|
修正版本库
|
2013-08-16 22:43:44 +08:00 |
|
huangjingquan
|
6977c851fb
|
修改问题列表-新建问题位置
|
2013-08-16 21:17:43 +08:00 |
|
nieguanghui
|
01a80f0eeb
|
修复 bug
|
2013-08-16 20:51:09 +08:00 |
|
kaizheng
|
386c7c6067
|
稍该国际化
|
2013-08-16 20:30:27 +08:00 |
|
nieguanghui
|
4d4101efcf
|
修改活动列表描述只显示一行
|
2013-08-16 20:23:26 +08:00 |
|
huangjingquan
|
525cd70b62
|
修改成非本人不能删除其他人留言
|
2013-08-16 15:19:39 +08:00 |
|
fanqiang
|
715c988656
|
修改新建项目BUG
|
2013-08-15 18:55:24 +08:00 |
|
Administrator
|
78c8e2a20d
|
新改
|
2013-08-15 18:50:44 +08:00 |
|
Administrator
|
90885a4eb5
|
修改版本库
|
2013-08-15 10:52:11 +08:00 |
|
huangjingquan
|
87ea299297
|
对齐
|
2013-08-15 10:46:11 +08:00 |
|
nieguanghui
|
b0e5baafaf
|
解决问题显示不清晰的bug
|
2013-08-15 10:32:10 +08:00 |
|
huangjingquan
|
0a3999b138
|
无动态时字体显示
|
2013-08-15 10:31:22 +08:00 |
|
Administrator
|
f08ab23492
|
修复版本库
|
2013-08-15 10:29:15 +08:00 |
|
nieguanghui
|
8b9793cace
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-15 10:18:40 +08:00 |
|
nieguanghui
|
72801ec716
|
问题列表显示更改
|
2013-08-15 10:18:05 +08:00 |
|
huangjingquan
|
af10ae8306
|
修改所有无活动、项目、反馈时显示的字体
|
2013-08-15 10:13:47 +08:00 |
|
fanqiang
|
84b5e61c55
|
修改留言的引用功能
|
2013-08-15 09:54:08 +08:00 |
|
huangjingquan
|
37e9e8395c
|
项目主页修改，我的账号，主页
|
2013-08-15 09:25:31 +08:00 |
|
kaizheng
|
128150dd92
|
稍该国际化
|
2013-08-14 22:05:57 +08:00 |
|
huangjingquan
|
3285f1afd2
|
添加项目主页文件数，版本库描述强制换行！
|
2013-08-14 22:03:36 +08:00 |
|
kaizheng
|
3022dc1057
|
稍该国际化
|
2013-08-14 21:48:26 +08:00 |
|
huangjingquan
|
2fbf8e1901
|
修改问题权限，问题界面用户图像显示错误，个人配置信息按钮跳转
|
2013-08-14 21:47:46 +08:00 |
|
william
|
470eff9b88
|
修复account页面。
|
2013-08-14 21:42:49 +08:00 |
|
william
|
7850a2e6f0
|
修改user_extension
|
2013-08-14 21:37:55 +08:00 |
|
kaizheng
|
80d901f666
|
主页面修改和部分国际化
|
2013-08-14 21:26:35 +08:00 |
|
Administrator
|
9b8c0f81b2
|
修复版本库
|
2013-08-14 20:56:20 +08:00 |
|
william
|
a11b1676ff
|
加入了对问题列表和问题主页的顶、踩功能；
另外遗留了tag搜索页面的显示问题待解决。
|
2013-08-14 12:49:26 +08:00 |
|
william
|
92bc517350
|
更改project主页显示bug
|
2013-08-13 21:08:23 +08:00 |
|
nieguanghui
|
f91cfcdec2
|
再提交一次
|
2013-08-13 20:54:29 +08:00 |
|
nieguanghui
|
ffe6d5db97
|
代码重构
|
2013-08-13 20:46:04 +08:00 |
|
nieguanghui
|
4077a91429
|
修正未登录用户界面显示bug；删除了部分多余注释
|
2013-08-13 20:39:47 +08:00 |
|
huangjingquan
|
ece469bff3
|
添加tag框架显示
|
2013-08-13 17:18:28 +08:00 |
|
huangjingquan
|
7119c720e8
|
修正我的账户bug
|
2013-08-13 17:11:54 +08:00 |
|
huangjingquan
|
1b7382a0fe
|
tag框架
|
2013-08-13 17:00:33 +08:00 |
|
kaizheng
|
4557ee71e4
|
稍该国际化
|
2013-08-13 16:37:08 +08:00 |
|
huangjingquan
|
00f606a203
|
修改tag显示页面
|
2013-08-13 16:31:52 +08:00 |
|
fanqiang
|
7287e151d0
|
将issue加入活动中，添加读取活动数据的方法
|
2013-08-13 16:29:02 +08:00 |
|
nieguanghui
|
1dd86b9116
|
修正了UTF-8问题；修正了上传头像显示问题
|
2013-08-13 15:58:21 +08:00 |
|
huangjingquan
|
23be95649f
|
tag页面
|
2013-08-13 15:52:22 +08:00 |
|
william
|
0ef943d5f3
|
修复因为ISSUE引起的bug；
|
2013-08-13 15:30:48 +08:00 |
|
william
|
6f54e1680d
|
修复了tag查询的问题；tag样式的显示
|
2013-08-13 15:20:48 +08:00 |
|
nieguanghui
|
4663751e7e
|
修正了上传头像布局
|
2013-08-13 11:31:27 +08:00 |
|
huangjingquan
|
3d13304f26
|
门户页面粉丝数显示
|
2013-08-13 11:24:50 +08:00 |
|
nieguanghui
|
ca08efa7e5
|
修正了我的账户下弹出密码错误的bug；修正了普通用户修改资料的跳转路径
|
2013-08-13 11:14:25 +08:00 |
|
huangjingquan
|
48442e95f5
|
限制项目描述字数
|
2013-08-13 11:11:45 +08:00 |
|
kaizheng
|
53c6a981e9
|
稍该国际化
|
2013-08-13 10:45:01 +08:00 |
|
nieguanghui
|
4aa174ea74
|
修改项目列表TAG
显示，解决新建用户500错误
|
2013-08-13 10:43:52 +08:00 |
|
huangjingquan
|
9bd5244d8e
|
主页用户名强制换行
|
2013-08-13 10:27:02 +08:00 |
|
huangjingquan
|
d87c2194b9
|
固定了几个常见名称换行，tag标签显示问题
|
2013-08-13 10:19:50 +08:00 |
|
nieguanghui
|
2dc1d5e935
|
导入数据
|
2013-08-13 09:57:57 +08:00 |
|
fanqiang
|
0027ca8d22
|
修改项目列表的title
|
2013-08-13 00:37:10 +08:00 |
|
huangjingquan
|
9d19a5bd19
|
项目名显示
|
2013-08-13 00:25:42 +08:00 |
|
wanglinchun
|
38fdde0997
|
修改我的账户页面
|
2013-08-13 00:22:45 +08:00 |
|
fanqiang
|
a9cfeb6a9a
|
修改用户主页中没内容显示时的页面
|
2013-08-13 00:02:12 +08:00 |
|
huangjingquan
|
54fa3e5325
|
主页链接
|
2013-08-12 23:57:00 +08:00 |
|
fanqiang
|
75aca1bad4
|
123
|
2013-08-12 23:43:26 +08:00 |
|
huangjingquan
|
299d02ebe8
|
增加活动分页
|
2013-08-12 23:42:22 +08:00 |
|
huangjingquan
|
63a1c21b3d
|
项目里面无活动显示
|
2013-08-12 23:29:03 +08:00 |
|
kaizheng
|
8309be475a
|
微小修改国际化
|
2013-08-12 23:26:02 +08:00 |
|
huangjingquan
|
9e0eccb78f
|
个人信息
无项目、活动
|
2013-08-12 23:21:00 +08:00 |
 baiyu
|
51249e26f3
|
修复tag的bug
|
2013-08-12 23:06:50 +08:00 |
|
fanqiang
|
0c89ef0360
|
修改注册BUG
|
2013-08-12 23:05:10 +08:00 |
|
wanglinchun
|
81eca9f238
|
将上传的头像压缩至50x50大小。请确保运行环境RMagick可用。
|
2013-08-12 22:46:00 +08:00 |
|
kaizheng
|
9abdd44b63
|
修复Bug
|
2013-08-12 22:26:18 +08:00 |
|
huangjingquan
|
5e4bd75335
|
user页面修改“需求页面”
|
2013-08-12 22:10:12 +08:00 |
|
wanglinchun
|
9bb6f648e5
|
修改头像、logo上传进度条显示
|
2013-08-12 22:05:27 +08:00 |
|
huangjingquan
|
62ff95c4af
|
user界面增加“标签”功能
project界面风格修改
|
2013-08-12 21:54:59 +08:00 |
|
fanqiang
|
eef2d8ef1a
|
修改用户活动的问题
|
2013-08-12 21:39:58 +08:00 |
|
fanqiang
|
47b77eedfb
|
添加国际化文件内容，修改需求列表图片链接问题，修改需求主页图片大小
|
2013-08-12 21:20:43 +08:00 |
|
fanqiang
|
988e71d193
|
修改列表在英文显示中的问题，修改需求列表中的细节问题
|
2013-08-12 21:03:03 +08:00 |
|
huangjingquan
|
12090cdd80
|
修改 project-活动里面》》改成竖线
|
2013-08-12 20:51:21 +08:00 |
|
fanqiang
|
a3addb517c
|
修改列表中搜索框位置，留言删除时提示是否删除
|
2013-08-12 20:43:18 +08:00 |
|
william
|
11df7d2787
|
修改了tag的显示
|
2013-08-12 20:18:10 +08:00 |
|
fanqiang
|
bb5e066d50
|
解决冲突
|
2013-08-12 17:30:31 +08:00 |
|
nieguanghui
|
c00575ce84
|
修改新建项目显示，优化列表显示速度
|
2013-08-12 17:11:41 +08:00 |
|
Administrator
|
189eaba64c
|
modify natural
|
2013-08-12 17:00:23 +08:00 |
|
huangjingquan
|
80a840de6a
|
修改成-普通用户也拥有修改自己资料的权力
|
2013-08-12 16:36:06 +08:00 |
|
huangjingquan
|
e776e7b1d8
|
将姓名改成全称
|
2013-08-12 16:30:51 +08:00 |
|
Administrator
|
57991b727a
|
修改了版本库
|
2013-08-12 16:22:38 +08:00 |
|
huangjingquan
|
b0c813df69
|
将所有的刘表横线改成下划线
|
2013-08-12 16:17:03 +08:00 |
|
huangjingquan
|
d01b61ba5a
|
修改了“footer",，每天新闻增加了下划线
|
2013-08-12 15:52:17 +08:00 |
|
fanqiang
|
69e3dcee6c
|
修改用户活动，用户主页的其他部分添加分页
|
2013-08-12 15:37:42 +08:00 |
|
fanqiang
|
4b998de820
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-12 15:32:48 +08:00 |
|
william
|
be35324bbc
|
拿掉了对人、问题、需求、项目的赞功能，去掉了一些使用这些功能的代码。
|
2013-08-12 15:08:44 +08:00 |
|
william
|
cf9aa12727
|
1.重新定义了顶和踩得规则：
对于为评价的问题，同时显示顶和踩的数字，并且数字的“+”“-”标成黑色；
对于评价的问题，如果评价是顶，则只显示所有顶的次数；反之，亦然；
2.在问题列表中也添加了顶和踩的功能；
3.对于问题列表的描述，在描述内容前添加了“描述：”，
所以为空的情况下，该处显示占位依然存在，使列表显示格式统一
|
2013-08-12 14:50:54 +08:00 |
|
huangjingquan
|
4bc217b52c
|
用户主页 门户
|
2013-08-12 10:25:23 +08:00 |
|
william
|
7a0db3b3f1
|
给需求的留言添加了“确认删除”弹窗，重构了赞和踩模块，针对问题添加了赞和踩功能。粉丝数的链接问题未修改玩。
|
2013-08-11 23:44:12 +08:00 |
|
fanqiang
|
e5a374cf33
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-11 21:27:39 +08:00 |
|
william
|
a7b6d2ec83
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-11 21:23:13 +08:00 |
|
huangjingquan
|
6902fc3c74
|
修改界面、关注参数，用户界面调整
|
2013-08-11 21:09:12 +08:00 |
|
fanqiang
|
83a2df0b92
|
添加分页
|
2013-08-11 19:54:15 +08:00 |
|
kaizheng
|
2868d19ca0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
config/locales/zh.yml
|
2013-08-11 17:27:18 +08:00 |
|
kaizheng
|
ba99895b2b
|
主界面国际化
|
2013-08-11 17:22:04 +08:00 |
|
Administrator
|
c2a3b7b5a7
|
添加了新建版本库
|
2013-08-11 17:17:59 +08:00 |
|
fanqiang
|
a6b5c8fc2b
|
修改了用户主页中与我相关部分的显示问题
|
2013-08-11 15:53:41 +08:00 |
|
huangjingquan
|
2db0b87e6e
|
主界面
|
2013-08-11 15:27:34 +08:00 |
|
fanqiang
|
5c0f8e6438
|
修改留言按钮和新建需求按钮
|
2013-08-11 10:54:43 +08:00 |
|
kaizheng
|
47e680a7b0
|
与我相关模块国际化
|
2013-08-11 10:52:43 +08:00 |
|
fanqiang
|
238b9a416f
|
修改用户主页中与我相关部分的功能，现在可以查找在问题中的引用以及对指派给我的问题中的所有反馈
|
2013-08-11 10:36:55 +08:00 |
|
kaizheng
|
d3ddb833b5
|
项目应标小模块国际化，修改了留言Bug
|
2013-08-11 08:51:20 +08:00 |
|
william
|
622008366d
|
完善tag的搜索功能。赞的显示优化。
|
2013-08-10 22:54:16 +08:00 |
|
kaizheng
|
614f3d3f9f
|
稍微修改国际化相关
|
2013-08-10 22:07:48 +08:00 |
|
wanglinchun
|
6eff8c5045
|
在用户列表添加粉丝、关注、赞的数字
|
2013-08-10 20:44:13 +08:00 |
|
huangjingquan
|
5c6d8c1bcf
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-10 20:36:00 +08:00 |
|
huangjingquan
|
f4fc3d9dbe
|
用户本身能够看到与我相关，其他用户则看不到该项!
|
2013-08-10 20:34:32 +08:00 |
|
zhangyang
|
be9ecd1e48
|
修正了“新建项目”bug
|
2013-08-10 20:33:01 +08:00 |
|
huangjingquan
|
e3be481bac
|
trustie2改成trustie
|
2013-08-10 20:12:23 +08:00 |
|
huangjingquan
|
ec97ecdcf6
|
添加界面文字描述、界面风格
|
2013-08-10 19:58:36 +08:00 |
|
william
|
1cf8b8bbd1
|
修复了关注后不刷新页面中粉丝数的功能。
|
2013-08-10 17:07:29 +08:00 |
|
william
|
62e6213113
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-10 17:06:02 +08:00 |
|
william
|
96b4e44553
|
开始修复关注不更新fans的bug
|
2013-08-10 16:16:02 +08:00 |
|
kaizheng
|
db1815ba1a
|
主页国际化
|
2013-08-10 16:09:07 +08:00 |
|
zhangyang
|
aafc00ec77
|
修正前一次提交错误
|
2013-08-10 10:31:57 +08:00 |
|
huangjingquan
|
90bb9c8fe9
|
“我的账号”伸缩按钮-隐藏功能
|
2013-08-10 10:27:28 +08:00 |
|
zhangyang
|
5afc5884b8
|
修正了用户、需求主页tab menu的显示问题
|
2013-08-10 10:25:30 +08:00 |
|
kaizheng
|
1615185ebf
|
新建需求国际化
|
2013-08-10 10:03:37 +08:00 |
|
huangjingquan
|
1abba1c48b
|
修改了普通用户拥有修改自己个人资料的权限
主页footer颜色去掉
|
2013-08-10 09:57:43 +08:00 |
|
huangjingquan
|
38c6a187e4
|
主页显示以及header部分
|
2013-08-10 09:31:48 +08:00 |
|
zhangyang
|
34bc46450f
|
去除header的背景；将menu字体颜色改为蓝色；缩小主页登录框的大小
|
2013-08-09 22:26:15 +08:00 |
|
fanqiang
|
f4e8179ab1
|
修改需求主页
|
2013-08-09 17:24:38 +08:00 |
|
kaizheng
|
ff67826a79
|
单个需求页面国际化
|
2013-08-09 16:30:20 +08:00 |
|
fanqiang
|
e3294bf809
|
修改需求留言
|
2013-08-09 16:26:26 +08:00 |
|
huangjingquan
|
0b274758b1
|
主页内容调整
|
2013-08-09 15:08:37 +08:00 |
|
nieguanghui
|
3e9175e689
|
解决登陆框忘记密码折行问题
|
2013-08-09 15:02:53 +08:00 |
|
kaizheng
|
b8a3d3f673
|
把现有需求国际化
|
2013-08-09 11:24:42 +08:00 |
|
huangjingquan
|
01bf3241d1
|
修改主页显示
|
2013-08-09 11:14:53 +08:00 |
|
fanqiang
|
f3c0f9cde9
|
解决冲突
|
2013-08-09 10:42:07 +08:00 |
|
nieguanghui
|
ef231ee9d4
|
解决用户主页留言错误，修改用户列表搜索栏显示
|
2013-08-09 10:32:34 +08:00 |
|
nieguanghui
|
8b3e4617e4
|
解决用户主页500错误
|
2013-08-09 10:21:00 +08:00 |
|
nieguanghui
|
a8d2c5789c
|
修正数据库表不存在错误
|
2013-08-09 10:06:24 +08:00 |
|
huangjingquan
|
1c41cbd4b5
|
在新闻子页面里增加新闻描述，评论框放置新闻上端，内容倒置。
|
2013-08-09 09:50:08 +08:00 |
|
fanqiang
|
b2af215ee1
|
修改新建需求时提示错误信息功能
|
2013-08-08 22:27:58 +08:00 |
|
kaizheng
|
79b5544bc0
|
将一些中文国际化
|
2013-08-08 22:26:46 +08:00 |
|
william
|
80e74e4dd7
|
修改了一些赞的bug，添加了显示所有tag的功能。
|
2013-08-08 22:25:32 +08:00 |
|
huangjingquan
|
0a2b91fa17
|
增加了粉丝和关注 单个页面，增加了默认用户图像，默认项目图像
|
2013-08-08 22:19:15 +08:00 |
|
william
|
9cc86f3cd8
|
移除seems_ratabale插件。
|
2013-08-08 17:26:37 +08:00 |
|
william
|
0b5ea87f11
|
加入了对赞功能模块，同时预留了踩功能，但暂时不使用。
|
2013-08-08 17:01:56 +08:00 |
|
fanqiang
|
4676eed9a3
|
为用户活动添加分页功能
|
2013-08-08 10:04:44 +08:00 |
|
huangjingquan
|
dc12301e4f
|
上次回退内容（修改无项目和活动时显示问题）补充
|
2013-08-08 09:38:54 +08:00 |
|
nieguanghui
|
fb44fb5815
|
用户头像显示方式修改
|
2013-08-07 22:22:36 +08:00 |
|
zhangyang
|
94504431fb
|
修正了主页登录窗口的显示问题
|
2013-08-07 22:13:52 +08:00 |
|
zhangyang
|
3d5b95cb7a
|
修正了“我的账户”下修改密码的显示问题
|
2013-08-07 21:10:37 +08:00 |
|
wanglinchun
|
be4dc216a9
|
修正新建项目页面默认LOGO显示问题
|
2013-08-07 17:14:24 +08:00 |
|
nieguanghui
|
05023c8451
|
增加关注和粉丝头像处鼠标悬浮显示用户名字，问题列表样式调整
|
2013-08-07 17:06:05 +08:00 |
|
fanqiang
|
b78504a5f1
|
修改了关于需求的bug，包括权限问题以及使用细节
|
2013-08-07 16:45:04 +08:00 |
|
nieguanghui
|
2694611eed
|
修改点击图片跳转错误的bug
|
2013-08-07 16:24:31 +08:00 |
|
zhangyang
|
85a23c468e
|
添加“新建项目”；调整“新建项目”布局
|
2013-08-07 15:29:24 +08:00 |
|
huangjingquan
|
cb6fe2e7df
|
用户项目图片更新
代码重构
tab小bug解决
|
2013-08-07 11:29:00 +08:00 |
|
zhangyang
|
d5cc2246a9
|
修正了文件下载权限和文档查看权限
|
2013-08-07 09:48:59 +08:00 |
|
zhangyang
|
1ed9089212
|
修正了路线图已完成项目的显示问题
|
2013-08-07 09:21:05 +08:00 |
|
fanqiang
|
4835cab6e4
|
添加了用户查找反馈的功能，可以查看对用户评论的引用和对用户需求的评论。解决了留言问题
|
2013-08-06 22:26:52 +08:00 |
|
nieguanghui
|
836fe0b9a3
|
解决用户页面跳转404
|
2013-08-06 22:23:22 +08:00 |
|
nieguanghui
|
df93c78490
|
增加项目，需求搜索，
|
2013-08-06 21:43:06 +08:00 |
|
zhangyang
|
abe40f6581
|
修正content上方横线的显示问题
|
2013-08-06 21:08:11 +08:00 |
|
huangjingquan
|
f8a8ae6fac
|
增加了关注功能
|
2013-08-06 20:57:38 +08:00 |
|
zhangyang
|
de7665049e
|
修改了“退出”返回页面设置；项目文档页面添加显示选择
|
2013-08-06 20:55:34 +08:00 |
|
zhangyang
|
797db5a93f
|
"我的头像"国际化；修改资料里的显示布局
|
2013-08-06 20:09:52 +08:00 |
|
zhangyang
|
bb461cd244
|
添加了项目活动的分页
|
2013-08-06 16:44:43 +08:00 |
|
huangjingquan
|
7b3c201469
|
修改了一个bug（新闻子页面底框乱飞）
|
2013-08-06 16:32:37 +08:00 |
|
zhangyang
|
06a859eb5e
|
修正上传文件显示
|
2013-08-06 16:08:54 +08:00 |
|
huangjingquan
|
03fed7b36d
|
修改了新闻子页面的现实
文档页面及子页面排版
|
2013-08-06 15:53:08 +08:00 |
|
zhangyang
|
d7ba950851
|
修正路线图各版本排列问题
|
2013-08-06 10:53:17 +08:00 |
|
zhangyang
|
d086162854
|
解决issues、timelog布局问题
|
2013-08-06 10:21:22 +08:00 |
|
huangjingquan
|
d4494b3803
|
修改了任务分工上几条
|
2013-08-06 10:16:51 +08:00 |
|
zhangyang
|
db85ff2946
|
修正了member路径问题；将“应用”变为“搜索”；
|
2013-08-06 10:12:15 +08:00 |
|
fanqiang
|
bb5052cf30
|
修改了用户活动，可以查看关注好友的活动，并且将需求加入到活动中
修复了一些需求中的BUG
|
2013-08-05 22:47:01 +08:00 |
|
zhangyang
|
c3f81ba00e
|
初步修改了路线图页面的显示
|
2013-08-05 21:41:08 +08:00 |
|
zhangyang
|
4eb9a0950e
|
top-menu背景颜色；项目配置tab样式；content上方横线；用户列表分页框样式
|
2013-08-05 11:19:53 +08:00 |
|
nieguanghui
|
cafdfa67af
|
修改图片
|
2013-08-05 08:44:42 +08:00 |
|
huangjingquan
|
19f351ef9c
|
添加了注释
|
2013-08-04 14:23:12 +08:00 |
|
huangjingquan
|
32415d07e9
|
修改了门户
|
2013-08-04 11:23:06 +08:00 |
|
zhangyang
|
4728995536
|
修正base底部显示
|
2013-08-04 11:08:30 +08:00 |
|
fanqiang
|
7949e1166c
|
添加备注
|
2013-08-04 10:59:25 +08:00 |
|
huangjingquan
|
23fc4b8589
|
修改了主页面，用户界面
|
2013-08-04 10:56:56 +08:00 |
|
fanqiang
|
8c80e56019
|
修改了需求列表的结构，添加了分页，并且修改了新建需求的BUG，
|
2013-08-04 10:11:38 +08:00 |
|
zhangyang
|
f2d4d1dfff
|
修改框架底部显示内容
|
2013-08-04 09:37:32 +08:00 |
|
zhangyang
|
d71efeac48
|
修正项目内列表标题字体大小
|
2013-08-04 09:12:51 +08:00 |
|
zhangyang
|
c500c8d9e7
|
去除上传图像代码中的注释影响
|
2013-08-04 08:57:55 +08:00 |
|
zhangyang
|
c62f1b6618
|
修正了图片上传bug
|
2013-08-04 08:55:39 +08:00 |
|
fanqiang
|
163fe97e6f
|
改变了新建需求的界面，对需求的留言框和应标项目的样式
|
2013-08-03 22:51:42 +08:00 |
|
huangjingquan
|
408a626ddd
|
修改了个人主页项目里面的链接
user和project界面
以及主页
|
2013-08-03 22:22:17 +08:00 |
|
zhangyang
|
a7871c63b2
|
修改了项目里各form的显示样式
|
2013-08-03 22:18:30 +08:00 |
|
nieguanghui
|
d521f95354
|
列表样式修改
|
2013-08-03 22:06:07 +08:00 |
|
william
|
36b2e005c7
|
列表显示改进
|
2013-08-03 21:47:52 +08:00 |
|
kaizheng
|
3d8aa620a5
|
添加分享按钮
|
2013-08-03 20:09:04 +08:00 |
|
nieguanghui
|
a29a84d8a3
|
显示图片的数据的封装
|
2013-08-03 19:42:09 +08:00 |
|
nieguanghui
|
c24320fda5
|
列表样式改进，时间显示样式调整，颜色调整
|
2013-08-03 16:54:48 +08:00 |
|
huangjingquan
|
868bb5baa0
|
修改了new里面布局以及链接
修改了base_project
|
2013-08-02 11:03:36 +08:00 |
|
zhangyang
|
c4b4460df9
|
项目主页添加“路线图”“文件”；用户主页定义“最新反馈”菜单路径；进一步修改上传头像按钮
|
2013-08-02 10:41:12 +08:00 |
|
fanqiang
|
bb34453a87
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-02 08:54:07 +08:00 |
|
fanqiang
|
a97935a8ac
|
添加了用户主页中的关注需求界面，url为users/:id/watch_bids
|
2013-08-02 08:53:07 +08:00 |
|
william
|
ffbe6da73e
|
add some images and let the tag function more userful.
|
2013-08-01 22:25:30 +08:00 |
|
fanqiang
|
ee0d8ecb95
|
删除多余的model tag.rb
|
2013-08-01 21:47:31 +08:00 |
|
zhangyang
|
aaa8a4b94d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-01 21:37:11 +08:00 |
|
zhangyang
|
4e8c371160
|
修复tag的需求bug部分；修改上传图像部分
|
2013-08-01 21:36:37 +08:00 |
|
fanqiang
|
1781d3ba8d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/layouts/base_bids.html.erb
|
2013-08-01 20:59:29 +08:00 |
|
fanqiang
|
760a286746
|
完善需求功能，美化需求列表
|
2013-08-01 20:47:00 +08:00 |
|
william
|
ff0e1df0a2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-01 20:39:33 +08:00 |
|
william
|
4c5ba2b6df
|
Tagģ顣
|
2013-08-01 20:38:38 +08:00 |
|
nieguanghui
|
2e139cd682
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-01 20:32:50 +08:00 |
|
kaizheng
|
28296f3f9b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-01 20:27:14 +08:00 |
|
kaizheng
|
e635237acd
|
添加app\controllers\shares_controller.rb及相关文件用来作为api演示的小例子，Client.html放在根目录下作为演示客户端
|
2013-08-01 20:26:19 +08:00 |
|
zhangyang
|
18b1d22502
|
merge一次
|
2013-08-01 20:10:56 +08:00 |
|
nieguanghui
|
2de61aa6b5
|
问题列表样式更改
|
2013-08-01 19:52:30 +08:00 |
|
zhangyang
|
f1f4a29a66
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-01 19:38:46 +08:00 |
|
zhangyang
|
980b852c17
|
添加框架的底部；修改活动中回复文字显示效果；修改项目等页面显示权限
|
2013-08-01 19:38:10 +08:00 |
|
nieguanghui
|
caa04e68e5
|
修改问题列表样式
|
2013-08-01 17:10:47 +08:00 |
|
huangjingquan
|
bf1f9b8e19
|
remove .bundle from ignored file list
|
2013-08-01 11:08:59 +08:00 |
|
huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |