Commit Graph

718 Commits (f1aa0c1570a6e1607b843ab8be6154411f1143a7)

Author SHA1 Message Date
nwb a49cf3eb6b 1.修改课程作业路由
11 years ago
nwb 0d99644fa7 1.用户课程表逻辑修改
11 years ago
sw 78ac974a75 1.修改课程作业列表界面提交作业
11 years ago
nwb 4404222437 0604
11 years ago
sw 94542e935a 增加点击作业名下载改作业下所有附件的功能
11 years ago
wanglinchun da26c70f6c 修改首页子站入口
11 years ago
wanglinchun a38ffb9e9d 首页修改4
11 years ago
wanglinchun 7abeabeadf 首页修改3
11 years ago
wanglinchun 4b54f2949d 首页修改2
11 years ago
wanglinchun e5a76251a5 修改首页2
11 years ago
wanglinchun ebcdd2cc9e 修改首页英文显示
11 years ago
wanglinchun b5be2d58ce 英文子站首页
11 years ago
sw 50171ad0f8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
wanglinchun 9d783a7caa 修改竞赛通知等tab-menu的显示状态
11 years ago
wanglinchun 6a8d697582 Merge branch 'develop' into competition
11 years ago
wanglinchun a3fb48a4bb 0603
11 years ago
sw 9bfe9ba1b2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 27be52e58d 老师的邮件中增加取消邮件通知链接
11 years ago
sw 1a0de23b38 修改作业在进行修改、删除、添加时的代码
11 years ago
wanglinchun 81a45fe977 dfs
11 years ago
nwb e490f7979d 添加课程index界面
11 years ago
wanglinchun bf71a38608 竞赛通知相关文件修改
11 years ago
yanxd b33ee17343 Merge remote-tracking branch 'remotes/origin/develop' into szzh
11 years ago
xianbo 7d1327ad2a Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
11 years ago
fanqiang 9e05ecf5b4 修改主页展示部分
11 years ago
wanglinchun 43449e66b5 增加了竞赛通知按钮
11 years ago
nwb f936c30ec9 添加与course.index相关的control、view、help等实现
11 years ago
nwb 4e815a38b6 更改路由,课程独立出来,不再包含在项目中
11 years ago
sw 03c8f39729 1.修复登录提示描述不正确的问题
11 years ago
z9hang 2e36949604 添加课程列表查看权限(需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看)
11 years ago
z9hang 2d77975221 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 218fb3f831 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw e0273d320c 1.登录增加js提示可以用昵称和邮箱登录
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
z9hang daecf1a53b 老师收到课程留言区的直接留言及对老师的回复的邮件提醒
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
fanqiang fdf8b5640a 添加显示bug的页面
11 years ago
yanxd 98444ef01e remove fuzzy routes|add school missing row
11 years ago
wanglinchun d20114cc42 竞赛子站国际化完成
11 years ago
z9hang ab85ee5169 admin个人主页项目功能修正
11 years ago
yanxd 4b1d7e049d 233
11 years ago
yanxd 12b1553a33 Merge branch 'develop' into szzh
11 years ago
wanglinchun be5de6f3f6 zh文件中添加国家化内容
11 years ago
wanglinchun 7b6c96a8b6 view中contests中的文件已经全部国际化
11 years ago
z9hang 0e6d9a804a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
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
z9hang 6583ccb001 admin账户个人主页显示修改
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 d3ead651fe 动态显示安全问题
11 years ago
sw 5d4226ce79 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
yanxd f44b930037 233
11 years ago
nwb dd4ef11b3d 添加项目管理员审核已申请用户界面及逻辑
11 years ago
sw 7748704c3a Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
nwb 104ee13ac7 1.添加用户申请加入项目contrl、model及相关逻辑
11 years ago
sw 8bb8de7d7f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw c7b19d8f2e 修改作业提交流程
11 years ago
wanglinchun 518de57123 将参赛作品编辑更新后的提示语修改为汉语
11 years ago
wanglinchun 947c0f8f64 竞赛页面中添加参赛作品成功创建的提示语
11 years ago
wanglinchun a5cb14274c 修改参赛作品页面中未登录状态下的提示
11 years ago
wanglinchun dd43e2c3fc 竞赛页面我要参赛中添加判断,当用户未登录时提示登录后参赛
11 years ago
yanxd d47facc9e8 Merge branch 'szzh' into develop
11 years ago
nwb 097489e594 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 4d21933e09 1.优化资源文件上传下载界面
11 years ago
wanglinchun 10b34341c7 修改参赛作品编辑页面说明文字:应用--》作品
11 years ago
sw 4de089250f 修改删除留言方法为destroy_jour,以及相关路由,访问action的改变
11 years ago
sw 9a62fe22c6 修复作业留言模块先回复留言然后删除回复留言界面不会及时刷新的BUG
11 years ago
sw b80c51475f 1.增加作业参与人员类homework_users及相关代码
11 years ago
wanglinchun 9fb9d2dbdf 初步增加了新建参赛作品中参赛作品所属的托管项目列表
11 years ago
sw 7ead12dba6 1.优化路由代码
11 years ago
sw 3fee4211a2 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 6c9b9841b8 课程作业留言增加回复以及回复的评论删除功能
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 4c6b514d03 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw f79679f05a 1.修改作业列表显示效果
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
11 years ago
nwb 8f153520b4 调整上传资源界面
11 years ago
sw b27b3e0a5a Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 029eb1a195 作业回复
11 years ago
nwb f2f81e1d02 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 8ef716b920 1.个人动态留言显示出留言人
11 years ago
yanxd 2e0e8e6a8e Merge remote-tracking branch 'origin/develop' into szzh
11 years ago
z9hang c48b850cf7 添加删除项目型作业功能
11 years ago
xianbo 66a5db5ad3 Merge branch 'szzh' into develop
11 years ago
wanglinchun d019a4d9ce 重新调整了:评奖,暂未评奖,未评奖
11 years ago
wanglinchun 4ea8611942 教师评奖功能初步完成
11 years ago
nwb 4235ca8984 修正BUG
11 years ago
nwb c0c184d8bf 1.修正错误
11 years ago
nwb 1caa7940dc 1、资源发布者的分类和tag编辑;
11 years ago
nwb 8badbb1e78 1.添加附件资源类型编辑视图与逻辑
11 years ago
wanglinchun 65340f604d sdf
11 years ago
wanglinchun bbd293272d 添加参赛作品所属项目的网址;
11 years ago
nwb 25dba88a08 1.优化界面
11 years ago
nwb 284e6ba20a 1.添加部分默认数据
11 years ago
nwb 75f584a6e2 1.完成分类资源下载视图显示
11 years ago
wanglinchun 81c3659a89 调整新建参赛作品的显示样式
11 years ago
nwb e5bbd68c8c 1.添加资源分类浏览视图
11 years ago
yanxd 19e851d65a 路由注册验证ajax,课程边栏的单位
11 years ago
yanxd 9976697a58 Merge remote-tracking branch 'origin/develop' into szzh
11 years ago
wanglinchun 1e0e5a5ab1 Merge branch 'competition' into develop
11 years ago
yanxd 19ddb38e1b 异步验证注册字段合法
11 years ago
nwb 7ccbc5e88a 课时限制为只能输入正整数
11 years ago
yanxd 4d8701220b -。-
11 years ago
wanglinchun 3edb1114c3 修改参赛作品列表页面的部分显示方式
11 years ago
wanglinchun caff0f55c9 调整了竞赛页面中参赛作品数量统计及跳转
11 years ago
wanglinchun fe151f9e29 竞赛页面中增加“我要参赛”菜单
11 years ago
fanqiang 2c8580a4e8 Merge branch 'crawl' into develop
11 years ago
Wen e6288627ad 中国高校页面,下拉框修改
11 years ago
Wen 53574a9592 wenwenwen
11 years ago
wanglinchun 21fe914d8f 恢复误删的国际化
11 years ago
Wen e2a9e58ef5 本地化做了下
11 years ago
wanglinchun 12ad20cf3b 修改应用列表页面的显示标题为:应用列表-Trustie——为大学生技术创新筑巢
11 years ago
wanglinchun ae972ddaa1 修改国际化
11 years ago
wanglinchun 6ab0eb4477 修改后发现错误
11 years ago
Wen 10fdcbb050 一个简单的后台上传学校logo的页面.
11 years ago
fanqiang 07b75924d8 修改tag搜索,使得tag搜索能够搜索开源项目
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
wanglinchun 189b935d5b Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
wanglinchun ed71a3faa1 调整删除竞赛的显示样式及位置
11 years ago
Wen 02295e5ca9 给严总调试用
11 years ago
Wen cc738edf2f 学校列表添加了搜索功能
11 years ago
kg 14511c079a Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
yanxd cee205a568 issues#377 074e8adf 引入的issue页面权限问题,除了控制器还修改过views判断语句 keyworks: @edit_allowed
11 years ago
kg daa19de51d Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
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 473a44d11a 学校-课程模式!
11 years ago
wanglinchun 9af6c03547 Merge branch 'competition' into develop
11 years ago
wanglinchun 6b5452f3e2 增加修改应用时提示语
11 years ago
wanglinchun a90804b312 修改上传应用软件包和截图的说明文字
11 years ago
yanxd 60bc3bb1b2 seem_rateable to lib, using Engine setting routes
11 years ago
wanglinchun 05c0d2a5ac 替换竞赛模块首页中竞赛和应用的图标并调整相应的格式
11 years ago
fanqiang 91d5959016 添加了对管理员申请的接受与拒绝
11 years ago
fanqiang 28b10ed3fd 修改了搜索功能,并能对搜索进行过滤
11 years ago
wanglinchun 8a429ec669 首页提示语
11 years ago
alan 87fdecdabd 创新竞赛添加删除功能
11 years ago
yanxd b4209b7cc5 jrating
11 years ago
wanglinchun 9ac0cbe6a3 Merge branch 'competition' into develop
11 years ago
wanglinchun 8f6d9fc6a5 0418
11 years ago
kg d450da9df8 footer , footer of base_course,upload files count and delete all upload
11 years ago
wanglinchun a52e057d94 修改添加应用不能刷新的问题
11 years ago
yanxd 84d3e40c41 zip down controller created
11 years ago
wanglinchun 6421f02ac8 调整了参赛应用列表布局显示样式
11 years ago
Wen c34f2da385 课程注册与用户注册页面的学校选择全部搞定!
11 years ago
Wen 37bb5341e4 省份与学校的级联完成!
11 years ago
wanglinchun b4b61a3422 修改小bug;设计打分和评论唯一性前提交版
11 years ago
yanxd 41f315aac0 压缩文件
11 years ago
wanglinchun 733497fef8 调整竞赛列表页面中部分统计数字的超链接
11 years ago
yanxd 4f5eff09c8 发帖内容验证不通过不会丢失信息了,加上了所有验证
11 years ago
wanglinchun 98b6493b91 给应用添加开发人员字段及显示
11 years ago
wanglinchun a4df4cf893 修改竞赛和参与竞赛的新建应用之间的关联关系
11 years ago
wanglinchun b97cdd6b0d 修改参赛应用中应用和竞赛的关联前,目前部分代码由于数据表及关联没考虑清楚,导致无法关联,下一步修改代码,重新建表,完成关联功能及应用的正常显示
11 years ago
wanglinchun be61b9d1ac 调整了具体应用页面评价应用的功能
11 years ago
yanxd 1b6cdeac05 列表上提交作业,大概好了吧
11 years ago
nieguanghui bad170fdb2 应用上传附件功能
11 years ago
fanqiang d381423c0e 添加了版主功能
11 years ago
fanqiang 89b668be82 添加申请版主功能,目前已经可以写入数据库
11 years ago
wanglinchun a9e9171441 通过脚手架新建了一套应用的东西,包括数据库的相应表,新建了发布应用的页面,上传图片功能未实现,界面格式还需调整
11 years ago
wanglinchun c86af5f483 与show_application相关的所有内容改为show_softapplication,以防和系统中的application冲突
11 years ago
wanglinchun 1e7e0a1bb5 修改加入竞赛和退出竞赛不能刷新的问题;新建项目后不能刷新的问题;竞赛列表和竞赛页面搜索问题
11 years ago
fanqiang 9af808821d 修改框架,添加"没有帮助"和"申请成为版主"功能
11 years ago
wanglinchun 120e84cfc7 新竞赛代码移植
11 years ago
fanqiang e8de48dd24 修改osp的show界面,建立框架
11 years ago
yanxd dc62e89816 汉化部分
11 years ago
yanxd d6068c5c74 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
xianbo e4939bca2c fix
11 years ago
yanxd 4f5216e632 merge
11 years ago
yanxd 930bc4083e forge 软件
11 years ago
xianbo 5c63ea2378 add contest and fix url
11 years ago
fanqiang d935152ed7 initial crawl
11 years ago
yanxd 575fc48ff0 首页搜索分类
11 years ago
yanxd 6bef7029bc 项目课程分不清,添加解释语句
11 years ago
wanglinchun 8d2bbfe320 调整首页主题部分字体格式
11 years ago
wanglinchun b167193172 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
wanglinchun 1fabad8c2f 修改项目托管主页和课程实践主页主题句
11 years ago
xianbo 34fd8a933a fix the show of domain and project page
11 years ago
xianbo 6198c3565b fix redmine.rb
11 years ago
xianbo 0b016e7c11 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
xianbo 173181add2 add constant about domain
11 years ago
yanxd d9bc17c1ea 留言权限, basecourse关闭课程重构
11 years ago
yanxd e0c87996bf 改了个课程截至日期,并且在courses_controller中设置了过期不允许加入的设定,目测没什么问题,明天再看看
11 years ago
wanglinchun abb27025d3 修改course门户主页中新开课程后更多的链接问题
11 years ago
yanxd 0b385cdbbb 毛的资源库关联文件
11 years ago
yanxd e9373991d2 maoxian
11 years ago
yanxd 2ca1362e83 “按用户搜索”和“搜索”的区别,分别可以搜索什么? 上面搜索删掉
11 years ago
yanxd bc7471bcb7 course real server host.
11 years ago
yanxd 7deeab62bc course.trustie.net
11 years ago
yanxd cf2689917b 三天两头反复改 不如自挂东南枝
11 years ago
wanglinchun 9aa903d79c 修改了新建课程页面的显示问题
11 years ago
yanxd 3d274be77b fixtures fix, header fix dynamic.
11 years ago
xianbo 384329e000 fix natural about user list
11 years ago
yanxd 0ed2e19268 项目列表
11 years ago
yanxd c541865fa3 fix bugs
12 years ago
wanglinchun f0132a0f5f 在“课程实践->讨论区”为匿名用户不能进行评论添加登陆的提示以及登陆的链接
12 years ago
yanxd d202c84b44 导航条下拉菜单. [Version] alpha v0.1
12 years ago
yanxd 0d9453080c bug
12 years ago
wanglinchun c941c640dd Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
wanglinchun 42a1a9e0b9 重复提交问题
12 years ago
yanxd 8172516aff 解决不能搜0的功能
12 years ago
yanxd ad09978020 资源库 -> 资源索引, 判断搜索结果
12 years ago
yanxd 099fffab51 Merge branch 'bigchange' into develop
12 years ago
baiyu ff9bde0b9f Merge branch 'bai' into develop
12 years ago
baiyu 13fdbde1cf 个人分数
12 years ago
wanglinchun 8ca02a652d modify some zh.yml
12 years ago
yanxd d34253bdfc search framework
12 years ago
yanxd ead89c622d modify a translate
12 years ago
baiyu db1874fa07 评分
12 years ago
wanglinchun 7a4fe59978 实践课程=>课程实践
12 years ago
yanxd d0601aa671 Merge branch 'wordh' into develop
12 years ago
yanxd 123817df93 tools 顺序
12 years ago
xianbo 95ed1880b5 fix setting about migrate path
12 years ago
wanglinchun 6ad3505b14 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
wanglinchun 5b00db37de 添加无作业提交时的提示语
12 years ago
wanglinchun 092c70ffd6 竞赛-用户反馈留言框内容修改
12 years ago
yanxd 8a1316cf8f 删除留言操作
12 years ago
wanglinchun d48d17bece 留言邮件问题
12 years ago
yanxd 7b895e5cde Merge branch 'wordh' into develop
12 years ago
wanglinchun 3707af3810 mail
12 years ago
nieguanghui f3ce918699 留言修改
12 years ago
yanxd 99686ec269 留言不能是空字符
12 years ago
nieguanghui 2db1067158 1、 网站中的搜索几乎都没有搜索后的提示语,这里应该加提示语,提示重新搜索。
12 years ago
yanxd 60be338848 作业提交的部分问题
12 years ago
nieguanghui ca9da99f7e 1、 实践课程->课程动态 列表 动态显示(有了最新动态后)应该为:如果是项目则显示新闻,课程则显示通知【光辉 周三】
12 years ago
nieguanghui 967fb6dc9a 1、 实践课程->“课程作业”中的“提交情况”,”作业”后应该加数量【光辉 周二】
12 years ago
yanxd 4d2fd01cf9 进入附件列表
12 years ago
yanxd 733524b413 ref gitignore
12 years ago
wanglinchun 10177618f0 message send email
12 years ago
yanxd f73ea104bb remove my comment.
12 years ago
baiyu 8af92ef29b 修正了非本课程的用户能看见学生学号
12 years ago
nieguanghui c27528ffb7 1234
12 years ago
yanxd 0bc2b8f2b3 项目论坛丢失了的编辑功能
12 years ago
xianbo 0f93065ac4 imitate github show help doucument
12 years ago
yanxd 4eeb7c3ea8 look at daily log.
12 years ago
yanxd c272783f1c 工具栏边距调整,讨论区的修改删除功能,项目竞赛边框顶出页面的问题。
12 years ago
yanxd 39eb6c1961 .
12 years ago
yanxd 119b345b41 fixed i18n.
12 years ago
yanxd a08d78670c .
12 years ago
yanxd ad1e36b896 dxx it.
12 years ago
huangjingquan 096f0eed03 添加了留言结果在用户动态里面显示
12 years ago
yanxd 28978b88b2 首页用户动态加入讨论区内容,点击之后定位到帖子。
12 years ago
yanxd 5914fb218c add method to show download link
12 years ago
yanxd 0609c5c7ea 1.增加帖子回复时间查询语句
12 years ago
yanxd 825b1e7fd7 点击tag之后的索引功能.
12 years ago
huangjingquan fc78a2b876 修改了项目里面成员列表角色错位
12 years ago