Commit Graph

871 Commits (2c5cd7a12ae9b5b5e35ecb820890e81759e498e3)

Author SHA1 Message Date
huangjingquan 45fad95d48 冲突处理
12 years ago
huangjingquan 9b044f8d13 修改了讨论区显示
12 years ago
yanxd 78b65f363f move boards to tab_new, remove board from tool list on sidebar.
12 years ago
yanxd 0381179536 自动添加讨论区当项目课程创建的时候,学生是否能回复需要在全线报表里配置.
12 years ago
yanxd 9491781b45 .
12 years ago
yanxd d7f0b42bb7 .
12 years ago
yanxd 8ec2d8342b Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
yanxd 349020182a .
12 years ago
huangjingquan ec9e989361 修改了课程学号显示
12 years ago
baiyu 1a42cdd013 增加了课程与竞赛的人名超链接
12 years ago
baiyu e8aa5633d8 修正了竞赛配置的问题
12 years ago
baiyu 9293ef53b9 修正了竞赛配置的问题
12 years ago
baiyu 6c9c849e7c 1、增加了竞赛的配置功能
12 years ago
yanxd 356a48caa8 move constant to module, fixed some translate.
12 years ago
huangjingquan 16611d8eff 修改了管理员权限
12 years ago
baiyu eb36cb40ce 竞赛参与者的人数统计
12 years ago
yanxd 2932f5a940 第一次db:migrate时创建admin的用户扩展表,防止第一次部署出错;为项目版本库diff增加过滤器。
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
yanxd 26d75af51a fix homework uri error ,after joined xxx_show.html.erb.
12 years ago
yanxd a9ec58f245 prepare fix admin/
12 years ago
baiyu e5baf0959b 1、竞赛里的参与者名字显示全称
12 years ago
huangjingquan 48f34f25ae 修改了自己能看到自己下载的文件
12 years ago
xianbo abea7add69 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
xianbo 6279041361 fix links
12 years ago
huangjingquan bfcb68efab 课程添加了讨论区
12 years ago
baiyu 2f8ef03d32 1、增加了参与竞赛的用户列表
12 years ago
baiyu 005e0802d4 增加了竞赛的“加入”
12 years ago
huangjingquan b22077033a 链接到课程列表
12 years ago
huangjingquan 06e24fa38a 修改了提交作业范围
12 years ago
xianbo 5366b50c56 modify admin show
12 years ago
huangjingquan 2d90215de2 修改了个人主页课程列表权限
12 years ago
yanxd 811106aca0 fix bug on submit homework after
12 years ago
huangjingquan 3055286cdd 修改了作业不能提交bug
12 years ago
yanxd 88b9f943fc fix issue#353
12 years ago
yanxd 0ddd259fea refactor: access controller move to filter.
12 years ago
yanxd bcaaaf1f5a Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
huangjingquan 7935520612 对课程、项目、作业页面 当前位置显示做了隐藏
12 years ago
xianbo 89f01e2aba modify the show of messages
12 years ago
yanxd 8f59e035b0 Merge branch 'hidden_repo' into develop
12 years ago
yanxd 98ccc97b27 add hidden repository function
12 years ago
huangjingquan 1a8af21846 修改了提交按钮样式
12 years ago
xianbo df628aff9d modify curse nil error
12 years ago
xianbo 02ff8b8955 take off course fomre form the projrct ehich is watched
12 years ago
yanxd 5fb29c150b refactory projectController#new
12 years ago
yanxd a101be344c add any remark
12 years ago
nieguanghui 6352ae7aa6 fix bug
12 years ago
nieguanghui 57c28102e9 fix some thing
12 years ago
huangjingquan 59d0cc8e7a 修改了个人主页项目列表
12 years ago
nieguanghui f6c3f3609a 搜索显示改进
12 years ago
yanxd 3b52936d17 roadmap -> milestone
12 years ago
nieguanghui adf8a7bc92 修改课程活跃度排序方式,解决课程列表文件链接错误
12 years ago
huangjingquan 22ce616a78 修改了按钮样式
12 years ago
huangjingquan 718fa65fc4 整个界面样式协调
12 years ago
huangjingquan e8153c86ad 修改了项目里面各个子页面的样式
12 years ago
yanxd 56cbca3ce8 fix little words
12 years ago
huangjingquan f13665959a 作业列表样式修改
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 7da2f421e0 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
xianbo 3253f1cf28 modify show of some style
12 years ago
huangjingquan 6e9f3d53e5 新增一个user列表页面
12 years ago
nieguanghui dd6563cf8c 优化用户搜索
12 years ago
baiyu 8f216a6723 统一了各个模块的按钮,修改了部分国际化
12 years ago
huangjingquan 165c392f31 各个列表添加当前位置
12 years ago
baiyu a52944811b 修正了用户列表里“参与了xx个项目”改为“参与了XX个项目”和“参与了XX个课程”
12 years ago
nieguanghui 3966e0bc0b 修复课程列表bug
12 years ago
xianbo 5032eaabcb fix the show out of the frame and the location of show
12 years ago
yanxd 7c4e62cc40 add time describe
12 years ago
xianbo 607eb2c2ff modify shoew of project
12 years ago
huangjingquan d71890526b 课程列表里面超出的部分自动隐藏
12 years ago
nieguanghui 50b91e3942 修改按钮样式,增加附件过滤
12 years ago
yanxd 239a1484ae remove useless code block
12 years ago
fanqiang 9996386fe4 增加课程留言与项目反馈功能,修改了点击课程作业时tab页显示问题
12 years ago
huangjingquan 2fd63c80b3 修改了留言显示
12 years ago
huangjingquan 6499352d8e 修改了无项目时候 新建按钮重复提示
12 years ago
nieguanghui 8df3bcf76f 修改评分显示颜色,重构课程列表显示部分代码
12 years ago
nieguanghui eeb22ab4a6 fix some little bug
12 years ago
xianbo 73424b0c59 fix
12 years ago
huangjingquan bf2ae17e05 修改了数据读取错误
12 years ago
baiyu 3c9605c551 修复了课程配置里丢失的“开课时间”“结课时间”“课时”
12 years ago
xianbo 8d75d87ef5 fix the link of photo
12 years ago
xianbo 10a14d5e82 add the link to thieris homepage
12 years ago
huangjingquan 14445d0801 页面链接
12 years ago
nieguanghui 0c849c3216 解决按钮冲突
12 years ago
huangjingquan 9d2f7d1c28 add the link to projects
12 years ago
baiyu 0f3eb9cf87 kec
12 years ago
huangjingquan 17317da314 修改了项目和课程里面配置成员bug
12 years ago
yanxd 2d4b9f8c52 nothing
12 years ago
yanxd 9526f6d67a remove string unkown
12 years ago
nieguanghui be72746a80 样式微调
12 years ago
nieguanghui 2b10258ae1 修改课程列表显示样式
12 years ago
huangjingquan 49c22fbec3 个人主页课程列表里面添加了学期
12 years ago
yanxd b7027405ce fix some little bug!
12 years ago
xianbo 88084990bf fix
12 years ago
xianbo 82c597a163 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
huangjingquan d6aa6550d7 调整了主页及六个界面的样式
12 years ago
xianbo 83b30b1f9e Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
xianbo b61f3ce79f fix showw
12 years ago
huangjingquan 2a4539dc2c 几个主要页面样式
12 years ago
yanxd b6df32e029 fix files under_line
12 years ago
huangjingquan b9b0b06185 修改了一些链接bug
12 years ago
baiyu 231d1f2c4b 增加样式修改了各个模块导航条颜色
12 years ago
xianbo 8e922ef273 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
xianbo c8c4cecccd fix course link location
12 years ago
nieguanghui a80e77bd01 修复bug
12 years ago
huangjingquan ee33583ae1 修改了竞赛页面
12 years ago
nieguanghui 5d83a03e5f Merge remote-tracking branch 'origin/develop' into develop
12 years ago
yanxd 397eb11dca refactor memberlist
12 years ago
nieguanghui c6824c539b 修复作业搜索条出现在竞赛,需求页面的bug
12 years ago
huangjingquan ea8a87c3a6 需求里面增加了搜索功能
12 years ago
baiyu be20b2c7fe 增加了需求导航,超链接
12 years ago
baiyu f113cb7667 增加了需求导航,样式,超链接
12 years ago
huangjingquan bb994f8b7d 修改了搜索结果显示
12 years ago
baiyu be14669f6b 修改了个人主页导航超链接不能显示全名
12 years ago
huangjingquan c8427fe61e 修改了作业、项目、课程页面
12 years ago
baiyu 20c2feef30 增加了“项目门户”的当前位置导航、样式、配套的超链接
12 years ago
huangjingquan 8ee5381e44 修改了用户个人主页样式
12 years ago
huangjingquan 29f058efba 修改了新建课程的时候报错
12 years ago
huangjingquan 27299586c2 修改了top——mune
12 years ago
yanxd 2a6171ca52 refactor course helper
12 years ago
huangjingquan 7e7534041e 课程列表新的权限设置
12 years ago
yanxd ce7b2ceba0 fix teacher/student search Identifier
12 years ago
huangjingquan c93ca4d2ed 添加了作业截止时间提醒功能!
12 years ago
yanxd 0b61b4ef5b move flash message to page top in course/setting
12 years ago
yanxd 19b983e103 move flash message to top on base_project
12 years ago
huangjingquan 84327892a9 加入/退出课程权限修改
12 years ago
xianbo 003b4704cc fix link to
12 years ago
baiyu 606b2d0587 在我的主页的“课程”列表里加入了“主讲教师”
12 years ago
huangjingquan fb54fcbe86 修改了新闻页面两个图像重复bug
12 years ago
huangjingquan 09eb16ad9a 修改了项目和课程里面成员配置显示错误
12 years ago
huangjingquan ac2b90ecfd 退出课程加入权限
12 years ago
xianbo c7b38e5bf2 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
xianbo ca0f63a817 del the link of .head portrait
12 years ago
nieguanghui cab092cd04 修改课程默认排序方式
12 years ago
nieguanghui 583c022048 修复作业列表搜索bug
12 years ago
huangjingquan 775ebc3607 新闻界面添加删除功能
12 years ago
huangjingquan 5febe8a58d 个人主页课程列表加入了“退出课程”和加入课程按钮
12 years ago
baiyu b2080a4470 加入了开课时间,结课时间选项
12 years ago
yanxd 0a21b87714 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
nieguanghui db25900336 修复新建项目的时候相关信息写入丢失bug
12 years ago
nieguanghui 75c0480071 增加个人活动列表,作业过滤功能,删除课程作业搜索框,修复课程页面以学生角色搜索也会出现新建课程的bug
12 years ago
yanxd 54d9566a7b Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
yanxd b55c5d20a3 added activity info from event, warning.
12 years ago
xianbo c7d96dd183 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
xianbo 743ef9856a only teacher can know his tag and modify it
12 years ago
yanxd 369e5eccc0 member_list ,group by roles in course#show
12 years ago
xianbo 08f1453dbd modify some show in create course and project
12 years ago
xianbo 67d228142a add the root in bid modify about homework
12 years ago
xianbo 9f8c764053 modify new cresate is_piublic? and leave some module about select
12 years ago
xianbo 0706fdd6dc let the homework show under class in homeworkpager
12 years ago
huangjingquan 477e299e24 修改了用户主页课程列表显示
12 years ago
yanxd 0b04b28024 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
yanxd 2286fbeff5 members split (teacher,student) in course
12 years ago
xianbo 5dfac1d8e3 add modify about homework and modify the show of toll bar
12 years ago
baiyu f55a06e76d 1、"活动“变成了动态,”只看自己“改成了”我的动态“
12 years ago
baiyu 9b9745ea0a 对于应标需求,提交作业,提交竞赛作品成功后闪出的flash做了区别
12 years ago
baiyu 5fb0bc945c 修改了删除“我的账号”后的小问题
12 years ago
yanxd b617f3d42f fix my welcome#index bug
12 years ago
baiyu 9319a7f87b 去掉了top_bar上“我的账号”
12 years ago
yanxd 868025bb40 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
yanxd 67216ca463 fix back_url bug
12 years ago
huangjingquan b113719b46 课程里面添加了图片上传功能
12 years ago
yanxd 8a37f924f9 remove nyancss
12 years ago
yanxd dd0c087209 rest tan backurl
12 years ago
nieguanghui 224a194759 修复成员 bug,修复作业显示bug‘
12 years ago
xianbo 1f419c936d del the back_url to let the different identity change has a correct url
12 years ago
xianbo 1f09bfbab1 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
xianbo e9856b3524 modify the style of the projects witch show
12 years ago
nieguanghui 1f8c10e48a 修复bug
12 years ago
xianbo cbe22e4e60 modify the judge of the nil class of identity in app/views/bids/_project_list.html.erb
12 years ago
yanxd 6dec8a9312 share previews
12 years ago
xianbo a50aff3fb4 1.add special reward
12 years ago
xianbo 2fa6276829 fix natural
12 years ago
nieguanghui 39580a04a2 修复项目列表成员显示bug
12 years ago
xianbo 21ffbe637e Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
xianbo 2589d429b0 add the project what one watch
12 years ago
yanxd 666806ae28 fixed little bug
12 years ago
yanxd df73f34e71 share linkto better
12 years ago
nieguanghui cf40f9ff02 fix course list bug
12 years ago
yanxd 4bef2eee24 course can be shared files by project's member
12 years ago
nieguanghui 5ce9bcdb2c 解决竞赛,需求,作业列表搜索bug
12 years ago
xianbo 3f4a60b462 fix show
12 years ago
xianbo 5a1bb0f2d4 fix bug in arrange to net
12 years ago
nieguanghui b04fe3d1bb 增加项目评分 个人评分 ,个人在项目中的评分机制
12 years ago
yanxd 5d0b5812b3 share completed with fq, xianbo
12 years ago
yanxd dde65a5895 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
baiyu a44713ba6d 修改了需求页面显示
12 years ago
baiyu ecdeaf123e 修改了部分国际化
12 years ago
baiyu 0206d3f2c3 需求里面添加了用户和项目与需求的联系
12 years ago
yanxd e2447b4c88 truncate textilizable
12 years ago
baiyu 9fa9aa0fb8 “返回课程”“返回主页”按钮变色。改边距,边框变圆润
12 years ago
yanxd ab5d8853b5 fixed issue#314
12 years ago
yanxd 081a8e9825 fixed issue#319
12 years ago
baiyu 8ec86a27c4 xuehao
12 years ago
baiyu 5b48826faf 修改了学号显示错误
12 years ago
baiyu 1be0a7d23f 修改了“返回个人主页”和“返回课程”,修改了样式
12 years ago
baiyu 19b030dd23 修改了需求和作业列表显示混乱
12 years ago
yanxd abe52df8d0 Merge remote-tracking branch 'origin/develop' into develop
12 years ago
yanxd 332bc0765d 240 characters or less limited in activity info. ===> projects#show
12 years ago
xianbo 520c5843ce modify homework show and the link of style
12 years ago
yanxd 534457547e Merge remote-tracking branch 'origin/develop' into develop
12 years ago
yanxd 69869a05c9 reverse projects list, add explain to role.
12 years ago
huangjingquan 29e2a4c70b 修改了作业提交时学号显示错误
12 years ago
huangjingquan 41a74a5254 提示信息国际化
12 years ago
xianbo 5a234e6fb2 add the link of project contributers&&followers count number
12 years ago
nieguanghui 17a4f14f2a 修复课程和项目搜索bug
12 years ago
yanxd ec63fc41bb add link in project/course list page, joinBUtton renamed.
12 years ago
yanxd e1d8c8a992 remove nyan css & move another file
12 years ago
baiyu 8335c111c7 1、修改了“加入课程”位置
12 years ago
xianbo 13e7280245 1.modify show of data
12 years ago
huangjingquan 6e10f16c68 添加了注释
12 years ago
yanxd 20883b92a5 add button css, fix js bug, add create project to push homework.
12 years ago
xianbo 0238001721 modify destroy project and user can't destroy biding_project
12 years ago
xianbo 8c675c2a96 add show about setting about course
12 years ago
xianbo abc163887e fix
12 years ago
fanqiang 2fbf025c2f 调整需求的评价,隐藏个人账户的首选项内容
12 years ago
huangjingquan bcb66f2b32 在个人主页项目里面添加新建按钮
12 years ago
huangjingquan 673850bd03 fix
12 years ago
huangjingquan 19ebd48a95 修改了作业列表无法显示
12 years ago
huangjingquan 00cef03049 修改了个人主页里关注需求全部需求改成只关注的需求
12 years ago
xianbo 2bd110c550 delete the icon show about course
12 years ago
huangjingquan 8082bb456f 为竞赛添加新的页面
12 years ago
yanxd a5cdbc8e92 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
12 years ago
yanxd f1a31c7f6b 提升头像图片显示分辨力
12 years ago
xianbo d3f46adc34 fix
12 years ago
xianbo fd14457446 add delete homework in course
12 years ago
xianbo d7f7ff5fa9 delete homework
12 years ago
huangjingquan 8ce8de09cb 修改了个人主页课程列表
12 years ago
huangjingquan c49209cbfb 将课程和作业分开
12 years ago
huangjingquan 508eee45f2 修改了加入课程弹框显示错误!
12 years ago
baiyu 6676110b11 修改了教授丢失
12 years ago
baiyu 13a2cfe644 修改了fork页面,增加了教师超链接
12 years ago
huangjingquan 3ff443b7b6 修改了自己的作业不能关注
12 years ago
huangjingquan 0a5013edd1 修改了作业界面显示
12 years ago
fanqiang 962842d841 修改了提交作业数量显示问题,修改了创建需求的种类选择问题
12 years ago
huangjingquan ff21bca683 修改了老师访问学生页面的时候bug
12 years ago
xianbo 956aa3d0c1 remove forum block in course setting
12 years ago
huangjingquan e25425d9a7 用户看别人课程主页时显示问题
12 years ago
nieguanghui 8703709bd0 解决了课程创建时设置私有依旧显示在课程列表的bug
12 years ago
wanglinchun 48a0f2f409 个人主页,课程相关国际化
12 years ago
huangjingquan a0c6a183fe 修改了个人主页的关注需求里面只显示需求不显示作业
12 years ago
xianbo 543279eb84 add course filter
12 years ago
huangjingquan 64cddc8687 修改了课程设置里面bug
12 years ago
xianbo b0d413a216 modify the admin select
12 years ago
xianbo 677bc4060b fix bug about delete project
12 years ago
xianbo 3b6f0e3d34 modify delete project and user and define a course is a public
12 years ago
huangjingquan 72f2793b0a 修改了关注的显示
12 years ago
xianbo ad597695f5 fix register user.current bug
12 years ago