Commit Graph

1751 Commits (d77d7e14c7f14cb159980fa4c20585a7ba3d868e)

Author SHA1 Message Date
wanglinchun 65f1e2a8d1 参赛作品页面添加托管项目网址+超链接+判断网址是否为空
12 years ago
wanglinchun f88322f2a1 参赛作品页面添加托管项目网址+超链接
12 years ago
fanqiang c6ee7e53e6 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
fanqiang 1a7c82174c 修改表结构
12 years ago
xianbo 66a5db5ad3 Merge branch 'szzh' into develop
12 years ago
nwb aa89900813 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
nwb 81596d674b 屏蔽了温馨提示
12 years ago
z9hang 6086b25db7 贴吧帖子倒序去掉楼层
12 years ago
nwb cea01b4df5 优化错误提示
12 years ago
z9hang 7137f2663c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
z9hang d2fd2f90e6 作业删除图标添加
12 years ago
wanglinchun cea41a7aab df
12 years ago
wanglinchun fd87245251 sdew
12 years ago
yanxd 14e4bf5bcc typo
12 years ago
wanglinchun 75853bca01 调整竞赛中参赛作品各项指标的位置
12 years ago
yanxd 665a17eda5 Merge remote-tracking branch 'origin/szzh' into szzh
12 years ago
yanxd 829c77879a typo
12 years ago
nwb b733f5c2b9 修正后台注册用户问题
12 years ago
z9hang a19a1b74a7 修正作业数显示不一致问题
12 years ago
wanglinchun d019a4d9ce 重新调整了:评奖,暂未评奖,未评奖
12 years ago
wanglinchun 4ea8611942 教师评奖功能初步完成
12 years ago
nwb 6f0e621f3c 添加项目成员界面,显示用户的account
12 years ago
nwb 4235ca8984 修正BUG
12 years ago
z9hang 5649cc545e 修正项目列表界面搜索空值报错问题
12 years ago
nwb c0c184d8bf 1.修正错误
12 years ago
nwb 4136cd27c8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
nwb 1caa7940dc 1、资源发布者的分类和tag编辑;
12 years ago
nwb 8badbb1e78 1.添加附件资源类型编辑视图与逻辑
12 years ago
ganyiang eda5121195 1.新增osp项目所有帖子的显示页面(待改进)
12 years ago
z9hang 77b5ce658b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
z9hang 8dab599fd2 讨论区回帖顺序改为与留言一致(新回复在前)
12 years ago
z9hang 91d2b58cf4 当前用户没有提交作业权限时屏蔽该按钮
12 years ago
yanxd 603010c30a remove map
12 years ago
xianbo a22e082cb5 fix repository info
12 years ago
xianbo 95dab82823 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
ganyiang 27ade53af3 针对OSP社区的新需求的界面展示:
12 years ago
z9hang da37a12158 优化代码
12 years ago
wanglinchun a8b58016fa df
12 years ago
nwb 9c24102e65 清理部分不需要的文件
12 years ago
z9hang 57a4f45cad 修复编辑作业提交返回错误信息时填入正确信息后异常bug
12 years ago
z9hang fcc5f220ce Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
nwb b237f578f4 提交缺陷发送邮件,问题编号修改
12 years ago
wanglinchun 69c1ddad5c 新建参赛作品中添加托管项目网址并调整新建参赛作品列表的相关样式
12 years ago
wanglinchun bbd293272d 添加参赛作品所属项目的网址;
12 years ago
nwb 25dba88a08 1.优化界面
12 years ago
nwb 284e6ba20a 1.添加部分默认数据
12 years ago
z9hang 73dcf3679d 去除课程、项目配置中的讨论区配置
12 years ago
nwb 0772e04510 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
nwb 79b498914a 修改错误
12 years ago
nwb 75f584a6e2 1.完成分类资源下载视图显示
12 years ago
wanglinchun fc2f35f247 将关联功能整合到新建参赛作品中,可以直接关联到竞赛中
12 years ago
sw 64900b1fd7 Merge remote-tracking branch 'origin/szzh' into szzh
12 years ago
sw 5d2bb4ccbd 1.选择学校进入学校课程列表,点击更多由显示所有课程可能改为显示当前学校课程列表,之后排序也一样
12 years ago
wanglinchun cf18b94326 调整了竞赛中的参赛作品列表按得分排序;
12 years ago
wanglinchun da48b5ba36 swd
12 years ago
wanglinchun 81c3659a89 调整新建参赛作品的显示样式
12 years ago
wanglinchun 62c81ad884 给竞赛中的参赛作品添加最终得分
12 years ago
wanglinchun 73a82662af 应用最终得分数值保留两位小数
12 years ago
wanglinchun 121b6389d5 应用页面增加显示最终得分的分值
12 years ago
nwb 431b6603f1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
nwb e5bbd68c8c 1.添加资源分类浏览视图
12 years ago
wanglinchun dcc4167e06 将竞赛中参赛作品列表的排序方式改为按打分高低
12 years ago
xianbo 297835e25b fix
12 years ago
sw f487352d6d 当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
12 years ago
wanglinchun 47b3c55b40 修改首页中的app为作品
12 years ago
yanxd f35dd2a30d 提交作业字段不合验证,返回页面bug
12 years ago
sw 75902ff118 Merge remote-tracking branch 'origin/szzh' into szzh
12 years ago
z9hang a80da022cb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
xianbo 2140b45cc5 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
yanxd 19e851d65a 路由注册验证ajax,课程边栏的单位
12 years ago
xianbo a7d2bc3f76 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
yanxd c702867250 Merge remote-tracking branch 'origin/develop' into develop
12 years ago
yanxd e6e001246f # 必填自己的工作单位,其实就是学校
12 years ago
sw b97c2e230f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
sw 74a9aa14d6 增加获取学校列表按学校开设课程数排序的方法
12 years ago
yanxd 9976697a58 Merge remote-tracking branch 'origin/develop' into szzh
12 years ago
wanglinchun 1e0e5a5ab1 Merge branch 'competition' into develop
12 years ago
wanglinchun 19eb071a77 dfd
12 years ago
wanglinchun 38c7216097 添加了新建参赛作品后弹出新建成功的提示框
12 years ago
wanglinchun 1e39080cf1 将参赛作品列表中所属竞赛的链接调整为跳转到我要参赛
12 years ago
wanglinchun e46ca4c879 将参赛作品页面中的所属竞赛链接调整为跳转到竞赛中的我要参赛
12 years ago
yanxd 49d6e408b4 修改资料页面结构调整
12 years ago
xianbo 7a4127a3f7 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
wanglinchun 2b44b1b893 将竞赛中参赛作品列表按照时间顺序逆序排列(针对参赛应用)
12 years ago
yanxd 19ddb38e1b 异步验证注册字段合法
12 years ago
wanglinchun ca38afff61 调整了参赛项目的显示顺序,按照时间降序
12 years ago
wanglinchun 7d33bb9b2d 将原有的新建参赛作品时弹出新页面变为了本页弹出下拉框
12 years ago
wanglinchun bc07f4c9e5 修改参赛应用页面中所属类别的显示长度
12 years ago
wanglinchun 72e9515f4d 修正竞赛子站首页和竞赛列表页面中参赛作品的统计数量(由于以前的参赛项目有私有项目导致统计数量有误)
12 years ago
nwb 9f1d0d3437 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
nwb 7ccbc5e88a 课时限制为只能输入正整数
12 years ago
yanxd 4d8701220b -。-
12 years ago
wanglinchun 4d5ac2780d 调整新建参赛作品弹出框样式
12 years ago
wanglinchun d96e1045d7 er
12 years ago
nwb 753746f833 1.项目添加资源分类
12 years ago
wanglinchun b182debc16 将竞赛页面中“新建参赛作品”的弹出形式由弹出新页面改为本页弹出下拉框,目前已有效果,写数据库有问题
12 years ago
z9hang 2077b1e8b8 课程,竞赛页面问题反馈前添加吧名
12 years ago
yanxd 845186a600 把课程列表中的学校信息修改为,显示老师身份中的学校信息
12 years ago
z9hang 425e2bb11e course网站中未选学校,有登陆用户,且登陆用户已填学校时添加链接
12 years ago
z9hang 7a341972e7 course网站中大学名加上该大学在本站的链接
12 years ago
z9hang a57d5fd823 Merge remote-tracking branch 'origin/szzh' into szzh
12 years ago
sw 14dcb18b96 将作业旁边的 “好问题”,“烂问题” 选项去掉
12 years ago
z9hang bdea0ee36a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
wanglinchun 5d966df410 sdf
12 years ago
wanglinchun 30f9bc9178 隐藏竞赛页面参赛项目和参赛应用;
12 years ago
wanglinchun 96b083a8a3 修改竞赛子站首页部分显示方式
12 years ago
wanglinchun 9c0f06bbc2 修改参赛作品页面部分显示方式
12 years ago
xianbo 2dc476018c Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
wanglinchun 3edb1114c3 修改参赛作品列表页面的部分显示方式
12 years ago
wanglinchun 4696bcf40c 修改竞赛列表参赛作品数量
12 years ago
wanglinchun b1041d1395 修改了竞赛列表页面中参赛作品的数量
12 years ago
wanglinchun 5c04f91857 修改了竞赛页面中关注人数的统计
12 years ago
wanglinchun caff0f55c9 调整了竞赛页面中参赛作品数量统计及跳转
12 years ago
yanxd 2f47cc1cd8 Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
12 years ago
nwb 42e6fc6a68 1.添加资源类型control、model及表结构
12 years ago
nwb b94bd99311 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
z9hang 268dc1acce 主页讨论吧动态前显示吧名
12 years ago
wanglinchun d686e105a5 调整关联作品框显示宽度
12 years ago
ganyiang 2048ce3c10 修复高校列表在firefox下显示不正常问题
12 years ago
wanglinchun 538f8516b0 目前已经通过判断将属于竞赛的项目或是应用显示到我要参赛的作品列表中
12 years ago
z9hang 3caedbdb85 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
yanxd cc2f359e8c 1. Three expressions syntax
12 years ago
wanglinchun f2dbbc48fc 发布作品和关联作品都可以用了,参赛应用也可以取出来了,接下来通过判断来去参赛项目和参赛应用
12 years ago
kg 57e5cda513 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
kg db2ab5b945 modify issue filter and base_footer
12 years ago
wanglinchun fb3c513da2 给“我要参赛”应用了base——newcontest的整体样式
12 years ago
wanglinchun fe151f9e29 竞赛页面中增加“我要参赛”菜单
12 years ago
ganyiang 786481e144 新建问题-主题-autocomplete-选中跳转
12 years ago
nwb faab40456a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
z9hang a5f7a19f48 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
fanqiang 9b151567f1 修改没有帮助显示问题
12 years ago
wanglinchun 1471d78e63 修改应用列表页面中每个应用右边三行的行间距
12 years ago
yanxd 05baffe4f3 issue导航,首页贴吧动态html,加入了最后回复
12 years ago
wanglinchun bb3c7f2432 修改了应用列表页面所属竞赛的显示长度
12 years ago
Wen e8247b6edd Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
Wen d94e15cd94 用户打分
12 years ago
z9hang f8c61ac69b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
yanxd f8746d6812 access control:关闭课程in view
12 years ago
yanxd d257f4e853 随便关闭课程禁止//临时
12 years ago
wanglinchun 31dff76b3a 修改了首页竞赛中包含的app的字体的大小
12 years ago
z9hang 0af034eac6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
12 years ago
fanqiang 547a268af8 修改合并之后的一些小问题
12 years ago
huangjingquan dc4e928741 修改tag显示异常
12 years ago
wanglinchun 4188c046c7 Merge branch 'develop'
12 years ago
Wen 501b491363 =.=
12 years ago
wanglinchun c6576c71bf 增加了每个app打分的总人数
12 years ago
fanqiang d50b2a9cfe Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
fanqiang e89d74e2a9 开源项目中新增tag,搜索查找待新增tag的obj
12 years ago
fanqiang 2c8580a4e8 Merge branch 'crawl' into develop
12 years ago
wanglinchun 0634f36c10 "打分后不要显示英文,而且还要提示:您可以重新打分"问题解决
12 years ago
fanqiang dbef2f958a osp_id validate
12 years ago
wanglinchun ac644beb72 添加竞赛首页中参与竞赛的app个数
12 years ago
yanxd 2b5cdf161c 不能删除帖子问题
12 years ago
yanxd 5a6abab224 Merge branch 'master' of 10.0.47.245:/home/trustie2
12 years ago
yanxd 5d27bb5a28 不能删除帖子到问题
12 years ago
wanglinchun 374b183c0f 修改应用列表显示问题
12 years ago
kg 881c91fafd Merge branch 'develop'
12 years ago
kg 776a9d1e35 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
Wen e6288627ad 中国高校页面,下拉框修改
12 years ago
Wen c893227609 个人资料页面学校选择框更改
12 years ago
wanglinchun 688438241e 调整应用列表页面中的bug
12 years ago
wanglinchun 35c424814e 竞赛模块首页应用添加更多链接到应用列表页面
12 years ago
Wen 90b53a7efb 打分的调整
12 years ago
wanglinchun 37304c1232 添加应用页面中的打分详情
12 years ago
wanglinchun 74256d5150 调整应用页面中的距离格式
12 years ago
Wen 040e4b2740 用户打分.
12 years ago
yanxd 0cfd5929d8 Revert "tag todo"
12 years ago
wanglinchun e48edac988 增加参赛应用页面的打分细节--初级版
12 years ago
wanglinchun 3da6d5cd37 应用页面列表排序(按时间排序已好,另一种排序暂未定)
12 years ago
wanglinchun 0eb81a24af 跳转
12 years ago
wanglinchun dbe4c26322 应用列表分页功能
12 years ago
wanglinchun db2d2e9b24 删掉没用的分页代码
12 years ago
wanglinchun 0403666cea 增加应用列表页面的分页功能
12 years ago
kg 0f51480bab amend course search
12 years ago
wanglinchun 12ad20cf3b 修改应用列表页面的显示标题为:应用列表-Trustie——为大学生技术创新筑巢
12 years ago
wanglinchun b424e9148e Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
Wen 50745d5d21 course首页布局上的小调整
12 years ago
wanglinchun 6ab0eb4477 修改后发现错误
12 years ago
wanglinchun 7cc4a9f3a6 调整字数限制
12 years ago
wanglinchun c40bc242cd 调整了应用列表页面中的搜索显示格式;
12 years ago
t430 6b526ee438 fix
12 years ago
wanglinchun d073074737 修改应用列表页面格式
12 years ago
wanglinchun bdb1c3f74e 实现应用列表页面
12 years ago
yan a191b634c5 forum memocount error, footer margin
12 years ago
xianbo 6f2b23ce37 Merge branch 'develop'
12 years ago
Wen 10fdcbb050 一个简单的后台上传学校logo的页面.
12 years ago
fanqiang 6ba53f534a 添加回复帖子功能
12 years ago
Wen 03d58b962a 封装了一下取得logo的方法
12 years ago
kg e9bd8a8f3e revise project index,course,search
12 years ago
Wen a8e029da58 数据库迁移:更改了默认的学校logo
12 years ago
fanqiang 87c70909be 可以在开源社区添加帖子,并且添加了帖子的URL,即帖子来源
12 years ago
yanxd be6ae6ef34 d
12 years ago
wanglinchun b542f8072d 调整竞赛列表页面中的排序问题
12 years ago
fanqiang 07b75924d8 修改tag搜索,使得tag搜索能够搜索开源项目
12 years ago
wanglinchun 3a9c7a036f 修改竞赛列表中的奖励方式的显示
12 years ago
yanxd 939e4cc100 footer 下方距离
12 years ago
yanxd 08892d1cf7 s
12 years ago
wanglinchun c16933120d 修改竞赛子站首页显示
12 years ago
wanglinchun 9f75bf179a Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
yanxd 8f5958abc1 mao
12 years ago