 yanxd
|
34aa8433de
|
import hubspot
|
11 years ago |
 fanqiang
|
0b79cbac32
|
修改帖子的链接，帖子不在自己社区显示，而是直接链接到其他的网站
|
11 years ago |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
11 years ago |
 sw
|
7748704c3a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
fanqiang
|
10aa8eee81
|
显示帖子的发布者和时间
|
11 years ago |
 wanglinchun
|
a22678f36f
|
彻底调好了新建参赛作品后弹出的提示框问题
|
11 years ago |
|
wanglinchun
|
e10c6adf7a
|
隐藏掉新建参赛作品中完成后上传文件小框中出现的提示语
|
11 years ago |
|
wanglinchun
|
88b7fd24b1
|
给新建参赛作品中托管项目添加默认选项，使用户自行选择是否需要将参赛作品托管到制定的项目中
|
11 years ago |
 nwb
|
80e84069a1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
1d6816419d
|
优化用户申请加入项目界面刷新
|
11 years ago |
|
wanglinchun
|
56b66c8f5f
|
给参赛作品页面中托管项目添加超链接
|
11 years ago |
 z9hang
|
7d9b2c751b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
4fffd321d2
|
竞赛、课程主页贴吧动态及贴吧内帖子列表添加最后回复人
|
11 years ago |
|
yanxd
|
3e8decf1d1
|
student user_course
|
11 years ago |
|
yanxd
|
c5a3a5bac3
|
user_courses.html
|
11 years ago |
|
z9hang
|
21e58ce3df
|
课程列表中课程成员数量显示n+（不显示精确数）
只有课程成员能点击教师数量学生数量的链接和查看已提交作业的列表
|
11 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
|
yanxd
|
19aba25625
|
course revert search project
|
11 years ago |
|
sw
|
8bb8de7d7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
11 years ago |
|
sw
|
c7b19d8f2e
|
修改作业提交流程
|
11 years ago |
|
wanglinchun
|
12f3da8416
|
sdf
|
11 years ago |
|
wanglinchun
|
518de57123
|
将参赛作品编辑更新后的提示语修改为汉语
|
11 years ago |
|
wanglinchun
|
947c0f8f64
|
竞赛页面中添加参赛作品成功创建的提示语
|
11 years ago |
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
0f340a7cda
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
624a7f7bdd
|
还原资源文件管理的tag显示为一行
|
11 years ago |
|
fanqiang
|
45fa8b384a
|
修改字体颜色
|
11 years ago |
|
fanqiang
|
290d07ffdd
|
修改新建帖子bug（open_source_project）
|
11 years ago |
|
fanqiang
|
c5dd0317c2
|
修改合并后的bug（open_source_project）
|
11 years ago |
|
yanxd
|
0ab17f1e90
|
contest image show
|
11 years ago |
|
wanglinchun
|
a5cb14274c
|
修改参赛作品页面中未登录状态下的提示
|
11 years ago |
|
wanglinchun
|
dd43e2c3fc
|
竞赛页面我要参赛中添加判断，当用户未登录时提示登录后参赛
|
11 years ago |
|
xianbo
|
e3fe69c445
|
Merge branch 'test' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/open_source_projects/_show_topics.html.erb
|
11 years ago |
|
z9hang
|
45339e53d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
fanqiang
|
973a59042c
|
修改帖子显示用户名与链接问题
|
11 years ago |
|
wanglinchun
|
bcb3bf0c19
|
调整参赛作品编辑页面中托管项目列表的显示宽度
|
11 years ago |
|
fanqiang
|
aed4b250a0
|
修改数据库后修复bug
|
11 years ago |
|
wanglinchun
|
77b7da81fd
|
参赛作品页面编辑功能中添加修改托管项目列表完成
|
11 years ago |
|
yanxd
|
c4bd9aaabd
|
Merge branch 'szzh' into develop
|
11 years ago |
|
yanxd
|
4aed14228a
|
project/course/ members remove link
|
11 years ago |
|
yanxd
|
85c77ca074
|
xss, ckeditor js bug.
|
11 years ago |
|
yanxd
|
dac992548a
|
course_form
|
11 years ago |
|
nwb
|
0b4c95711a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4156983494
|
缺陷添加缩略图显示
|
11 years ago |
|
yanxd
|
7189d9a14a
|
course_form
|
11 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
|
yanxd
|
9ae8494c97
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
z9hang
|
5b8b2045f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
b3489d3e68
|
修改删除文件后跳转错误问题
|
11 years ago |
|
nwb
|
097489e594
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4d21933e09
|
1.优化资源文件上传下载界面
2.教师的课程界面优化
|
11 years ago |
|
wanglinchun
|
10b34341c7
|
修改参赛作品编辑页面说明文字：应用--》作品
|
11 years ago |
|
wanglinchun
|
2c30008981
|
竞赛页面中我要参赛下面修改温馨提示内容
|
11 years ago |
|
yanxd
|
2aeb12616b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
fanqiang
|
87a6dd4938
|
修改开源项目社区中 每个项目的结构， 不再是一对一的匹配帖子，而是添加了一个中间表
|
11 years ago |
|
sw
|
4de089250f
|
修改删除留言方法为destroy_jour，以及相关路由，访问action的改变
|
11 years ago |
|
yanxd
|
112b8de921
|
issues#575
|
11 years ago |
|
wanglinchun
|
f815410381
|
修改了新建参赛作品中托管项目的显示颜色和宽度
|
11 years ago |
|
yanxd
|
f9166a71a7
|
issues#555
|
11 years ago |
|
sw
|
c141501085
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
9a62fe22c6
|
修复作业留言模块先回复留言然后删除回复留言界面不会及时刷新的BUG
|
11 years ago |
|
yanxd
|
9373666576
|
混淆课程数量
|
11 years ago |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
11 years ago |
|
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
11 years ago |
|
sw
|
0de77bdc44
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
14a468066f
|
修复打开首页，SQL没有默认的school_id的问题
|
11 years ago |
|
yanxd
|
a76620a741
|
welcome footer
判断成员列表的查看
|
11 years ago |
|
fanqiang
|
543a199c5f
|
添加一张连接表relative_memo_to_open_source_projects
|
11 years ago |
|
z9hang
|
e78a309842
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
19d1682077
|
修改编辑作业提交文件处样式
|
11 years ago |
|
z9hang
|
eaa9c94290
|
自己的用户界面也不现实邮箱
|
11 years ago |
|
z9hang
|
2b12d31fb8
|
去除网站中的邮箱地址显示
|
11 years ago |
|
sw
|
7ead12dba6
|
1.优化路由代码
2.修改当查询学校课程数数量少于8个时，推荐9-当前学校课程数量门最好的课程给用户，并且排除当前学校课程
|
11 years ago |
|
z9hang
|
edf2a84072
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
2524600aeb
|
修正贴吧留言删除附件后跳转错误问题
|
11 years ago |
|
sw
|
3fee4211a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
11 years ago |
|
z9hang
|
ea095a6f61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
fc1d5baf95
|
课程、竞赛、项目的主页的上下间距缩小
logo和大学名称的居中对齐，以及搜索条的上下居中。
|
11 years ago |
|
nwb
|
5ca9d96acd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
7df6be8ff4
|
调整资源文件界面
|
11 years ago |
|
sw
|
8a6fa2166e
|
课程作业显示列表增加该作业平均评分
|
11 years ago |
|
sw
|
4c6b514d03
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
11 years ago |
|
yanxd
|
63af60d7b6
|
edit 图标丢失
bid修改文件保存
|
11 years ago |
|
z9hang
|
cb23b54d01
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
5d15349482
|
编辑作业时显示已添加的附件
|
11 years ago |
|
nwb
|
7e4343f00f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
t430
|
00b866f06a
|
Merge branch 'develop'
|
11 years ago |
|
wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
8f153520b4
|
调整上传资源界面
|
11 years ago |
|
wanglinchun
|
84ae8a1cde
|
调整了新建参赛作品的显示样式
|
11 years ago |
|
nwb
|
5c71d7e8be
|
1.资源上传默认类型修改为课件
2.调整标签显示
|
11 years ago |
|
sw
|
b27b3e0a5a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
029eb1a195
|
作业回复
|
11 years ago |
ganyiang
|
08562c48fe
|
修复osp所有帖子页面布局错乱问题
|
11 years ago |
|
z9hang
|
0385013905
|
修复主页跳转
去除老师删除项目型作业，优化代码
|
11 years ago |
|
yanxd
|
be87e02e4c
|
Revert "从主页登陆时跳转到个人主页"
This reverts commit a794d612af.
|
11 years ago |
|
yanxd
|
53a9d29292
|
Revert "acount"
This reverts commit 03dbcb1168.
|
11 years ago |
|
nwb
|
b736dc91ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4f7087f9ae
|
课程修正为只有的教师才能查看学生学号
|
11 years ago |
|
z9hang
|
e0592cd6f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
03dbcb1168
|
acount
|
11 years ago |
|
wanglinchun
|
73175aa9b8
|
调整好了参加竞赛的项目列表显示样式
|
11 years ago |
|
xianbo
|
9cdd101cc7
|
fix
|
11 years ago |
|
nwb
|
fa7227931d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
f218b87338
|
修正项目动态中缺陷编号错误的问题
|
11 years ago |
|
wanglinchun
|
44ec6eabf6
|
完成了竞赛中参赛应用列表显示的调整
|
11 years ago |
|
z9hang
|
06706b577d
|
贴吧、讨论区回复的样式修改
|
11 years ago |
|
z9hang
|
a794d612af
|
从主页登陆时跳转到个人主页
|
11 years ago |
|
yanxd
|
4db228f88e
|
调整tag高度为啥要修改两个地方我自己也忘了，改天再说
|
11 years ago |
|
wanglinchun
|
a0a2d04bd7
|
参赛项目取出提交的人
|
11 years ago |
|
nwb
|
f1b086ef90
|
资源类型添加对ppt文档的支持
|
11 years ago |
|
nwb
|
22c37602db
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
be73a232e8
|
修改显示
|
11 years ago |
|
nwb
|
f2f81e1d02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4b064f3c2a
|
1.用户留言添加了竞赛类信息
2.优化跳转显示
|
11 years ago |
|
yanxd
|
0c302c7aea
|
1s ===> 0.005s
|
11 years ago |
|
nwb
|
8ef716b920
|
1.个人动态留言显示出留言人
2.留言添加跳转链接
|
11 years ago |
|
yanxd
|
13a5aa988a
|
issues#623
|
11 years ago |
|
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
11 years ago |
|
z9hang
|
dcc2789aae
|
修正附件型作业已提交数量显示问题
|
11 years ago |
|
z9hang
|
fb9d6f74af
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
11 years ago |
|
wanglinchun
|
bb3536a7d5
|
调整了参赛作品页面中最终得分和打分总人数和下面文字的剧中对其
|
11 years ago |
|
wanglinchun
|
65f1e2a8d1
|
参赛作品页面添加托管项目网址+超链接+判断网址是否为空
|
11 years ago |
|
wanglinchun
|
f88322f2a1
|
参赛作品页面添加托管项目网址+超链接
|
11 years ago |
|
fanqiang
|
c6ee7e53e6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
fanqiang
|
1a7c82174c
|
修改表结构
|
11 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
|
nwb
|
aa89900813
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/files/index.html.erb
|
11 years ago |
|
nwb
|
81596d674b
|
屏蔽了温馨提示
|
11 years ago |
|
z9hang
|
6086b25db7
|
贴吧帖子倒序去掉楼层
|
11 years ago |
|
nwb
|
cea01b4df5
|
优化错误提示
|
11 years ago |
|
z9hang
|
7137f2663c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d2fd2f90e6
|
作业删除图标添加
|
11 years ago |
|
wanglinchun
|
cea41a7aab
|
df
|
11 years ago |
|
wanglinchun
|
fd87245251
|
sdew
|
11 years ago |
|
yanxd
|
14e4bf5bcc
|
typo
|
11 years ago |
|
wanglinchun
|
75853bca01
|
调整竞赛中参赛作品各项指标的位置
|
11 years ago |
|
yanxd
|
665a17eda5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
yanxd
|
829c77879a
|
typo
|
11 years ago |
|
nwb
|
b733f5c2b9
|
修正后台注册用户问题
|
11 years ago |
|
z9hang
|
a19a1b74a7
|
修正作业数显示不一致问题
|
11 years ago |
|
wanglinchun
|
d019a4d9ce
|
重新调整了：评奖，暂未评奖，未评奖
|
11 years ago |
|
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
11 years ago |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
11 years ago |
|
nwb
|
4235ca8984
|
修正BUG
|
11 years ago |
|
z9hang
|
5649cc545e
|
修正项目列表界面搜索空值报错问题
|
11 years ago |
|
nwb
|
c0c184d8bf
|
1.修正错误
2.添加全部资源视图时的对资源分类的编辑
|
11 years ago |
|
nwb
|
4136cd27c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
1caa7940dc
|
1、资源发布者的分类和tag编辑；
2、网站管理者对资源的再分类和tag再编辑
|
11 years ago |
|
nwb
|
8badbb1e78
|
1.添加附件资源类型编辑视图与逻辑
2.添加附件资源类型编辑js、control相关逻辑
|
11 years ago |
|
ganyiang
|
eda5121195
|
1.新增osp项目所有帖子的显示页面（待改进）
2.修改osp社区主页的[全球热帖]显示数量，默认25条->10条
|
11 years ago |
|
z9hang
|
77b5ce658b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
8dab599fd2
|
讨论区回帖顺序改为与留言一致（新回复在前）
|
11 years ago |
|
z9hang
|
91d2b58cf4
|
当前用户没有提交作业权限时屏蔽该按钮
|
11 years ago |
|
yanxd
|
603010c30a
|
remove map
|
11 years ago |
|
xianbo
|
a22e082cb5
|
fix repository info
|
11 years ago |
|
xianbo
|
95dab82823
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
ganyiang
|
27ade53af3
|
针对OSP社区的新需求的界面展示：
1.开源项目社区(OSP)index界面增加[软件安全漏洞]展示
2.osp项目主页增加[项目安全态势]、[技术创新趋势] 展示
ps.此次为不负责任的提交~
|
11 years ago |
|
z9hang
|
da37a12158
|
优化代码
|
11 years ago |
|
wanglinchun
|
a8b58016fa
|
df
|
11 years ago |
|
nwb
|
9c24102e65
|
清理部分不需要的文件
|
11 years ago |
|
z9hang
|
57a4f45cad
|
修复编辑作业提交返回错误信息时填入正确信息后异常bug
|
11 years ago |
|
z9hang
|
fcc5f220ce
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
b237f578f4
|
提交缺陷发送邮件，问题编号修改
|
11 years ago |
|
wanglinchun
|
69c1ddad5c
|
新建参赛作品中添加托管项目网址并调整新建参赛作品列表的相关样式
|
11 years ago |
|
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址；
参赛应用页面添加所属项目网址；
|
11 years ago |
|
nwb
|
25dba88a08
|
1.优化界面
2.资源下载界面添加按文件类型分类浏览
|
11 years ago |
|
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
11 years ago |
|
z9hang
|
73dcf3679d
|
去除课程、项目配置中的讨论区配置
|
11 years ago |
|
nwb
|
0772e04510
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
79b498914a
|
修改错误
|
11 years ago |
|
nwb
|
75f584a6e2
|
1.完成分类资源下载视图显示
2.优化代码，删除冗余代码
|
11 years ago |
|
wanglinchun
|
fc2f35f247
|
将关联功能整合到新建参赛作品中，可以直接关联到竞赛中
|
11 years ago |
|
sw
|
64900b1fd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
5d2bb4ccbd
|
1.选择学校进入学校课程列表，点击更多由显示所有课程可能改为显示当前学校课程列表，之后排序也一样
2.当查询学校课程列表为空时，推荐改为本系统中本年度开设的最好的课程，同时加入课程改为关注课程。此时点击更多查看的为所有课程
3.查询出课程列表将学校和教师放在课程上面
|
11 years ago |
|
wanglinchun
|
cf18b94326
|
调整了竞赛中的参赛作品列表按得分排序；
增加参赛作品页面和竞赛中参赛作品得分
|
11 years ago |
|
wanglinchun
|
da48b5ba36
|
swd
|
11 years ago |
|
wanglinchun
|
81c3659a89
|
调整新建参赛作品的显示样式
|
11 years ago |
|
wanglinchun
|
62c81ad884
|
给竞赛中的参赛作品添加最终得分
|
11 years ago |
|
wanglinchun
|
73a82662af
|
应用最终得分数值保留两位小数
|
11 years ago |
|
wanglinchun
|
121b6389d5
|
应用页面增加显示最终得分的分值
|
11 years ago |
|
nwb
|
431b6603f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
11 years ago |
|
wanglinchun
|
dcc4167e06
|
将竞赛中参赛作品列表的排序方式改为按打分高低
|
11 years ago |
|
xianbo
|
297835e25b
|
fix
|
11 years ago |
|
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
11 years ago |
|
wanglinchun
|
47b3c55b40
|
修改首页中的app为作品
|
11 years ago |
yanxd
|
f35dd2a30d
|
提交作业字段不合验证，返回页面bug
|
11 years ago |
|
sw
|
75902ff118
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
z9hang
|
a80da022cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
xianbo
|
2140b45cc5
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
19e851d65a
|
路由注册验证ajax，课程边栏的单位
|
11 years ago |
|
xianbo
|
a7d2bc3f76
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
c702867250
|
Merge remote-tracking branch 'origin/develop' into develop
|
11 years ago |
|
yanxd
|
e6e001246f
|
# 必填自己的工作单位，其实就是学校
|
11 years ago |
|
sw
|
b97c2e230f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
74a9aa14d6
|
增加获取学校列表按学校开设课程数排序的方法
增加当当前学校开设课程数目为0时按照上方法推荐其进入其他学校查看课程
|
11 years ago |
|
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
11 years ago |
|
wanglinchun
|
1e0e5a5ab1
|
Merge branch 'competition' into develop
Conflicts:
config/routes.rb
|
11 years ago |
|
wanglinchun
|
19eb071a77
|
dfd
|
11 years ago |
|
wanglinchun
|
38c7216097
|
添加了新建参赛作品后弹出新建成功的提示框
|
11 years ago |
|
wanglinchun
|
1e39080cf1
|
将参赛作品列表中所属竞赛的链接调整为跳转到我要参赛
|
11 years ago |
|
wanglinchun
|
e46ca4c879
|
将参赛作品页面中的所属竞赛链接调整为跳转到竞赛中的我要参赛
|
11 years ago |
|
yanxd
|
49d6e408b4
|
修改资料页面结构调整
|
11 years ago |
|
xianbo
|
7a4127a3f7
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
wanglinchun
|
2b44b1b893
|
将竞赛中参赛作品列表按照时间顺序逆序排列（针对参赛应用）
|
11 years ago |
|
yanxd
|
19ddb38e1b
|
异步验证注册字段合法
|
11 years ago |
|
wanglinchun
|
ca38afff61
|
调整了参赛项目的显示顺序，按照时间降序
|
11 years ago |
|
wanglinchun
|
7d33bb9b2d
|
将原有的新建参赛作品时弹出新页面变为了本页弹出下拉框
|
11 years ago |
|
wanglinchun
|
bc07f4c9e5
|
修改参赛应用页面中所属类别的显示长度
|
11 years ago |
|
wanglinchun
|
72e9515f4d
|
修正竞赛子站首页和竞赛列表页面中参赛作品的统计数量（由于以前的参赛项目有私有项目导致统计数量有误）
|
11 years ago |
|
nwb
|
9f1d0d3437
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
11 years ago |
|
yanxd
|
4d8701220b
|
-。-
acoount.html对齐了一下
学校列表school/index.html默认显示全部学校
没有填写工作单位的用户强行跳转到修改资料页面
|
11 years ago |
|
wanglinchun
|
4d5ac2780d
|
调整新建参赛作品弹出框样式
|
11 years ago |
|
wanglinchun
|
d96e1045d7
|
er
|
11 years ago |
|
nwb
|
753746f833
|
1.项目添加资源分类
2.修改文件上传功能，添加新参数
3.修改文件上传界面
|
11 years ago |
|
wanglinchun
|
b182debc16
|
将竞赛页面中“新建参赛作品”的弹出形式由弹出新页面改为本页弹出下拉框，目前已有效果，写数据库有问题
|
11 years ago |
|
z9hang
|
2077b1e8b8
|
课程，竞赛页面问题反馈前添加吧名
|
11 years ago |
|
yanxd
|
845186a600
|
把课程列表中的学校信息修改为，显示老师身份中的学校信息
|
11 years ago |
|
z9hang
|
425e2bb11e
|
course网站中未选学校，有登陆用户，且登陆用户已填学校时添加链接
|
11 years ago |
|
z9hang
|
7a341972e7
|
course网站中大学名加上该大学在本站的链接
|
11 years ago |
|
z9hang
|
a57d5fd823
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
14dcb18b96
|
将作业旁边的 “好问题”，“烂问题” 选项去掉
|
11 years ago |
|
z9hang
|
bdea0ee36a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
wanglinchun
|
5d966df410
|
sdf
|
11 years ago |
|
wanglinchun
|
30f9bc9178
|
隐藏竞赛页面参赛项目和参赛应用；
隐藏竞赛页面中关注的“更多”功能
|
11 years ago |
|
wanglinchun
|
96b083a8a3
|
修改竞赛子站首页部分显示方式
|
11 years ago |
|
wanglinchun
|
9c0f06bbc2
|
修改参赛作品页面部分显示方式
|
11 years ago |
|
xianbo
|
2dc476018c
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
wanglinchun
|
3edb1114c3
|
修改参赛作品列表页面的部分显示方式
|
11 years ago |
|
wanglinchun
|
4696bcf40c
|
修改竞赛列表参赛作品数量
|
11 years ago |
|
wanglinchun
|
b1041d1395
|
修改了竞赛列表页面中参赛作品的数量
|
11 years ago |
|
wanglinchun
|
5c04f91857
|
修改了竞赛页面中关注人数的统计
|
11 years ago |
|
wanglinchun
|
caff0f55c9
|
调整了竞赛页面中参赛作品数量统计及跳转
|
11 years ago |
|
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
11 years ago |
|
nwb
|
42e6fc6a68
|
1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
|
11 years ago |
|
nwb
|
b94bd99311
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
268dc1acce
|
主页讨论吧动态前显示吧名
|
11 years ago |
|
wanglinchun
|
d686e105a5
|
调整关联作品框显示宽度
|
11 years ago |
|
ganyiang
|
2048ce3c10
|
修复高校列表在firefox下显示不正常问题
|
11 years ago |
|
wanglinchun
|
538f8516b0
|
目前已经通过判断将属于竞赛的项目或是应用显示到我要参赛的作品列表中
|
11 years ago |
|
z9hang
|
3caedbdb85
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
11 years ago |
|
wanglinchun
|
f2dbbc48fc
|
发布作品和关联作品都可以用了，参赛应用也可以取出来了，接下来通过判断来去参赛项目和参赛应用
|
11 years ago |
 kg
|
57e5cda513
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
kg
|
db2ab5b945
|
modify issue filter and base_footer
|
11 years ago |
|
wanglinchun
|
fb3c513da2
|
给“我要参赛”应用了base——newcontest的整体样式
|
11 years ago |
|
wanglinchun
|
fe151f9e29
|
竞赛页面中增加“我要参赛”菜单
|
11 years ago |
|
ganyiang
|
786481e144
|
新建问题-主题-autocomplete-选中跳转
|
11 years ago |
|
nwb
|
faab40456a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
a5f7a19f48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
fanqiang
|
9b151567f1
|
修改没有帮助显示问题
|
11 years ago |
|
wanglinchun
|
1471d78e63
|
修改应用列表页面中每个应用右边三行的行间距
|
11 years ago |
|
yanxd
|
05baffe4f3
|
issue导航，首页贴吧动态html,加入了最后回复
|
11 years ago |
|
wanglinchun
|
bb3c7f2432
|
修改了应用列表页面所属竞赛的显示长度
|
11 years ago |
Wen
|
e8247b6edd
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
Wen
|
d94e15cd94
|
用户打分
|
11 years ago |
|
z9hang
|
f8c61ac69b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
f8746d6812
|
access control：关闭课程in view
|
11 years ago |
|
yanxd
|
d257f4e853
|
随便关闭课程禁止//临时
|
11 years ago |
|
wanglinchun
|
31dff76b3a
|
修改了首页竞赛中包含的app的字体的大小
|
11 years ago |
|
z9hang
|
0af034eac6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
fanqiang
|
547a268af8
|
修改合并之后的一些小问题
|
11 years ago |
 huangjingquan
|
dc4e928741
|
修改tag显示异常
|
11 years ago |
|
wanglinchun
|
4188c046c7
|
Merge branch 'develop'
|
11 years ago |
|
Wen
|
501b491363
|
=.=
|
11 years ago |
|
wanglinchun
|
c6576c71bf
|
增加了每个app打分的总人数
|
11 years ago |
|
fanqiang
|
d50b2a9cfe
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
fanqiang
|
e89d74e2a9
|
开源项目中新增tag，搜索查找待新增tag的obj
|
11 years ago |
|
fanqiang
|
2c8580a4e8
|
Merge branch 'crawl' into develop
Conflicts:
app/controllers/tags_controller.rb
app/views/tags/_tag.html.erb
app/views/tags/_tag_search_results.html.erb
app/views/tags/index.html.erb
config/locales/zh.yml
config/routes.rb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
0634f36c10
|
"打分后不要显示英文，而且还要提示：您可以重新打分"问题解决
|
11 years ago |
|
fanqiang
|
dbef2f958a
|
osp_id validate
|
11 years ago |
|
wanglinchun
|
ac644beb72
|
添加竞赛首页中参与竞赛的app个数
|
11 years ago |
|
yanxd
|
2b5cdf161c
|
不能删除帖子问题
|
11 years ago |
|
yanxd
|
5a6abab224
|
Merge branch 'master' of 10.0.47.245:/home/trustie2
|
11 years ago |
|
yanxd
|
5d27bb5a28
|
不能删除帖子到问题
|
11 years ago |
|
wanglinchun
|
374b183c0f
|
修改应用列表显示问题
|
11 years ago |
|
kg
|
881c91fafd
|
Merge branch 'develop'
|
11 years ago |
|
kg
|
776a9d1e35
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
Wen
|
e6288627ad
|
中国高校页面，下拉框修改
|
11 years ago |
|
Wen
|
c893227609
|
个人资料页面学校选择框更改
|
11 years ago |
|
wanglinchun
|
688438241e
|
调整应用列表页面中的bug
|
11 years ago |
|
wanglinchun
|
35c424814e
|
竞赛模块首页应用添加更多链接到应用列表页面
|
11 years ago |
|
Wen
|
90b53a7efb
|
打分的调整
|
11 years ago |
|
wanglinchun
|
37304c1232
|
添加应用页面中的打分详情
|
11 years ago |
|
wanglinchun
|
74256d5150
|
调整应用页面中的距离格式
|
11 years ago |
|
Wen
|
040e4b2740
|
用户打分.
|
11 years ago |
|
yanxd
|
0cfd5929d8
|
Revert "tag todo"
eee
This reverts commit 08b27f38a7.
|
11 years ago |
|
wanglinchun
|
e48edac988
|
增加参赛应用页面的打分细节--初级版
|
11 years ago |
|
wanglinchun
|
3da6d5cd37
|
应用页面列表排序（按时间排序已好，另一种排序暂未定）
|
11 years ago |
|
wanglinchun
|
0eb81a24af
|
跳转
|
11 years ago |
|
wanglinchun
|
dbe4c26322
|
应用列表分页功能
|
11 years ago |
|
wanglinchun
|
db2d2e9b24
|
删掉没用的分页代码
|
11 years ago |
|
wanglinchun
|
0403666cea
|
增加应用列表页面的分页功能
|
11 years ago |
|
kg
|
0f51480bab
|
amend course search
|
11 years ago |
|
wanglinchun
|
12ad20cf3b
|
修改应用列表页面的显示标题为：应用列表-Trustie——为大学生技术创新筑巢
|
11 years ago |
|
wanglinchun
|
b424e9148e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
Wen
|
50745d5d21
|
course首页布局上的小调整
|
11 years ago |
|
wanglinchun
|
6ab0eb4477
|
修改后发现错误
|
11 years ago |
|
wanglinchun
|
7cc4a9f3a6
|
调整字数限制
|
11 years ago |
|
wanglinchun
|
c40bc242cd
|
调整了应用列表页面中的搜索显示格式；
调整了竞赛页面中的参赛应用列表的简介的长度（增加了显示长度限制）；
调整了具体参赛应用页面中应用应用简介的长度（将原来的限制为150改为不限制，便于读者）
|
11 years ago |
|
t430
|
6b526ee438
|
fix
|
11 years ago |
|
wanglinchun
|
d073074737
|
修改应用列表页面格式
|
11 years ago |
|
wanglinchun
|
bdb1c3f74e
|
实现应用列表页面
|
11 years ago |
yan
|
a191b634c5
|
forum memocount error, footer margin
|
11 years ago |
|
xianbo
|
6f2b23ce37
|
Merge branch 'develop'
Conflicts:
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
Wen
|
10fdcbb050
|
一个简单的后台上传学校logo的页面.
|
11 years ago |
|
fanqiang
|
6ba53f534a
|
添加回复帖子功能
|
11 years ago |
|
Wen
|
03d58b962a
|
封装了一下取得logo的方法
|
11 years ago |
|
kg
|
e9bd8a8f3e
|
revise project index,course,search
|
11 years ago |
|
Wen
|
a8e029da58
|
数据库迁移：更改了默认的学校logo
|
11 years ago |
|
fanqiang
|
87c70909be
|
可以在开源社区添加帖子，并且添加了帖子的URL,即帖子来源
|
11 years ago |
|
yanxd
|
be6ae6ef34
|
d
|
11 years ago |
|
wanglinchun
|
b542f8072d
|
调整竞赛列表页面中的排序问题
|
11 years ago |
|
fanqiang
|
07b75924d8
|
修改tag搜索，使得tag搜索能够搜索开源项目
在帖子展示页面添加时间，并添加标签
|
11 years ago |
|
wanglinchun
|
3a9c7a036f
|
修改竞赛列表中的奖励方式的显示
|
11 years ago |
|
yanxd
|
939e4cc100
|
footer 下方距离
welcome调整下主页
|
11 years ago |
|
yanxd
|
08892d1cf7
|
s
|
11 years ago |
|
wanglinchun
|
c16933120d
|
修改竞赛子站首页显示
|
11 years ago |
|
wanglinchun
|
9f75bf179a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
8f5958abc1
|
mao
|
11 years ago |
|
yanxd
|
230b377cad
|
oRevert "leanmodal"
oik
This reverts commit edce128e6b.
|
11 years ago |
|
yanxd
|
12c19e2bfe
|
Revert "jquery 点击省份出学校"
revert
This reverts commit 891fa65c16.
|
11 years ago |
|
yanxd
|
891fa65c16
|
jquery 点击省份出学校
|
11 years ago |
|
yanxd
|
edce128e6b
|
leanmodal
|
11 years ago |
|
wanglinchun
|
189b935d5b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
wanglinchun
|
ed71a3faa1
|
调整删除竞赛的显示样式及位置
|
11 years ago |
|
Wen
|
bac261047f
|
logo
|
11 years ago |
|
Wen
|
d237a5b824
|
transparent_logo
|
11 years ago |
|
Wen
|
ba80593ab0
|
别忘了改数据库！= =
|
11 years ago |
|
wanglinchun
|
1ca0113204
|
Merge branch 'competition' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
Wen
|
60101b169a
|
= =
|
11 years ago |
|
wanglinchun
|
9038f2758c
|
根据将旧的竞赛信息和参与竞赛的项目信息迁移到新的竞赛相关数据表后重新调整竞赛子站首页最新热门竞赛的显示
|
11 years ago |
|
Wen
|
02295e5ca9
|
给严总调试用
|
11 years ago |
|
Wen
|
cc738edf2f
|
学校列表添加了搜索功能
|
11 years ago |
|
yanxd
|
f4595dfcd2
|
修改部分拍段project、course方式
projectlist 报错
|
11 years ago |
|
wanglinchun
|
9baa07b9a3
|
调整参赛应用页面中两列的显示，主要是防止应用下载和开发人员字数太长显示的问题，使其可以自动换行
|
11 years ago |
|
yanxd
|
08b27f38a7
|
tag todo
|
11 years ago |
|
wanglinchun
|
6afef880dc
|
修改contest表中budget字段的属性，将integer改为string
|
11 years ago |
|
yanxd
|
653fe6c1ea
|
所有发邮件都新开线程
|
11 years ago |
|
kg
|
14511c079a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
kg
|
0ff3734aae
|
delete nothing
|
11 years ago |
|
kg
|
77ea0092b7
|
add course homepage activity
|
11 years ago |
|
yanxd
|
cee205a568
|
issues#377 074e8adf 引入的issue页面权限问题，除了控制器还修改过views判断语句 keyworks: @edit_allowed
issues#379 tag字符串短
issues#380 tag 提交之后 不隐藏输入框
issues#381 搜索框有误
|
11 years ago |
|
yanxd
|
2052d36abe
|
issue:socialForge#381
|
11 years ago |
|
kg
|
daa19de51d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
kg
|
709629bcdf
|
add course activity
|
11 years ago |
|
kg
|
271427d29e
|
homepage status
|
11 years ago |
|
Wen
|
6a2626c90e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
Wen
|
cf762e6aa3
|
bug fix~
|
11 years ago |
|
Wen
|
08e40c4a4e
|
bug fix
|
11 years ago |
|
Wen
|
473a44d11a
|
学校-课程模式！
|
11 years ago |
|
wanglinchun
|
9af6c03547
|
Merge branch 'competition' into develop
Conflicts:
Gemfile.lock
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
wanglinchun
|
6b5452f3e2
|
增加修改应用时提示语
|
11 years ago |
|
yanxd
|
e2a5e2f730
|
footer
|
11 years ago |
|
wanglinchun
|
3608cecca5
|
增加应用软件包的后缀格式
|
11 years ago |
|
wanglinchun
|
c272d7a8c7
|
调整应用的修改功能，使其可以更新重新上传的文件，但是会删除上次上传的文件
|
11 years ago |
|
Wen
|
735f920e9d
|
注册页面学校显示方式修改为文本框
|
11 years ago |
|
wanglinchun
|
a90804b312
|
修改上传应用软件包和截图的说明文字
|
11 years ago |
|
wanglinchun
|
5d752f785f
|
竞赛页面中应用列表题目增加：点击后弹出新页面
|
11 years ago |
|
Wen
|
f8c6d7d77e
|
注册时学校选择的小调整
|
11 years ago |
|
Wen
|
59d705b33c
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
Wen
|
7be7fd3d9b
|
学校选择形式改为弹窗
|
11 years ago |
|
wanglinchun
|
b318166c15
|
给参与竞赛的应用页面增加导航条
|
11 years ago |
|
yanxd
|
60bc3bb1b2
|
seem_rateable to lib, using Engine setting routes
|
11 years ago |
|
wanglinchun
|
0bdb3eb118
|
应用页面添加所属竞赛及相应链接
|
11 years ago |
|
wanglinchun
|
05c0d2a5ac
|
替换竞赛模块首页中竞赛和应用的图标并调整相应的格式
|
11 years ago |
|
Wen
|
3dbe7c5896
|
课程的学校ID自动设置为开课教师的学校ID
去掉课程添加界面上的学校选择
|
11 years ago |
|
Wen
|
00e62ec8f7
|
用户评分理论上完成版.
|
11 years ago |
|
wanglinchun
|
bc068eb12b
|
添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
|
11 years ago |
|
fanqiang
|
91d5959016
|
添加了对管理员申请的接受与拒绝
|
11 years ago |
|
Wen
|
ded3da6670
|
用户评分理论上完成了
|
11 years ago |
|
Wen
|
dee5808407
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
0791c35df1
|
赞踩关联关系
|
11 years ago |
|
wanglinchun
|
cc5b55ec9c
|
调整应用页面中简介显示上下边距以及简介限定字数显示格式
|
11 years ago |
|
fanqiang
|
28b10ed3fd
|
修改了搜索功能，并能对搜索进行过滤
|
11 years ago |
|
Wen
|
3ba524668f
|
用户评分未完成版本= =
上传一下以防丢了
|
11 years ago |
|
wanglinchun
|
7758e9bbf1
|
df
|
11 years ago |
|
yanxd
|
6e4944b914
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
e5a5a337b2
|
format code
|
11 years ago |
|
wanglinchun
|
66c4d870a4
|
评分样式
|
11 years ago |
|
yanxd
|
0226052dd0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
2b679b1ef9
|
看图不登录
|
11 years ago |
|
wanglinchun
|
8a429ec669
|
首页提示语
|
11 years ago |
|
wanglinchun
|
94a7bacdd2
|
首页：当无应用时，提示暂无应用
|
11 years ago |
 alan
|
87fdecdabd
|
创新竞赛添加删除功能
|
11 years ago |
|
yanxd
|
daf7e8d200
|
user added rater
|
11 years ago |
|
yanxd
|
e802424e2a
|
merge jrating
|
11 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
11 years ago |
 baiyu
|
f0b497e455
|
user score merge
|
11 years ago |
|
baiyu
|
36cd91401f
|
user score
|
11 years ago |
|
alan
|
9a580655ab
|
在project的项目动态的最后一页显示项目创建信息
|
11 years ago |
|
xianbo
|
0d055fd807
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
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 |
