Commit Graph

554 Commits (143defd384934498428f21a18ba64967d1bec0aa)

Author SHA1 Message Date
sw 22688dd5da Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
xianbo 7d1327ad2a Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
11 years ago
fanqiang 150bb1ba1e 修改开源社区主页中的漏洞展示部分
11 years ago
sw 96504d6806 1.修改作业提交流程,
11 years ago
yanxd 006e4ae45e user tab bar
11 years ago
nwb f936c30ec9 添加与course.index相关的control、view、help等实现
11 years ago
sw 218fb3f831 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
nwb b52690adc2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 61135a352a 上传文件表单支持添加文件标签
11 years ago
sw 27a30d44be 1.修改判断当前用户是不是为课程老师的方法
11 years ago
z9hang bf12692de4 登录名==》账号/邮箱
11 years ago
xianbo 0f56d9e885 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
yanxd a9b88b8e66 issues#show words typo
11 years ago
wanglinchun a1083fe900 修改了原有参赛作品显示报500;
11 years ago
yanxd 654cb404e2 bootstrap test
11 years ago
yanxd 12b1553a33 Merge branch 'develop' into szzh
11 years ago
yanxd 7a4e5afba0 test
11 years ago
t430 fd0a504d84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
yanxd 5364687160 bootstrap & tag bug
11 years ago
xianbo e52886cf46 Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
11 years ago
xianbo cda9942723 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
yanxd 598429695f Merge branch 'develop' into szzh
11 years ago
yanxd 62f9ed052b issues#655
11 years ago
fanqiang d3ead651fe 动态显示安全问题
11 years ago
sw 5d4226ce79 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 65c3bb5eb1 1.作业列表评分结果显示保留2位有效数字
11 years ago
yanxd f44b930037 233
11 years ago
wanglinchun 2f709c92ba 重构bid_helper,contest_helper以及application_helper中共同用到的方法
11 years ago
nwb f51873d98b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb dd4ef11b3d 添加项目管理员审核已申请用户界面及逻辑
11 years ago
yanxd 34aa8433de import hubspot
11 years ago
yanxd 3517dbb88b Merge branch 'szzh' into develop
11 years ago
fanqiang 10aa8eee81 显示帖子的发布者和时间
11 years ago
wanglinchun 88b7fd24b1 给新建参赛作品中托管项目添加默认选项,使用户自行选择是否需要将参赛作品托管到制定的项目中
11 years ago
nwb 1d6816419d 优化用户申请加入项目界面刷新
11 years ago
nwb 104ee13ac7 1.添加用户申请加入项目contrl、model及相关逻辑
11 years ago
xianbo 4b063a2c69 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
fanqiang 973a59042c 修改帖子显示用户名与链接问题
11 years ago
wanglinchun 77b7da81fd 参赛作品页面编辑功能中添加修改托管项目列表完成
11 years ago
yanxd c4bd9aaabd Merge branch 'szzh' into develop
11 years ago
nwb 4156983494 缺陷添加缩略图显示
11 years ago
yanxd d47facc9e8 Merge branch 'szzh' into develop
11 years ago
sw c141501085 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
yanxd 9373666576 混淆课程数量
11 years ago
sw b80c51475f 1.增加作业参与人员类homework_users及相关代码
11 years ago
sw 14a468066f 修复打开首页,SQL没有默认的school_id的问题
11 years ago
sw 7ead12dba6 1.优化路由代码
11 years ago
wanglinchun 31ec9bc353 Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
11 years ago
z9hang 0385013905 修复主页跳转
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
yanxd 665a17eda5 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
yanxd 829c77879a typo
11 years ago
wanglinchun 4ea8611942 教师评奖功能初步完成
11 years ago
nwb 6f0e621f3c 添加项目成员界面,显示用户的account
11 years ago
z9hang fcc5f220ce Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 25dba88a08 1.优化界面
11 years ago
z9hang 73dcf3679d 去除课程、项目配置中的讨论区配置
11 years ago
sw 64900b1fd7 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 5d2bb4ccbd 1.选择学校进入学校课程列表,点击更多由显示所有课程可能改为显示当前学校课程列表,之后排序也一样
11 years ago
nwb 431b6603f1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb e5bbd68c8c 1.添加资源分类浏览视图
11 years ago
sw f487352d6d 当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
11 years ago
sw b97c2e230f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 74a9aa14d6 增加获取学校列表按学校开设课程数排序的方法
11 years ago
yanxd 2f47cc1cd8 Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
11 years ago
fanqiang 9b151567f1 修改没有帮助显示问题
11 years ago
yanxd 05baffe4f3 issue导航,首页贴吧动态html,加入了最后回复
11 years ago
Wen 501b491363 =.=
11 years ago
fanqiang 2c8580a4e8 Merge branch 'crawl' into develop
11 years ago
Wen 90b53a7efb 打分的调整
11 years ago
Wen 040e4b2740 用户打分.
11 years ago
wanglinchun 3da6d5cd37 应用页面列表排序(按时间排序已好,另一种排序暂未定)
11 years ago
wanglinchun b542f8072d 调整竞赛列表页面中的排序问题
11 years ago
fanqiang 07b75924d8 修改tag搜索,使得tag搜索能够搜索开源项目
11 years ago
wanglinchun 189b935d5b Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
wanglinchun 1ca0113204 Merge branch 'competition' into develop
11 years ago
wanglinchun 9038f2758c 根据将旧的竞赛信息和参与竞赛的项目信息迁移到新的竞赛相关数据表后重新调整竞赛子站首页最新热门竞赛的显示
11 years ago
yanxd f4595dfcd2 修改部分拍段project、course方式
11 years ago
kg 77ea0092b7 add course homepage activity
11 years ago
Wen 473a44d11a 学校-课程模式!
11 years ago
Wen 00e62ec8f7 用户评分理论上完成版.
11 years ago
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
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
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 创建课程处添加了学校
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 “按用户搜索”和“搜索”的区别,分别可以搜索什么? 上面搜索删掉
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 菜单栏调整
12 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、 网站中的搜索几乎都没有搜索后的提示语,这里应该加提示语,提示重新搜索。
12 years ago
nieguanghui ca9da99f7e 1、 实践课程->课程动态 列表 动态显示(有了最新动态后)应该为:如果是项目则显示新闻,课程则显示通知【光辉 周三】
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
12 years ago
nieguanghui 25fd898623 修改部分内容
12 years ago
yanxd 0609c5c7ea 1.增加帖子回复时间查询语句
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"
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、竞赛里的参与者名字显示全称
12 years ago
baiyu 2f8ef03d32 1、增加了参与竞赛的用户列表
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