 fanqiang
|
91d5959016
|
添加了对管理员申请的接受与拒绝
|
11 years ago |
Wen
|
ded3da6670
|
用户评分理论上完成了
|
11 years ago |
|
fanqiang
|
28b10ed3fd
|
修改了搜索功能，并能对搜索进行过滤
|
11 years ago |
|
Wen
|
3ba524668f
|
用户评分未完成版本= =
上传一下以防丢了
|
11 years ago |
 wanglinchun
|
94a7bacdd2
|
首页：当无应用时，提示暂无应用
|
11 years ago |
 baiyu
|
f0b497e455
|
user score merge
|
11 years ago |
|
baiyu
|
36cd91401f
|
user score
|
11 years ago |
|
fanqiang
|
8600265f00
|
修改查询条件样式
|
11 years ago |
xianbo
|
bb4d141b0e
|
erge branch 'competition' into develop
Conflicts:
app/views/layouts/base_newcontest.html.erb
|
11 years ago |
|
wanglinchun
|
43064c4bc2
|
调整竞赛模块首页中显示的竞赛：既有旧的竞赛又有新的竞赛
|
11 years ago |
|
xianbo
|
647081539c
|
fix
|
11 years ago |
|
wanglinchun
|
76ccfe8ac4
|
fix
|
11 years ago |
|
wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
11 years ago |
 alan
|
f6a1e90ad1
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
wanglinchun
|
3a5b5bc0ce
|
设计并调整竞赛模块的首页显示样式
|
11 years ago |
yanxd
|
84d3e40c41
|
zip down controller created
|
11 years ago |
|
wanglinchun
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
11 years ago |
|
wanglinchun
|
733497fef8
|
调整竞赛列表页面中部分统计数字的超链接
|
11 years ago |
|
alan
|
933fc6cb33
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
alan
|
7781203474
|
附件按tag查询时，只查选定项目中的附件
|
11 years ago |
|
wanglinchun
|
f9e5dd47f6
|
修改了竞赛列表的排序问题
|
11 years ago |
|
wanglinchun
|
64895a75ed
|
显示上传截图+应用显示
|
11 years ago |
|
wanglinchun
|
a4df4cf893
|
修改竞赛和参与竞赛的新建应用之间的关联关系
|
11 years ago |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
11 years ago |
|
yanxd
|
1b6cdeac05
|
列表上提交作业，大概好了吧
|
11 years ago |
|
yanxd
|
045b55236f
|
作业提交临时解决方案
|
11 years ago |
|
fanqiang
|
d381423c0e
|
添加了版主功能
|
11 years ago |
|
fanqiang
|
89b668be82
|
添加申请版主功能，目前已经可以写入数据库
|
11 years ago |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
11 years ago |
|
yanxd
|
7e130ee89e
|
去掉login_flag
|
11 years ago |
|
wanglinchun
|
2a278e0a2d
|
all
|
11 years ago |
|
fanqiang
|
9af808821d
|
修改框架，添加"没有帮助"和"申请成为版主"功能
|
11 years ago |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
11 years ago |
|
yanxd
|
a1a58ee26c
|
加注释
|
11 years ago |
|
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
4f5216e632
|
merge
|
11 years ago |
|
yanxd
|
84c5032eb2
|
整理下，加个推荐tag
|
11 years ago |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
11 years ago |
|
xianbo
|
2bba27e7a1
|
evils uri
|
11 years ago |
|
xianbo
|
3d2516f53c
|
fix navigation
|
11 years ago |
|
yanxd
|
d2ebfca314
|
加个数组判断
|
11 years ago |
|
yanxd
|
850ff6194f
|
issue#509,#510
|
11 years ago |
|
yanxd
|
8c251da25d
|
Bug：新建作业时菜单栏第一个显示蓝色，应该是第二个显示蓝色
|
11 years ago |
|
xianbo
|
6e065361b3
|
fix main page navigation
|
11 years ago |
|
fanqiang
|
d935152ed7
|
initial crawl
|
11 years ago |
|
yanxd
|
c38a8e4f6a
|
socialForge#324
|
11 years ago |
|
xianbo
|
3bf0a8f138
|
fix default show
|
11 years ago |
|
yanxd
|
6ba25556b7
|
issues id new world
|
11 years ago |
|
xianbo
|
321f2df0b9
|
add chance to new preoject
|
11 years ago |
|
xianbo
|
8db09739a1
|
optimize the show of forge
|
11 years ago |
|
yanxd
|
2e3b44c830
|
id-name(position|count)
|
11 years ago |
|
xianbo
|
34fd8a933a
|
fix the show of domain and project page
|
11 years ago |
|
Wen
|
ce7af30788
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
Wen
|
31b7ab8ae5
|
创建课程处添加了学校
数据库中存储学校的ID
但是学校与省份的级联还没有做好=A=
|
11 years ago |
|
xianbo
|
20cd5941a8
|
modify project main page
|
11 years ago |
|
yanxd
|
c905ded3b5
|
擦屁股
|
11 years ago |
|
yanxd
|
52fe99d71c
|
fixed 谭 domain bug in development environment.
|
11 years ago |
|
yanxd
|
e97caddbdb
|
又一个course timeout问题
|
11 years ago |
|
xianbo
|
3f55e78f49
|
add diff url in navigation
|
11 years ago |
|
yanxd
|
e0c87996bf
|
改了个课程截至日期，并且在courses_controller中设置了过期不允许加入的设定，目测没什么问题，明天再看看
|
11 years ago |
|
yanxd
|
daed8a1164
|
暂且提交，增加活动失败。
|
11 years ago |
|
yanxd
|
592d704a6d
|
主页 文件上传bug
|
11 years ago |
|
yanxd
|
3df986a908
|
教师列表转换排序方式后则搜索所有人员bug
|
11 years ago |
|
yanxd
|
46b508be2b
|
首页 论坛发帖权限
|
11 years ago |
|
yanxd
|
e7841cb512
|
fix
|
11 years ago |
|
yanxd
|
8963cc3a3c
|
邮件问题一
|
11 years ago |
|
yanxd
|
3b7e8483e3
|
搜索算法
|
11 years ago |
|
yanxd
|
0b385cdbbb
|
毛的资源库关联文件
|
11 years ago |
|
yanxd
|
e9373991d2
|
maoxian
|
11 years ago |
|
yanxd
|
21e55492fa
|
小改怡情 大改伤身 强改灰飞烟灭
|
11 years ago |
|
yanxd
|
2ca1362e83
|
“按用户搜索”和“搜索”的区别，分别可以搜索什么？ 上面搜索删掉
1、标签的格式需 要优化（所有涉及到标签的地方的标签的格式都需要调整） tag周围距离
“课程通知“应该调整到“课程作业”后面 改！
|
11 years ago |
|
yanxd
|
8a3d1d033c
|
用户navbar问题，注册对齐问题
|
11 years ago |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
11 years ago |
|
yanxd
|
cf2689917b
|
三天两头反复改 不如自挂东南枝
|
11 years ago |
|
wanglinchun
|
b45332bab0
|
课程默认活跃度排序
|
11 years ago |
|
yanxd
|
ecec98aac9
|
菜单栏调整
|
11 years ago |
|
yanxd
|
104e2f8542
|
内容不一致引起的路由错误
|
12 years ago |
|
wanglinchun
|
42a1a9e0b9
|
重复提交问题
|
12 years ago |
|
yanxd
|
45f8b15083
|
paginate
|
12 years ago |
|
yanxd
|
61380a5e1a
|
文件来源
|
12 years ago |
|
yanxd
|
2bb44456d6
|
search
|
12 years ago |
|
yanxd
|
d09e995f52
|
class
|
12 years ago |
|
yanxd
|
85e89f5c09
|
storeshelper attachFromUrl
|
12 years ago |
|
yanxd
|
f91d94fd4c
|
fetch stores/index instance_object
|
12 years ago |
|
yanxd
|
4b8a4c82c9
|
学号在作业里显示问题，首页时间显示不确定问题，项目缺陷滑动效果乱跳问题。
|
12 years ago |
|
wanglinchun
|
4167e8bb8f
|
修改了门户网站中用户动态的[进入附件列表]显示颜色
|
12 years ago |
|
yanxd
|
123817df93
|
tools 顺序
首页讨论区去掉项目讨论区
所有留言删除功能
标题显示错误
|
12 years ago |
|
yanxd
|
2070e9dc7f
|
remove memo/messages info from welcome.index
|
12 years ago |
|
yanxd
|
997c546083
|
remove html char
|
12 years ago |
|
yanxd
|
c3cbf87b3d
|
首页排序大概搞定
|
12 years ago |
|
yanxd
|
fea1cdff53
|
首页时间排序，可能会引起其他调用event_datetime的问题。待观察
|
12 years ago |
|
yanxd
|
e12922544a
|
链接bug，去掉动态里的文档内容
|
12 years ago |
 nieguanghui
|
8a0dc59f3e
|
welcome index helper.
|
12 years ago |
|
yanxd
|
2c5cd7a12a
|
'merge'
|
12 years ago |
|
yanxd
|
f05d2131bd
|
组织留言数据方法
|
12 years ago |
|
nieguanghui
|
fbf73de68b
|
1234
|
12 years ago |
|
yanxd
|
3f82203735
|
it can be summited project with same name.
|
12 years ago |
|
nieguanghui
|
2db1067158
|
1、 网站中的搜索几乎都没有搜索后的提示语，这里应该加提示语，提示重新搜索。
2、 竞赛—关注 参与项目 用户反馈 这行应该去掉。
4. 去掉竞赛参与项目页面中”参与了竞赛”的 a 标签。
5．竞赛侧边栏显示方式的统一。
6. 解决竞赛侧边栏关注部分不显示头像的bug.修复侧边栏参与者部分没有参与者也不会显示提示的bug。
7. 增加竞赛中关注一栏的”more”链接。
7. 重构竞赛layouts代码。
|
12 years ago |
|
nieguanghui
|
ca9da99f7e
|
1、 实践课程->课程动态 列表 动态显示（有了最新动态后）应该为：如果是项目则显示新闻，课程则显示通知【光辉 周三】
2、 系统中需要加空格地方：留言时间后加空格；作业截止日期前加空格；项目-缺陷：指派给**加空格；项目动态-发布时间加空格，而且去掉a标签；项目-新闻（更新时间后缺空格）【光辉 周三】
3、 竞赛—左下角 参与项目后面的“更多“位置应该调整【光辉 周三】
4、 看别人的主页时没有标签【光辉 周三】
|
12 years ago |
|
yanxd
|
e1e2e6e986
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
4d2fd01cf9
|
进入附件列表
|
12 years ago |
|
nieguanghui
|
c6f657ed8c
|
重构排序代码
|
12 years ago |
|
yanxd
|
b0efdefa7d
|
学号显示问题
|
12 years ago |
|
yanxd
|
246ab25bf0
|
部分sql语句写成rails形式
|
12 years ago |
|
yanxd
|
5e9bb9a99f
|
删除提示框作业，作业提交的问题。附件提交之后还会存在。
|
12 years ago |
|
yanxd
|
fcc2dd7952
|
首页版本库，sth.
|
12 years ago |
|
yanxd
|
3484632ce8
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
b703c65033
|
关注取消关注位置漂移
个人主页学号的隐藏
|
12 years ago |
|
nieguanghui
|
f2d392de1d
|
调整主页界面显示
|
12 years ago |
|
yanxd
|
59b2c408e7
|
sa
|
12 years ago |
|
nieguanghui
|
0416902cde
|
修改个人动态显示内容
|
12 years ago |
|
nieguanghui
|
b9b089fb27
|
完善主页个人动态部分汉化问题
|
12 years ago |
|
yanxd
|
ca2f5c6705
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
cefddb635a
|
e
|
12 years ago |
|
nieguanghui
|
f23451e4bb
|
add something
|
12 years ago |
|
yanxd
|
dcb16cb789
|
fix bug"
|
12 years ago |
|
nieguanghui
|
c27528ffb7
|
1234
|
12 years ago |
|
yanxd
|
f7a6798b73
|
.
|
12 years ago |
|
yanxd
|
23785999f1
|
fix fetch time
|
12 years ago |
|
yanxd
|
4f6cd0800a
|
welcome helper fetch new memos
|
12 years ago |
|
nieguanghui
|
25baf61185
|
to do
|
12 years ago |
|
yanxd
|
4eeb7c3ea8
|
look at daily log.
|
12 years ago |
|
nieguanghui
|
02b5f2bafa
|
解决项目跑到课程里面的bug
|
12 years ago |
|
yanxd
|
d29154cc24
|
hot memo merged board/topic.
|
12 years ago |
|
nieguanghui
|
02bea99646
|
主页改进
|
12 years ago |
|
nieguanghui
|
69c113f386
|
修改主页显示
|
12 years ago |
|
yanxd
|
6cede3d2be
|
计算评论数量，修复按照时间查找bug,etc...
|
12 years ago |
|
nieguanghui
|
1ef5059708
|
主页
|
12 years ago |
|
yanxd
|
28978b88b2
|
首页用户动态加入讨论区内容，点击之后定位到帖子。
|
12 years ago |
|
yanxd
|
5914fb218c
|
add method to show download link
show download count in /project/:id/files
|
12 years ago |
|
nieguanghui
|
25fd898623
|
修改部分内容
|
12 years ago |
|
yanxd
|
0609c5c7ea
|
1.增加帖子回复时间查询语句
2.帖子回复的数量在数据库中有字段
3.新建帖子失败错误提示
4.下载里程碑top_menu删掉，
5.学生分页，分页方法封装
|
12 years ago |
|
yanxd
|
825b1e7fd7
|
点击tag之后的索引功能.
|
12 years ago |
|
nieguanghui
|
344e51105a
|
qq
|
12 years ago |
|
nieguanghui
|
39bf4ff188
|
解决鼠标bug
|
12 years ago |
|
nieguanghui
|
3700294890
|
门户网站页面微调
|
12 years ago |
|
nieguanghui
|
aa4596e170
|
增加图标显示
|
12 years ago |
|
yanxd
|
5d77f2031e
|
主页去除影响性能的代码
|
12 years ago |
|
nieguanghui
|
90b38cf5e8
|
s
|
12 years ago |
|
yanxd
|
49327905f8
|
refactor welcome help
|
12 years ago |
|
nieguanghui
|
6e704872be
|
1
|
12 years ago |
|
yanxd
|
579e78df9b
|
讨论区回复最多的主题帖
|
12 years ago |
|
yanxd
|
6a97cb69a8
|
welcome activity.
|
12 years ago |
|
nieguanghui
|
eb2bf5b879
|
增加方法
|
12 years ago |
|
nieguanghui
|
1f83ca612b
|
显示部分数据
|
12 years ago |
|
yanxd
|
cdbc26e8df
|
Merge branch 'forum' into develop
|
12 years ago |
|
yanxd
|
16c0bc3ac3
|
memo edit/destory.
|
12 years ago |
|
yanxd
|
48650a2a91
|
init forum. again.
|
12 years ago |
|
yanxd
|
ae1fe0027a
|
optimization project helper.
|
12 years ago |
|
fanqiang
|
16f70437d1
|
forum init.
|
12 years ago |
|
yanxd
|
5de8e1c2f2
|
new welcome index.
|
12 years ago |
|
yanxd
|
356a48caa8
|
move constant to module, fixed some translate.
|
12 years ago |
 huangjingquan
|
16611d8eff
|
修改了管理员权限
|
12 years ago |
|
yanxd
|
dd1f972edd
|
Revert "move courses mixed To projecthelper From applicantionHelper"
This reverts commit 42332201f2.
|
12 years ago |
|
yanxd
|
42332201f2
|
move courses mixed To projecthelper From applicantionHelper
|
12 years ago |
|
yanxd
|
c4bf9a8f72
|
refactor gender avatar html.erb => helper
|
12 years ago |
|
baiyu
|
e5baf0959b
|
1、竞赛里的参与者名字显示全称
2、个人主页里的“关注”与“粉丝”列表名字显示全称
3、区别了“关注”里个人参与的项目与课程
4、竞赛里的参与者的项目与课程数量的显示做出了区分
5、竞赛的参与者列表增加了学员学号
|
12 years ago |
|
baiyu
|
2f8ef03d32
|
1、增加了参与竞赛的用户列表
2、区分了个人主页里“粉丝”列表里的项目与课程的计数与显示
3、竞赛发布人的名字改为了全称
|
12 years ago |
|
baiyu
|
005e0802d4
|
增加了竞赛的“加入”
|
12 years ago |
|
xianbo
|
02ff8b8955
|
take off course fomre form the projrct ehich is watched
|
12 years ago |
|
yanxd
|
3b52936d17
|
roadmap -> milestone
|
12 years ago |
|
nieguanghui
|
adf8a7bc92
|
修改课程活跃度排序方式，解决课程列表文件链接错误
|
12 years ago |
|
yanxd
|
56cbca3ce8
|
fix little words
|
12 years ago |
|
xianbo
|
1cfba644f5
|
fix show of someone who watch and fxi the show of homework exdit
|
12 years ago |
|
huangjingquan
|
534c252bcb
|
修改了课程列表样式，部分国际化
|
12 years ago |
|
xianbo
|
3253f1cf28
|
modify show of some style
|
12 years ago |
|
xianbo
|
5032eaabcb
|
fix the show out of the frame and the location of show
|
12 years ago |
|
xianbo
|
607eb2c2ff
|
modify shoew of project
|
12 years ago |
|
yanxd
|
239a1484ae
|
remove useless code block
|
12 years ago |
|
nieguanghui
|
8df3bcf76f
|
修改评分显示颜色，重构课程列表显示部分代码
|
12 years ago |
|
nieguanghui
|
2b10258ae1
|
修改课程列表显示样式
|
12 years ago |
|
yanxd
|
2a6171ca52
|
refactor course helper
|
12 years ago |
|
yanxd
|
ce7b2ceba0
|
fix teacher/student search Identifier
|
12 years ago |
|
huangjingquan
|
c93ca4d2ed
|
添加了作业截止时间提醒功能！
|
12 years ago |
|
xianbo
|
003b4704cc
|
fix link to
|
12 years ago |
|
huangjingquan
|
ac2b90ecfd
|
退出课程加入权限
|
12 years ago |
|
xianbo
|
c7b38e5bf2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/news/index.html.erb
|
12 years ago |
|
xianbo
|
ca0f63a817
|
del the link of .head portrait
|
12 years ago |
|
yanxd
|
b55c5d20a3
|
added activity info from event, warning.
|
12 years ago |
|
yanxd
|
369e5eccc0
|
member_list ,group by roles in course#show
|
12 years ago |
|
yanxd
|
2286fbeff5
|
members split (teacher,student) in course
|
12 years ago |
|
yanxd
|
b617f3d42f
|
fix my welcome#index bug
|
12 years ago |
|
yanxd
|
dd0c087209
|
rest tan backurl
|
12 years ago |
|
xianbo
|
1f419c936d
|
del the back_url to let the different identity change has a correct url
|
12 years ago |
|
xianbo
|
e9856b3524
|
modify the style of the projects witch show
|
12 years ago |
|
yanxd
|
4bef2eee24
|
course can be shared files by project's member
|
12 years ago |
|
nieguanghui
|
b04fe3d1bb
|
增加项目评分 个人评分 ，个人在项目中的评分机制
|
12 years ago |
|
yanxd
|
5d0b5812b3
|
share completed with fq, xianbo
|
12 years ago |
|
yanxd
|
dde65a5895
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
baiyu
|
0206d3f2c3
|
需求里面添加了用户和项目与需求的联系
|
12 years ago |
|
yanxd
|
e2447b4c88
|
truncate textilizable
|
12 years ago |
|
yanxd
|
332bc0765d
|
240 characters or less limited in activity info. ===> projects#show
|
12 years ago |
|
yanxd
|
ec63fc41bb
|
add link in project/course list page, joinBUtton renamed.
|
12 years ago |
|
yanxd
|
e1d8c8a992
|
remove nyan css & move another file
|
12 years ago |
|
baiyu
|
8335c111c7
|
1、修改了“加入课程”位置
2、修改了我的账号里的格式
|
12 years ago |
|
yanxd
|
20883b92a5
|
add button css, fix js bug, add create project to push homework.
|
12 years ago |
|
xianbo
|
956aa3d0c1
|
remove forum block in course setting
|
12 years ago |
 huangjingquan
|
e25425d9a7
|
用户看别人课程主页时显示问题
|
12 years ago |
 wanglinchun
|
48a0f2f409
|
个人主页，课程相关国际化
|
12 years ago |
