Commit Graph

701 Commits (6fc496c8ee0c0e9f2e18aba1e0c33dfa76e97600)

Author SHA1 Message Date
z9hang 4bd083b059 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang b44b488807 导航栏调整
11 years ago
z9hang bd43ef5d61 网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
11 years ago
nwb b655f0c7b0 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 29618d6a72 竞赛界面调整
11 years ago
nwb b7c4f87a8f Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
z9hang 5b7fc4048a user.trustie.net域名下课程主页导航栏多个课程实践菜单
11 years ago
z9hang 0f4933240b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 7c3a81735c user。trustie.net域名下跳转到项目页面时主域名没变bug(尚需测试)
11 years ago
nwb 3b1b057f0a 课程描述自动换行
11 years ago
nwb 634ef8df5f 界面修改
11 years ago
nwb 615b3ac2ac 课程界面调整
11 years ago
nwb a58a747cfa 屏蔽用户界面的关注需求功能
11 years ago
nwb 3254c4a237 修正二级菜单名称显示问题
11 years ago
nwb 1d4dad22ad Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop
11 years ago
nwb bdaf59513b Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop
11 years ago
yanxd 0998438e67 bootstrap fine tuning.
11 years ago
yanxd 449b87e38d remove cnzz
11 years ago
xianbo 25ee1d8672 for adjust test domain and give a setting reposwq
11 years ago
yanxd ab03962e9a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd aca63146e9 搜索文件归属,课程相关逻辑修改,查询把过滤去掉了。暂时没想有什么过滤的好办法
11 years ago
nwb dd396a6da2 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb bc179fbc39 右上角菜单增加二级菜单
11 years ago
z9hang 470f40db82 去除绝对网址
11 years ago
nwb efbffa7436 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
sw eac725a0f4 修改作业、用户、课程界面中相关学校的链接
11 years ago
yanxd f664ec10b4 Merge branch 'szzh' into develop
11 years ago
yanxd 663634b9da Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
xianbo 830e2d4fb4 隐藏 站长统计
11 years ago
z9hang bc587f3e7d 屏蔽个人分数实时刷新功能
11 years ago
sw 12b16f0bb6 1.修复作业界面点击所属任务链接出错的BUG
11 years ago
sw 392dc0c365 增加访问作业显示列表的权限
11 years ago
sw ed9b97f987 增加访问作业显示列表的权限
11 years ago
sw c4b2c47dc7 调整作业显示样式
11 years ago
sw 7702b746c6 修复作业显示界面,提交作业按钮不显示的问题
11 years ago
nwb f4aa817f42 修改合并后首页出错的问题
11 years ago
nwb 7425178419 Merge branch 'CourseModify' into szzh
11 years ago
z9hang 02e221eedb 修改:网站中的旧分数显示为新分数
11 years ago
z9hang df89e5e173 去掉多的一个分数显示
11 years ago
z9hang 9d9bc76af4 定时刷新分数
11 years ago
z9hang f9612ca63f 实时刷新(ajax轮询)
11 years ago
z9hang 9061a77221 修改user.user_score为空问题的解决方式
11 years ago
z9hang d2db58050d 修复部分未填工作单位报错问题
11 years ago
z9hang 08ba10c32d 添加超链接
11 years ago
z9hang 1cb1eeeb1d 个人主页:姓名、工作单位
11 years ago
nwb 0de6cc8a31 修改作业基础视图
11 years ago
nwb 78612488e5 1.修改新建作业及视图
11 years ago
nwb 099e8a0912 Merge branch 'szzh' into CourseModify
11 years ago
z9hang 697a6034b2 新得分显示
11 years ago
yanxd c5d892a214 footer
11 years ago
yanxd 70abac4c1e Merge branch 'competition' into develop
11 years ago
yanxd b58c5685ac Merge branch 'szzh' into develop
11 years ago
sw b7458abd9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 277aa81a60 修复占位列表界面显示的作业描述样式不正确的问题
11 years ago
yanxd 0536af6625 Merge branch 'szzh' into develop
11 years ago
nwb c8900c279c 课程标签增加、删除
11 years ago
yanxd 858a7936b5 revert userscore catch exception, added cache to footer.
11 years ago
yanxd cccb19e733 cnzz
11 years ago
nwb ae8fcca14f 1.课程接触视图修改
11 years ago
sw 43736ba8d6 兼容历史数据
11 years ago
sw 541ced18ec 作业显示界面增加导航栏
11 years ago
sw 26b933dddb t
11 years ago
wanglinchun 1393aebace 完成了按钮样式
11 years ago
yanxd 4c7bcd50f5 contests delete routes error
11 years ago
wanglinchun 372de9932a 英文版竞赛子站完成
11 years ago
wanglinchun 42aba52111 竞赛子站英文版5
11 years ago
yanxd 57994edc06 load user in homework
11 years ago
yanxd 1c7923e5bd sql
11 years ago
sw 8e2288a362 1.封装获取作业平均评分方法
11 years ago
nwb d22ffa84b4 1.课程标签迁移,从项目中分离
11 years ago
nwb cd3c69af94 课程资源文件迁移,从项目中分离
11 years ago
nwb 6ff26d06ab 修改课程基础页面逻辑(base_courses.html.erb)
11 years ago
sw 39ce95a950 美化作业显示界面
11 years ago
wanglinchun 9d783a7caa 修改竞赛通知等tab-menu的显示状态
11 years ago
sw 03c8f39729 1.修复登录提示描述不正确的问题
11 years ago
sw b9550cedb9 课程作业显示界面修改
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 a3a95556a3 fix 王林春提交了冲突文件
11 years ago
yanxd f44b930037 233
11 years ago
nwb 80e84069a1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 1d6816419d 优化用户申请加入项目界面刷新
11 years ago
z9hang 21e58ce3df 课程列表中课程成员数量显示n+(不显示精确数)
11 years ago
nwb 104ee13ac7 1.添加用户申请加入项目contrl、model及相关逻辑
11 years ago
yanxd f9166a71a7 issues#555
11 years ago
yanxd 9373666576 混淆课程数量
11 years ago
z9hang eaa9c94290 自己的用户界面也不现实邮箱
11 years ago
z9hang 2b12d31fb8 去除网站中的邮箱地址显示
11 years ago
z9hang fc1d5baf95 课程、竞赛、项目的主页的上下间距缩小
11 years ago
xianbo 66a5db5ad3 Merge branch 'szzh' into develop
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
wanglinchun 30f9bc9178 隐藏竞赛页面参赛项目和参赛应用;
11 years ago
wanglinchun 3edb1114c3 修改参赛作品列表页面的部分显示方式
11 years ago
wanglinchun 5c04f91857 修改了竞赛页面中关注人数的统计
11 years ago
wanglinchun caff0f55c9 调整了竞赛页面中参赛作品数量统计及跳转
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
nwb faab40456a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
fanqiang 547a268af8 修改合并之后的一些小问题
11 years ago
fanqiang 2c8580a4e8 Merge branch 'crawl' into develop
11 years ago
wanglinchun 688438241e 调整应用列表页面中的bug
11 years ago
wanglinchun c40bc242cd 调整了应用列表页面中的搜索显示格式;
11 years ago
t430 6b526ee438 fix
11 years ago
wanglinchun bdb1c3f74e 实现应用列表页面
11 years ago
fanqiang 87c70909be 可以在开源社区添加帖子,并且添加了帖子的URL,即帖子来源
11 years ago
yanxd be6ae6ef34 d
11 years ago
yanxd 939e4cc100 footer 下方距离
11 years ago
yanxd 08892d1cf7 s
11 years ago
wanglinchun c16933120d 修改竞赛子站首页显示
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
yanxd 2052d36abe issue:socialForge#381
11 years ago
wanglinchun 9af6c03547 Merge branch 'competition' into develop
11 years ago
yanxd e2a5e2f730 footer
11 years ago
Wen 7be7fd3d9b 学校选择形式改为弹窗
11 years ago
wanglinchun b318166c15 给参与竞赛的应用页面增加导航条
11 years ago
wanglinchun bc068eb12b 添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
11 years ago
alan 87fdecdabd 创新竞赛添加删除功能
11 years ago
yanxd b4209b7cc5 jrating
11 years ago
fanqiang 8600265f00 修改查询条件样式
11 years ago
xianbo bb4d141b0e erge branch 'competition' into develop
11 years ago
yanxd a4ab29f49d footer logo modify
11 years ago
wanglinchun 3d02cb7ce0 修改首页显示部分数据
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 76ccfe8ac4 fix
11 years ago
wanglinchun 9ac0cbe6a3 Merge branch 'competition' into develop
11 years ago
Wen 775774ad63 临时措施:即使用户没有填写单位,页面也可以正常打开,而不是报错
11 years ago
wanglinchun 8f6d9fc6a5 0418
11 years ago
wanglinchun e136254c8d 回复了项目页面中的头像
11 years ago
Wen 5699a947ec 建立了学校与用户的关联
11 years ago
kg 4d727d8049 revert the mistaken move:base_courses and base_project footer
11 years ago
kg d450da9df8 footer , footer of base_course,upload files count and delete all upload
11 years ago
kg 3013930f28 modify footer
11 years ago
kg 3f096f9167 add pdl logo
11 years ago
kg 69dbd5a85e add logos and modify footer;footer position problem of some projects and courses
11 years ago
kg 2cec3b0490 modify footer
11 years ago
wanglinchun 28ffd44e55 调整竞赛页面加入竞赛,关注以及配置竞赛的显示样式
11 years ago
wanglinchun 945ca3787a 调整个人主页中top-menu跳转菜单:增加跳转到竞赛模块首页
11 years ago
wanglinchun 6421f02ac8 调整了参赛应用列表布局显示样式
11 years ago
wanglinchun b4b61a3422 修改小bug;设计打分和评论唯一性前提交版
11 years ago
wanglinchun 733497fef8 调整竞赛列表页面中部分统计数字的超链接
11 years ago
wanglinchun f9e5dd47f6 修改了竞赛列表的排序问题
11 years ago
yanxd 28a5eff048 topics未登录footer飞出去的问题,擦屁股+10086,dom结构还有错,找不到崩溃
11 years ago
nieguanghui 6baa87a8ea 修复项目列表分数显示不一致的问题,修改用户列表显示不一致的问题,修改作业中项目显示分数和项目内部分数不一致的问题
11 years ago
yanxd ac4e74af91 作业layout显示提交作业的类型
11 years ago
xianbo 20bf1dadc0 fix
11 years ago
xianbo b2896c1645 fix
11 years ago
yanxd 1b6cdeac05 列表上提交作业,大概好了吧
11 years ago
fanqiang a426cf46de 添加浏览次数
11 years ago
yanxd 3fad5abb5c modal init
11 years ago
fanqiang 6fdb037b6b 开源项目基本框架完成
11 years ago
fanqiang d381423c0e 添加了版主功能
11 years ago
xianbo 2a72f7aac8 evils fix
11 years ago
wanglinchun c86af5f483 与show_application相关的所有内容改为show_softapplication,以防和系统中的application冲突
11 years ago
wanglinchun 2a278e0a2d all
11 years ago
fanqiang 9af808821d 修改框架,添加"没有帮助"和"申请成为版主"功能
11 years ago
fanqiang e8de48dd24 修改osp的show界面,建立框架
11 years ago
xianbo 6888e2bf01 fix
11 years ago
xianbo 90dcf36257 left italic in email
11 years ago
xianbo 02925fbb99 fix
11 years ago
xianbo 5d77381bb9 fix the user.trustie.net
11 years ago
fanqiang cfa5532598 建立了open source project部分的框架,并且建立了相应的帖子
11 years ago
xianbo 5c63ea2378 add contest and fix url
11 years ago
xianbo 2bba27e7a1 evils uri
11 years ago
yanxd f7eca26770 资源库位置调整:排第三
11 years ago
xianbo 6e065361b3 fix main page navigation
11 years ago
fanqiang d935152ed7 initial crawl
11 years ago
yanxd 3097f23c06 shang
11 years ago
xianbo 34fd8a933a fix the show of domain and project page
11 years ago
xianbo 20cd5941a8 modify project main page
11 years ago
xianbo 3f55e78f49 add diff url in navigation
11 years ago
yanxd d9bc17c1ea 留言权限, basecourse关闭课程重构
11 years ago
yanxd e0c87996bf 改了个课程截至日期,并且在courses_controller中设置了过期不允许加入的设定,目测没什么问题,明天再看看
11 years ago
yanxd daed8a1164 暂且提交,增加活动失败。
11 years ago
yanxd 62ea2b3849 下拉文件菜单
11 years ago
yanxd 8963cc3a3c 邮件问题一
11 years ago
wanglinchun 7f043579e3 修改作业页面中“提交作业”的位置
11 years ago
yanxd 2ca1362e83 “按用户搜索”和“搜索”的区别,分别可以搜索什么? 上面搜索删掉
11 years ago
yanxd 4efa3f7752 导航条下方的网站域名显示 forge ===> course
11 years ago
yanxd 8a3d1d033c 用户navbar问题,注册对齐问题
11 years ago
yanxd f64ea263ca 新建帖子主题条过长
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
yanxd 02a03f7c54 导航栏防止意外http参数不全的错误
11 years ago
yanxd 85c055bdc0 学生加入课程列表500
12 years ago
wanglinchun 7e20f9015e footer
12 years ago
yanxd 0ed2e19268 项目列表
12 years ago
yanxd 3676d3e7dd 留言又移动回手写区域,去掉了jquery加数量的操作
12 years ago
yanxd 710adb8fed Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
yanxd eb7e2539b8 留言问题
12 years ago
baiyu f03cc6c74c 所有项目列表、创客列表中的分数都能被点击,然后弹出项目或个人的窗口;点击应该在分数上而不是文字上、
12 years ago
yanxd ecec98aac9 菜单栏调整
12 years ago
yanxd c541865fa3 fix bugs
12 years ago
yanxd b269502de2 怕看不懂,定义几个常量
12 years ago
yanxd d202c84b44 导航条下拉菜单. [Version] alpha v0.1
12 years ago
yanxd ebc307db07 remove 1111
12 years ago
yanxd ad09978020 资源库 -> 资源索引, 判断搜索结果
12 years ago
yanxd 099fffab51 Merge branch 'bigchange' into develop
12 years ago
yanxd 951666a1ed Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
baiyu 13fdbde1cf 个人分数
12 years ago
yanxd 76f69973b4 fix search incalid byte sequence in utf-8
12 years ago
yanxd a5c9d9c31e um...
12 years ago
yanxd 2bb44456d6 search
12 years ago
yanxd 289b0581df stores css
12 years ago
yanxd 9dd6bdc0ae store framework => route, and refactory debug params in html/footer.
12 years ago
baiyu db1874fa07 评分
12 years ago
wanglinchun 6b5f1827a6 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
wanglinchun 7a4fe59978 实践课程=>课程实践
12 years ago
yanxd b9967074dc 新闻界面修改,new页面bug修复
12 years ago
wanglinchun 97749cfd8e Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
yanxd fccd83e199 it i
12 years ago
yanxd 4c0acc5f3e welcome css
12 years ago
wanglinchun 0c8e1e19e6 "软件众包"和“创新竞赛”中“关注”及前面星号的隐藏属性设置
12 years ago
wanglinchun fdcb68bd69 当用户未登陆的时候,隐藏掉了“软件众包”中的“选为作业”
12 years ago
yanxd e12922544a 链接bug,去掉动态里的文档内容
12 years ago
yanxd 7b895e5cde Merge branch 'wordh' into develop
12 years ago
wanglinchun a3ef595099 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
wanglinchun 3707af3810 mail
12 years ago
yanxd deaae6998c Merge remote-tracking branch 'origin/develop' into wordh
12 years ago
nieguanghui f3ce918699 留言修改
12 years ago
yanxd 2636d6b1e6 项目留言页面对齐
12 years ago
yanxd 1af4e4f712 welcome index css.
12 years ago
yanxd 36d7068ba3 闭合forum标签
12 years ago
nieguanghui 2db1067158 1、 网站中的搜索几乎都没有搜索后的提示语,这里应该加提示语,提示重新搜索。
12 years ago
yanxd 60be338848 作业提交的部分问题
12 years ago
nieguanghui ca9da99f7e 1、 实践课程->课程动态 列表 动态显示(有了最新动态后)应该为:如果是项目则显示新闻,课程则显示通知【光辉 周三】
12 years ago
yanxd 6bab3a95a7 add analytics.
12 years ago
nieguanghui 071738c54e 留言框样式调整,实践课程“的课程名下的(加入课程 关注)、”创新竞赛“的竞赛名下的(加入竞赛 关注)、”软件众包“的名称下的(选为作业 关注),这三个模块的格式统一
12 years ago
nieguanghui 41fd14c074 1234
12 years ago
huangjingquan e3898ee39d 修改了竞赛项目提交不一致问题
12 years ago
yanxd 586f112b4f i用户互动留言不显示
12 years ago
yanxd b703c65033 关注取消关注位置漂移
12 years ago
yanxd 265e0f246b 问题六
12 years ago
yanxd 4eeb7c3ea8 look at daily log.
12 years ago
yanxd 7e479c33e4 string something.
12 years ago
yanxd ad1e36b896 dxx it.
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 9aa7294f5a forum/memo fix
12 years ago
huangjingquan 2ba8bb8fd0 修改了forums主页显示,限制了讨论区用户图片显示大小
12 years ago
yanxd 16c218ccae 隐藏搜索栏 and something...
12 years ago