Commit Graph

461 Commits (194ab98361ab0f2d9acba4fbd83902bd4934583c)

Author SHA1 Message Date
z9hang 138d90a887 添加数据迁移文件
11 years ago
z9hang 3b54def1c7 首页定制修改
11 years ago
z9hang f83336aed0 修改首页定制中热门项目排序方式的实现
11 years ago
z9hang 4542b9e21a 积分修改
11 years ago
z9hang 80b5871756 竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
11 years ago
z9hang 0b6168c7fd 添加竞赛首页发布通知通告相关代码
11 years ago
z9hang 41ea3a1baf Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang dee09aad75 修复导航bug
11 years ago
nwb 42c2f6c2ee 更改项目文档按作者排序
11 years ago
nwb 840a7b337b 添加课程资源内容类型更新脚本
11 years ago
z9hang 513fd32ec5 修复查看个人动态无权限bug
11 years ago
sw c8aaa2776c 1.作品类别增加其他选项,当用户选择其他时,显示一编辑框用于用户输入其作品所属类别
11 years ago
sw 890bc7459d 修改项目列表页面当管理人员过多时,显示更多。点击更多按钮,跳转到该项目的成员列表页面
11 years ago
z9hang 0322258386 去掉一个参加竞赛中多出来的项目创建
11 years ago
z9hang 376ba1d793 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 5c0e3e96cc 修复不分页面导航栏缺失问题、修复部分域名错误问题、添加修复FirstPage表数据的迁移文件
11 years ago
nwb 49aa3a994e 学时不允许为空
11 years ago
sw 79c76d26c8 创建作品分类表,并插入部分数据
11 years ago
yanxd f5efaac93a lunchun
11 years ago
sw bcaaa02bed 取消已完成课程在软件创客列表的显示
11 years ago
nwb 6dcc50e60b 添加gitlab创建项目(版本库)接口
11 years ago
nwb 36ab954cf9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 297fe9a3f4 添加gitlab远程登录接口
11 years ago
z9hang d9e04bab0a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang cc4bf3b328 添加超级管理员控制首页热门项目排序问题
11 years ago
sw 4825c5287e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 3cda9294fd 注释未能安装的gem
11 years ago
z9hang 53ff6ea335 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 6a45a0287d 添加删除图片功能,修复用户修改资料界面form.quene undefine的js错误(导致加载中不消失的原因)
11 years ago
sw b142953a4b 1.创建项目增加功能:是否启动DTS测试,默认为不启用。根据用户选择,决定左侧DTS测试工具选项是否在该项目内显示
11 years ago
z9hang cf339edb6c 添加首页定制的非空验证,长度验证
11 years ago
nwb 2a1a051362 课程资源文件密级BUG修正
11 years ago
sw b704a44dfb Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 7a9b5156c9 修复软件创客列表当用户姓名比较长时,用户姓名会被个人得分覆盖掉的BUG
11 years ago
nwb 0950ac2329 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 3aab1b172c 修正执行数据迁移时的‘page_type=’ undefine错误
11 years ago
nwb 87b623bc51 1.文档添加密级设置
11 years ago
z9hang e1c7aaa220 冲突编辑
11 years ago
z9hang fcdfeae326 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 3dfcc90574 课程、竞赛首页定制
11 years ago
nwb 9b3ffc90ba Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 6688ba61dd 1.用户申请加入项目向管理员发送邮件
11 years ago
z9hang b4dd8409eb 添加项目托管平台首页定制功能
11 years ago
sw 65c137e617 修复进入课程作业报错的问题
11 years ago
sw 41823fbddf test
11 years ago
z9hang 9634046d11 权限管理机制优化
11 years ago
z9hang b87abf1f68 权限管理优化
11 years ago
z9hang 5e3a763776 添加引用项目权限、修改引用判断
11 years ago
nwb 2395ee4b1d 留言发送邮件优化
11 years ago
nwb 864ef17941 清理课程状态表,修正同一课程出现多次的BUG
11 years ago
sw 2bdb0e20e9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 4d25ec1623 1.添加课程垃圾数据清理迁移文件
11 years ago
sw 5abee0a06c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 2a6cbe28f0 修正课程首页错误
11 years ago
sw 967c377191 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd e1d9d6ab45 tag查询崩溃
11 years ago
nwb e94ed86ead 部分BUG修正
11 years ago
nwb cf00942261 更新迁移文件
11 years ago
nwb 993ac23a36 课程各数据迁移时不再做验证,以兼容老数据
11 years ago
sw 4470f0dd73 添加作业时增加教师评分所占比例设置
11 years ago
z9hang 9a8c5ebecc 个人得分规则显示
11 years ago
z9hang 2501f31ef1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 7399e1aca2 添加项目个人得分统计功能
11 years ago
nwb 9ae5f59a29 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb f8e5c2358a 学生角色添加回复讨论区权限
11 years ago
sw 7702b746c6 修复作业显示界面,提交作业按钮不显示的问题
11 years ago
nwb f4aa817f42 修改合并后首页出错的问题
11 years ago
nwb 88c3347f7c 修正合并分支后的创建课程错误
11 years ago
nwb 7425178419 Merge branch 'CourseModify' into szzh
11 years ago
nwb c5a837c689 修改资源文件测试用例
11 years ago
nwb ae3457e68b 1.添加代码评审(CodeReview)插件
11 years ago
nwb 91f0b58a7a gem修改
11 years ago
nwb f33dc6bff6 1.修改测试环境搭建文档
11 years ago
nwb 2a9d6eb012 迁移原课程资源文件类型数据
11 years ago
nwb 80145c5c3b 修改课程列表动态数显示不正确的BUG
11 years ago
nwb f80e1f811a 修改作业数据迁移
11 years ago
sw 8f78177d47 增加数据迁移文件
11 years ago
nwb 0480405afb 1.修改原课程各数据迁移文件BUG
11 years ago
sw efb6c1fd19 1.修改、新增作业增加提交项目选项(可以为空)
11 years ago
sw 97a4aaf8ab homework_attach增加列project_id及相关数据迁移
11 years ago
z9hang ab486aa811 补充user_score_details Model及数据迁移文件
11 years ago
z9hang 50dbe3d04a 添加记录得分变化功能
11 years ago
nwb 78612488e5 1.修改新建作业及视图
11 years ago
nwb 099e8a0912 Merge branch 'szzh' into CourseModify
11 years ago
z9hang 697a6034b2 新得分显示
11 years ago
nwb 2a4486bf0d 修改迁移文件
11 years ago
nwb e698f3a6c6 修改新建课程成员时的唯一性判断
11 years ago
nwb 59a261d96d 1.优化课程通知动态和权限判断
11 years ago
yanxd 70abac4c1e Merge branch 'competition' into develop
11 years ago
sw d832a5eecf rake db:migrate
11 years ago
nwb d6280befca 修改新闻model、路由、index方法
11 years ago
nwb 3165d97417 1.迁移课程新闻数据
11 years ago
nwb b6c9415a4b 1.给各角色添加浏览课程资源文件权限
11 years ago
nwb a793b8923d 1.Non member角色添加add_couese权限
11 years ago
nwb f741b0581c 修改课程资源文件视图BUG
11 years ago
yanxd 541b22b84d score statistics init
11 years ago
yanxd dfde06248c 打分初步
11 years ago
nwb 59742b9ddb 1.给各角色添加项目相关的权限
11 years ago
nwb 388d14f075 迁移课程原讨论区数据
11 years ago
nwb d22ffa84b4 1.课程标签迁移,从项目中分离
11 years ago
wanglinchun 6abdce1e59 sdf
11 years ago
nwb cd3c69af94 课程资源文件迁移,从项目中分离
11 years ago
sw 81a97f6a5e 1.老师创建作业增加功能:是否启用互评,以及该功能的修改。对不启用互评的作业,学生不可下载作业,不可互相打分,但可以留言;老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
11 years ago
wanglinchun 8b78929190 修改竞赛通知中评论的相关文件
11 years ago
nwb de201ae8f6 添加课程管理员表,并从项目管理员表中迁移原有数据
11 years ago
nwb 6a9037dde5 修改关闭课程逻辑
11 years ago
wanglinchun d06488c10d 为竞赛通知添加评论
11 years ago
wanglinchun ae70081288 eter
11 years ago
nwb 69e366d841 迁移课程作业数据
11 years ago
nwb fb36a0d5ba 1.课程control添加create方法
11 years ago
nwb 4404222437 0604
11 years ago
nwb d4bc8139a3 修改迁移文件
11 years ago
nwb d87b52bedd 课程成员迁移
11 years ago
wanglinchun 9d783a7caa 修改竞赛通知等tab-menu的显示状态
11 years ago
wanglinchun 6a8d697582 Merge branch 'develop' into competition
11 years ago
z9hang 27be52e58d 老师的邮件中增加取消邮件通知链接
11 years ago
nwb cd10dd5433 课程权限判断变更,从项目权限分离
11 years ago
nwb 8460344043 课程讨论区逻辑更改
11 years ago
nwb e490f7979d 添加课程index界面
11 years ago
wanglinchun bf71a38608 竞赛通知相关文件修改
11 years ago
nwb 77006198a1 1.导入项目表中已有课程至课程表
11 years ago
yanxd b33ee17343 Merge remote-tracking branch 'remotes/origin/develop' into szzh
11 years ago
nwb e15bad7462 course新增列并更改相关逻辑
11 years ago
xianbo 75fb537939 delete mark file
11 years ago
nwb ea3b80fdc6 添加CourseStatus表和model
11 years ago
sw 218fb3f831 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
nwb 61135a352a 上传文件表单支持添加文件标签
11 years ago
sw 27a30d44be 1.修改判断当前用户是不是为课程老师的方法
11 years ago
wanglinchun a1083fe900 修改了原有参赛作品显示报500;
11 years ago
wanglinchun 8d77c62359 sdfd
11 years ago
wanglinchun b416d69639 vxc
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
fanqiang daa531268a 添加安全漏洞的关联表
11 years ago
yanxd 3517dbb88b Merge branch 'szzh' into develop
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 c5dd0317c2 修改合并后的bug(open_source_project)
11 years ago
wanglinchun dd43e2c3fc 竞赛页面我要参赛中添加判断,当用户未登录时提示登录后参赛
11 years ago
yanxd d47facc9e8 Merge branch 'szzh' into develop
11 years ago
fanqiang 87a6dd4938 修改开源项目社区中 每个项目的结构, 不再是一对一的匹配帖子,而是添加了一个中间表
11 years ago
sw b80c51475f 1.增加作业参与人员类homework_users及相关代码
11 years ago
wanglinchun 9fb9d2dbdf 初步增加了新建参赛作品中参赛作品所属的托管项目列表
11 years ago
fanqiang 543a199c5f 添加一张连接表relative_memo_to_open_source_projects
11 years ago
fanqiang a07ae9be58 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
wanglinchun 31ec9bc353 Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
11 years ago
fanqiang 4ee9602621 ..
11 years ago
fanqiang 74169221a3 1234
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
11 years ago
wanglinchun a8b58016fa df
11 years ago
wanglinchun bbd293272d 添加参赛作品所属项目的网址;
11 years ago
yanxd 225f25f04c 指定utf8,中文编码出错
11 years ago
nwb 284e6ba20a 1.添加部分默认数据
11 years ago
yanxd 9976697a58 Merge remote-tracking branch 'origin/develop' into szzh
11 years ago
nwb 50cc682e02 添加数据库脚本文件
11 years ago
nwb 7ccbc5e88a 课时限制为只能输入正整数
11 years ago
nwb 42e6fc6a68 1.添加资源类型control、model及表结构
11 years ago
Wen d94e15cd94 用户打分
11 years ago
fanqiang 2c8580a4e8 Merge branch 'crawl' into develop
11 years ago
Wen a8e029da58 数据库迁移:更改了默认的学校logo
11 years ago
fanqiang 87c70909be 可以在开源社区添加帖子,并且添加了帖子的URL,即帖子来源
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
Wen 02295e5ca9 给严总调试用
11 years ago
wanglinchun 6afef880dc 修改contest表中budget字段的属性,将integer改为string
11 years ago
Wen 3ba524668f 用户评分未完成版本= =
11 years ago
yanxd 4c3955bca0 revert create tmp
11 years ago
yanxd 6bfcf094d9 f**k
11 years ago
yanxd e802424e2a merge jrating
11 years ago
yanxd b4209b7cc5 jrating
11 years ago
xianbo 0a5de653d0 fix db migrate
11 years ago
baiyu f0b497e455 user score merge
11 years ago
baiyu 36cd91401f user score
11 years ago
alan dd09c36a8f Added the message of creating the project in the project's activities
11 years ago
fanqiang a611ed4848 修改了按标签搜索,并改了一些样式
11 years ago
wanglinchun 9ac0cbe6a3 Merge branch 'competition' into develop
11 years ago
wanglinchun abef68d13a 修改了添加项目时不能自动刷新的问题
11 years ago
Wen 5699a947ec 建立了学校与用户的关联
11 years ago
Wen c34f2da385 课程注册与用户注册页面的学校选择全部搞定!
11 years ago
wanglinchun 98b6493b91 给应用添加开发人员字段及显示
11 years ago
nieguanghui 6baa87a8ea 修复项目列表分数显示不一致的问题,修改用户列表显示不一致的问题,修改作业中项目显示分数和项目内部分数不一致的问题
11 years ago
wanglinchun b97cdd6b0d 修改参赛应用中应用和竞赛的关联前,目前部分代码由于数据表及关联没考虑清楚,导致无法关联,下一步修改代码,重新建表,完成关联功能及应用的正常显示
11 years ago
nieguanghui b334c02244 评分修改迁移文件
11 years ago
fanqiang 89b668be82 添加申请版主功能,目前已经可以写入数据库
11 years ago
wanglinchun a9e9171441 通过脚手架新建了一套应用的东西,包括数据库的相应表,新建了发布应用的页面,上传图片功能未实现,界面格式还需调整
11 years ago
xianbo b063364b60 fix migrate
11 years ago
wanglinchun c86af5f483 与show_application相关的所有内容改为show_softapplication,以防和系统中的application冲突
11 years ago
wanglinchun 2a278e0a2d all
11 years ago
fanqiang 9af808821d 修改框架,添加"没有帮助"和"申请成为版主"功能
11 years ago
Wen 4448fdfaca Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
fanqiang cfa5532598 建立了open source project部分的框架,并且建立了相应的帖子
11 years ago
xianbo 5c63ea2378 add contest and fix url
11 years ago
fanqiang d935152ed7 initial crawl
11 years ago
Wen 337885503e school表done
11 years ago
Wen bfec67a446 删除了courses表中的school列。
11 years ago
Wen ccca1f7f5f 修改大学表,删除列City
11 years ago
Wen ebd09e4b1a 大学表创建
11 years ago
Wen 5200e238a9 = =|
11 years ago
Wen ac0a05bcc7 - -
11 years ago
yanxd ff317e48e9 words jourformessage design ing...
12 years ago
nieguanghui f3ce918699 留言修改
12 years ago
yanxd f79cc4e597 记录帖子查看次数
12 years ago
yanxd c6f4dbbafa 10%
12 years ago
fanqiang 6e1913d00d 修改新建topic界面
12 years ago
yanxd 48650a2a91 init forum. again.
12 years ago
fanqiang 16f70437d1 forum init.
12 years ago
yanxd 2932f5a940 第一次db:migrate时创建admin的用户扩展表,防止第一次部署出错;为项目版本库diff增加过滤器。
12 years ago
baiyu 005e0802d4 增加了竞赛的“加入”
12 years ago
yanxd 98ccc97b27 add hidden repository function
12 years ago
nieguanghui adf8a7bc92 修改课程活跃度排序方式,解决课程列表文件链接错误
12 years ago
nieguanghui 50b91e3942 修改按钮样式,增加附件过滤
12 years ago
xianbo 271153aa78 add db:migrate/20131031071414_add_setup_time_to_courses.rb
12 years ago
xianbo 2589d429b0 add the project what one watch
12 years ago
baiyu 39c45dff30 1、修改了注册里的问题
12 years ago
baiyu 2a9cb28c4e 1、修改了国际化
12 years ago
fanqiang 838894a19c 修改了需求评分功能,以及作业的提交
12 years ago
huangjingquan b19ed67d79 新的课程
12 years ago
william da82a630e9 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into tmp1
12 years ago
william 4f72b68442 bug 修复。
12 years ago
william 2079c87362 增加tag删除。
12 years ago
fanqiang 781fa32dbb 添加了需求的fork功能
12 years ago
baiyu 436569c88d 1、修改了location和identity不能显示的问题
12 years ago
xianbo 633104b493 modify some bug about course and add db migrate
12 years ago
william 61e4021625 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
xianbo 29313d9ab5 Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
12 years ago
william 7d919fd3c3 Merge branch 'liuping' into develop
12 years ago
baiyu 24c99b8f49 add db migrate
12 years ago
xianbo ba12ff19eb Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
12 years ago
baiyu 540f06c769 add_student_id_to user
12 years ago
william 006f381a05 新增需求结束方式
12 years ago
xianbo 806fae7b19 Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
12 years ago
william dcbaf1c02b 增加需求结束方法。
12 years ago
baiyu 4fb040bc61 modify register bug
12 years ago
baiyu 6ce27271e3 修改了身份
12 years ago
huangjingquan 3536883248 课程合并
12 years ago
baiyu c2302dc0c7 增加了附件删除功能
12 years ago
nieguanghui 45178e178f fix the projects's present bug
12 years ago
fanqiang 805ad6600b 添加了提交作业
12 years ago
huangjingquan 261c3fc337 new version
12 years ago
baiyu a2cc191a4e 1、增加“我的账号”里的了工作单位
12 years ago
xianbo 7dbcc1520c course add data
12 years ago
xianbo 1e7d127998 new course table
12 years ago
zhangyang 4d82cad51d move 2013.8.29
12 years ago
nieguanghui 03415891f5 增加需求描述
12 years ago
nieguanghui fa27d3bf32 增加项目和用户的排序功能
12 years ago
baiyu 1290a008fc 修改新建需求界面
12 years ago
william 7850a2e6f0 修改user_extension
12 years ago
fanqiang 7287e151d0 将issue加入活动中,添加读取活动数据的方法
12 years ago