 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 |
|
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 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|
wanglinchun
|
ac644beb72
|
添加竞赛首页中参与竞赛的app个数
|
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
|
db2d2e9b24
|
删掉没用的分页代码
|
11 years ago |
|
wanglinchun
|
0403666cea
|
增加应用列表页面的分页功能
|
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 |
|
xianbo
|
6f2b23ce37
|
Merge branch 'develop'
Conflicts:
app/views/layouts/_base_footer.html.erb
|
11 years ago |
yan
|
a191b634c5
|
forum memocount error, footer margin
|
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 |
|
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 |
|
wanglinchun
|
9038f2758c
|
根据将旧的竞赛信息和参与竞赛的项目信息迁移到新的竞赛相关数据表后重新调整竞赛子站首页最新热门竞赛的显示
|
11 years ago |
|
Wen
|
02295e5ca9
|
给严总调试用
|
11 years ago |
|
Wen
|
cc738edf2f
|
学校列表添加了搜索功能
|
11 years ago |
|
wanglinchun
|
9baa07b9a3
|
调整参赛应用页面中两列的显示，主要是防止应用下载和开发人员字数太长显示的问题，使其可以自动换行
|
11 years ago |
|
yanxd
|
08b27f38a7
|
tag todo
|
11 years ago |
|
kg
|
14511c079a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
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 |
|
Wen
|
735f920e9d
|
注册页面学校显示方式修改为文本框
|
11 years ago |
|
wanglinchun
|
a90804b312
|
修改上传应用软件包和截图的说明文字
|
11 years ago |
|
wanglinchun
|
5d752f785f
|
竞赛页面中应用列表题目增加：点击后弹出新页面
|
11 years ago |
|
Wen
|
f8c6d7d77e
|
注册时学校选择的小调整
|
11 years ago |
|
Wen
|
7be7fd3d9b
|
学校选择形式改为弹窗
|
11 years ago |
|
wanglinchun
|
b318166c15
|
给参与竞赛的应用页面增加导航条
|
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 |
|
wanglinchun
|
cc5b55ec9c
|
调整应用页面中简介显示上下边距以及简介限定字数显示格式
|
11 years ago |
|
fanqiang
|
28b10ed3fd
|
修改了搜索功能，并能对搜索进行过滤
|
11 years ago |
|
Wen
|
3ba524668f
|
用户评分未完成版本= =
上传一下以防丢了
|
11 years ago |
|
wanglinchun
|
7758e9bbf1
|
df
|
11 years ago |
|
wanglinchun
|
66c4d870a4
|
评分样式
|
11 years ago |
|
wanglinchun
|
8a429ec669
|
首页提示语
|
11 years ago |
|
wanglinchun
|
94a7bacdd2
|
首页：当无应用时，提示暂无应用
|
11 years ago |
 alan
|
87fdecdabd
|
创新竞赛添加删除功能
|
11 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
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 |
|
yanxd
|
9034dd09e7
|
开启重启课程在课程列表里
|
11 years ago |
|
wanglinchun
|
edb5dac785
|
添加竞赛列表页面中的超链接
|
11 years ago |
|
wanglinchun
|
43064c4bc2
|
调整竞赛模块首页中显示的竞赛：既有旧的竞赛又有新的竞赛
|
11 years ago |
|
yanxd
|
a4ab29f49d
|
footer logo modify
|
11 years ago |
|
fanqiang
|
a611ed4848
|
修改了按标签搜索，并改了一些样式
|
11 years ago |
|
wanglinchun
|
3d02cb7ce0
|
修改首页显示部分数据
|
11 years ago |
|
xianbo
|
2c7615b545
|
fix robots rule
|
11 years ago |
|
yanxd
|
369c015097
|
board show
|
11 years ago |
|
kg
|
158c950b78
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
kg
|
bdefa322cc
|
modify foot
|
11 years ago |
|
wanglinchun
|
25bbf791f9
|
dsfsd
|
11 years ago |
|
wanglinchun
|
651710929a
|
修改弹出新页面
|
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 |
|
Wen
|
775774ad63
|
临时措施：即使用户没有填写单位，页面也可以正常打开，而不是报错
|
11 years ago |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
11 years ago |
|
wanglinchun
|
e136254c8d
|
回复了项目页面中的头像
|
11 years ago |
|
Wen
|
4e567afd0a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
5ee1c8e2f2
|
refactory zip
|
11 years ago |
|
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
11 years ago |
