Commit Graph

5172 Commits (9079eaa4f96c534b60693ddeed6b5c3e2f9084db)

Author SHA1 Message Date
z9hang b8ab3770f1 资源样式冲突调整
11 years ago
sw 9a2f572cf4 是否启用匿评功能异常
11 years ago
z9hang cb498a44a6 去除多出的发布通知按钮
11 years ago
z9hang a59677c22e 课程通知展开信息按钮显示隐藏控制
11 years ago
sw cba678a357 课程是否启用匿评
11 years ago
sw ed92faaedd 关闭课程与重开课程js
11 years ago
z9hang 2c5c261b70 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
11 years ago
z9hang e1afdab988 留言样式修改
11 years ago
sw 0d04eb745f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
11 years ago
sw cb1fce32fe 配置课程
11 years ago
lizanle c704ba71d9 提出按ckeditor
11 years ago
lizanle e95e35fdaa 替换ckeditor
11 years ago
z9hang 35eb7e80af 讨论区留言分页
11 years ago
lizanle 7e618e5b4e 替换ckeditor
11 years ago
lizanle a8205856c9 替换ckeditor
11 years ago
lizanle 5f203ec8c0 新建论坛或者回复,如果传图了,要更新资源的owner
11 years ago
lizanle b95f479c17 级联删除资源
11 years ago
sw 8f90fed8be 新建课程界面完成
11 years ago
z9hang 57dad3f3c7 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
11 years ago
z9hang 8ef9779b46 修正课程讨论区样式。修正项目讨论区被影响的样式
11 years ago
lizanle a4f1b9c625 model中会有许多kindeditor的资源
11 years ago
lizanle dc2c458b34 替换ckeditor
11 years ago
lizanle 01146cd7bd 替换ckeditor
11 years ago
lizanle 05cf90062f 论坛的描述如果有图片的话,图片会显示。使排版出现问题
11 years ago
lizanle cd976f9515 如果论坛的description上传了图片,那么这个图片会显示,使得论坛的界面被图片占据。
11 years ago
lizanle 0d487efea8 添加两个公用的方法。从硬盘上删除对应的资源文件,更新资源文件的owner
11 years ago
lizanle 74029aee46 删掉这个form表单
11 years ago
lizanle 643bfd47cb 添加一个隐藏域,用来保存kindeditor上传图片资源后返回的图片id
11 years ago
lizanle 49148808ec 添加一个隐藏域,用来保存上传图片资源后,这个图片资源的id
11 years ago
lizanle fba9ced608 编辑器在新建论坛和编辑原来的论坛的时候,有所区别,避免在代码里用分支判断,就用了两个页面
11 years ago
lizanle 19b41c684f 编辑器在新建论坛和编辑原来的论坛的时候,有所区别,避免在代码里用分支判断,就用了两个页面
11 years ago
lizanle d1d40e1867 添加一个输入框的id,在论坛模块里,自动生成的id会和编辑器kindeditor生成的id冲突:都叫memo_content
11 years ago
lizanle 72eff3a032 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
lizanle 90bce76409 私有项目的资源数,只要不是本人传的,都看不到
11 years ago
sw 53eef164c9 新建课程时layout修改
11 years ago
sw 58d05689ec 加入与退出分班是js跳转不正确
11 years ago
huang 26ed40f7e1 学生作业列表样式调整
11 years ago
sw 2bb7153131 去掉作业打包下载功能
11 years ago
sw 090190f3e6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
11 years ago
sw c8a08d5a56 1、切换分班功能
11 years ago
sw ab7d12e514 1、修改、删除分班是js方法重构
11 years ago
z9hang 94fd3060ae Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
11 years ago
z9hang 132287d6e1 课程通知界面完善
11 years ago
whimlex 82fb9325c5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 4de0255ce6 邀请邮件国际化;js冲突
11 years ago
huang dac4ffe66e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang eac6f814a8 解决浏览器提示关闭按钮与邮件邀请界面冲突
11 years ago
sw cfe487e217 搜素学生后内容清空
11 years ago
sw 41b4d96173 修改作业积分排序
11 years ago
sw ab3a3a8573 学生收索功能
11 years ago
z9hang 30cb622abd 评论显示页面修改
11 years ago
sw 92808fe8ea 完成学生列表界面
11 years ago
sw 3c224f0ff9 修改编辑分组时的样式
11 years ago
whimlex 05d17361e9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 1452e09154 邮件邀请邮箱格式自动填充;部分国际化
11 years ago
huang b27e7919c3 新建版本添加导航
11 years ago
sw 5f41c92cb3 学生列表界面静态显示
11 years ago
sw 9a08daa1d2 教师列表界面
11 years ago
sw 07623a1e02 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
11 years ago
sw 7399c5b55a 调整js
11 years ago
sw 7b379456ed 课程作业描述很长时才显示更多按钮
11 years ago
z9hang 09991b9cf7 课程资源模块弹框样式调整
11 years ago
sw 27e7bc21b5 当课程简介内容很少时(点击显示更多没有反应),取消显示更多按钮的显示
11 years ago
huang 792a87dcaf 修改提示框引起的首页行距过高的问题
11 years ago
guange 4b636d8be6 #1801 打包上传分个数下载完成
11 years ago
sw 36d168f773 调整提交问卷时弹出框样式
11 years ago
huang 75567585d2 浏览器版本过低提示样式调整!
11 years ago
guange 15accd7d9f 下载功能优化, 功能已实现
11 years ago
sw 61d7d65b55 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
11 years ago
sw bcf9d5919c 1、处理部分a标签调用js函数时会刷新页面的BUG
11 years ago
huang 525a6394ca 1、公共贴吧邮件提醒
11 years ago
sw a2ec15b99c 增加单选题选项时增加空格
11 years ago
sw 09277b8da7 问卷关闭按钮会刷新页面,导致js弹框无法显示
11 years ago
z9hang 95beba05f1 课程留言:回复留言的回复时输入框样式异常问题
11 years ago
z9hang 24b22fce9e 修正课程留言样回复式与项目等模块留言回复样式冲突问题
11 years ago
z9hang 8190d0cecc 修改留言页面样式
11 years ago
z9hang 13245282d4 修正讨论区帖子数量显示不正确问题
11 years ago
z9hang be46142b3c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
11 years ago
z9hang 19eaa012b7 讨论区样式调整
11 years ago
sw 2ef10e89ac Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
11 years ago
sw 165977b9bf 发布文件是报标题不能为空
11 years ago
sw baab3343c8 编辑poll界面
11 years ago
sw 273e82f620 修改poll的show界面的样式
11 years ago
sw 25b3772520 增加poll统计结果的显示
11 years ago
sw 1bba235ca0 1、更新poll.css文件
11 years ago
sw f5059147d2 修改学生提交作业界面的layout
11 years ago
sw c4cd61c71b 修改学生提交作业界面的layout
11 years ago
sw 7970bd6df0 1、增加作业截至时间的js显示
11 years ago
z9hang e39007d96e 新建通知样式更新
11 years ago
sw 0496c33378 添加部分方法的注释
11 years ago
z9hang a2ec9c661a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
11 years ago
z9hang 64d208555e 样式调整
11 years ago
sw 584dcabeaa 修改学生作业列表弹出框不正确
11 years ago
sw 221276ba1f 增加老师布置作业学生访问的列表
11 years ago
sw 0408cc5150 去除无用代码
11 years ago
sw 37bd338311 1、老师修改作业增加默认值显示
11 years ago
sw 20d97848e7 作业界面增加默认值显示
11 years ago
sw f3fefe50f1 1、增加flash显示样式
11 years ago
z9hang cb278e65a2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
11 years ago
z9hang d44bbe9de1 课程通知界面新建通知修改
11 years ago
sw 5139ac30dc 修改老师新建作业界面
11 years ago
huang 0a43ab67ac 编辑器星号匹配问题
11 years ago
z9hang aaf14d5d1a 修改课程通知页面
11 years ago
huang a17458f132 1、户登录名可以在“修改信息”中修改
11 years ago
sw 36bd04cc7a 国际化课程作业列表
11 years ago
z9hang 12d88d85fc *号不能识别问题
11 years ago
z9hang bf5c99321e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 799fa776ee #2091 测试版--课程/项目--资源库:上传资源后 后缀无论是大写还是小写,点击返回的都是下载
11 years ago
huang 75ae68ffc8 项目邀请用户邮箱为空的提示语!
11 years ago
huang f1b8d74a07 修改加入项目字体大小、宽度
11 years ago
huang 1e1ee9a248 修改邮箱匹配错误后提示语
11 years ago
huang 9e297609fd 项目邮件邀请:正则匹配触发事件改成失去鼠标焦点
11 years ago
z9hang 808d56d47b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang f0bc0b2e93 项目关注、取消关注、申请加入、取消申请加入返回js修改
11 years ago
huang dc0c9417e3 修改新提交的作业显示在前面
11 years ago
huang 65bf98016a 新建git添加导航条
11 years ago
huang 10518afa84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang fd9eaa93d6 关注添加+号;去掉css文件中多余符号引起的样式问题
11 years ago
z9hang 5deca84c12 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang bcfdac37a7 课程资源中的图片点击下载有弹框改为预览图片
11 years ago
huang 5b050b1037 解决上传文件名过长问题(作业中部分文件名超出边框)
11 years ago
sw aa240a759a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
11 years ago
huang 72d41fd07a 修改邮件邀请提示信息!
11 years ago
huang ec8b7e4128 修改项目tag删除判断错误
11 years ago
huang 99dd66d8de Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang e171f7b249 项目标签添加删除功能
11 years ago
whimlex d73d842e31 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 5e8f29eb5a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 34579e395f 附件上传bug修改;意见反馈收拉一致
11 years ago
z9hang 473a8805e2 发布取消发布问卷时提示信息有下拉框问题
11 years ago
huang 885b2092e4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 83d63bf479 修改竞赛关注中关注项目读取错误
11 years ago
z9hang eebcccd4bb 编辑贴吧等不显示附件问题
11 years ago
huang cea43cb045 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 69eb7fbd77 关注、加入项目样式,处理样式冲突
11 years ago
z9hang 587a739c76 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
11 years ago
sw b6b479f6f9 1、增加开启关闭匿评时弹框
11 years ago
z9hang 5278d4dd2b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 4ca5687b3b #2072测试版--项目--问题跟踪:成功新建问题后建议提示信息为“问题已创建”就好
11 years ago
whimlex 93838f604d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 3837e1fcf5 申请加入:附件上传
11 years ago
lizanle cdad43fdfc Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
lizanle a4567396e4 如果没有上传图片就会报空指针
11 years ago
z9hang 26feaba6e8 去掉旧的资源样式的引用
11 years ago
guange 7decf34cc7 Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
11 years ago
guange 92b72c995a 纠正合并
11 years ago
sw 0c4f88ca29 Merge branch 'szzh' into guange_dev
11 years ago
sw 69d1fdb699 111111111111111
11 years ago
guange e007920cb6 Merge remote-tracking branch 'origin/szzh' into guange_dev
11 years ago
sw 6edbb3c7ed Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 45475c3612 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 3418c9ccee 1、修改course/homewrok方法
11 years ago
whimlex 6995ead66c 项目ID
11 years ago
dingxu f4dff55377 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
dingxu 073cb07f70 邀请平台用户:角色、用户都为空添加提示、单一角色提示信息修改、
11 years ago
whimlex b400c9bb11 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex b95852dfcd 附件上传国际化:修改页面一些bug:用户主页个人得分身份信息修改
11 years ago
dingxu 7b3af413cd 邮件邀请加入项目:如果邮箱已被注册或为空时给出提示
11 years ago
dingxu 79588489e2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
dingxu 440855c0e6 修改项目tag样式
11 years ago
sw 3bd0bf3c49 1、添加标签url修改
11 years ago
sw 46410c8e8d 1、修改删除TAG后js刷新页面
11 years ago
sw 308568d668 未登录用户不容许给课程添加标签
11 years ago
sw e4ea97486b 课程增加添加标签功能
11 years ago
sw 7541a83b16 改课程首页用新建问卷
11 years ago
sw 90df8056c8 1、修改分页控件中省略号颜色
11 years ago
z9hang 191261e47f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 2a3a70b7d5 app接口部分信息国际化
11 years ago
sw 258d9bf33a 1、调整分页控件显示样式
11 years ago
sw b9ed34f86e 1、右边内容区域、增加js:最短为左侧长度
11 years ago
lizanle 0424fc55db 项目资源数显示错误
11 years ago
lizanle 966f93012d Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
lizanle c209bccba0 项目资源数显示错误
11 years ago
huang f5b528dc4d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 371f25b61f 修改邀请页面分页异常(冲突引起)
11 years ago
z9hang 5a1492964a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 28a61c2617 课程搜索接口无法搜到自己的私有课程问题
11 years ago
alan cf3d836cf3 删除邮件发送时出现《"亲爱的Trustie用户,您好!"》
11 years ago
huang 7e40ea7604 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 1cdf397bc0 修改关注、申请方法中样式
11 years ago
whimlex 3faec141ce Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw d92ac2d909 1、课程跳到其他页面后没有分块
11 years ago
whimlex 7e8ee49298 资源库国际化
11 years ago
z9hang 9d686349da 用户搜索接口添加按昵称或姓名搜索
11 years ago
z9hang 52f2a31b84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang fd2c3e8201 修改课程动态接口
11 years ago
sw 423849ca84 加入课程、退出课程、配置、关闭、复制等按钮
11 years ago
sw 1c30b8c81c 1、增加获取某个课程动态数的方法
11 years ago
sw 8f5d8c86a3 新版样式header调整
11 years ago
huang 4ae5e2af7c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 6498002c71 修改项目文档中附件上传无法保存、附件编辑的时候无法显示的bug
11 years ago
sw 64b0646281 base_course基本完成
11 years ago
guange c45850eb8a git hook改为异步
11 years ago
sw e7cce1fd28 修改项目html错误
11 years ago
guange dc29ccf3b7 1. git仓库新建时加入hook代码
11 years ago
sw 642cf80bf8 调整课程主页分块显示
11 years ago
lizanle b4f99c75da Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
lizanle e49bb18b62 cotroller修改:删除记录的同时删除对应的文件
11 years ago
sw 278854156a 调整课程信息样式
11 years ago
z9hang 86c4a7f45d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 930486d21e #2024 course主页:点击进入非当前用户的所在学校,如图,不显示“我的课程”了
11 years ago
lizanle 41f302c467 cotroller修改
11 years ago
lizanle 112b7fb27f Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
lizanle da69443913 需要插入资源上传的时候插入数据库记录
11 years ago
guange 6c87cd40c1 加入git回调接口
11 years ago
whimlex 85c51cac21 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex cfaf788e37 新版项目成员,关注者,资源库国际化;修改国际化缺失的bug
11 years ago
sw 16872597b6 实现课程搜索
11 years ago
sw ec1ff6dfc3 1、修改课程界面未登录时,先显示注册,再显示登录
11 years ago
huang 216bc57004 1、进入项目子讨论区之后的页面
11 years ago
sw 4d60a6dabc 1、修改版权
11 years ago
huang 003b088091 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 4111e2a940 1、讨论区新子界面
11 years ago
sw 4c482e1fac 完成新的用户反馈界面
11 years ago
sw 1e897687d0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw d2c7861706 1、添加缺少图片
11 years ago
sw e4c0c840bf 1、完成课程模块导航栏样式调整
11 years ago
whimlex e8da6ef871 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 50fe8f2bb7 项目配置模块
11 years ago
z9hang 274295c948 #2033 项目--更多--新闻:编辑新闻相关问题
11 years ago
z9hang 36554aa90a #2041 项目--问题跟踪:成功新建缺陷给出的提示信息错误
11 years ago
lizanle 86020804c9 ok
11 years ago
lizanle c77c1a81a4 html
11 years ago
lizanle f94222cac7 html
11 years ago
lizanle 33669017bf controller
11 years ago
lizanle 39cbeced87 model类
11 years ago
lizanle 0c86ba210d Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
lizanle 4817b3106e kindeditor资源类
11 years ago
lizanle 5c4a62dcc4 DiscussDemo代码
11 years ago
sw 747a109638 1、添加CSS文件
11 years ago
sw 88d6b25ace 1、修改意见反馈图片
11 years ago
guange e798b7242b Merge remote branch 'remotes/origin/szzh' into guange_dev
11 years ago
guange f3d6d7c384 #2037 issue列表默认显示顺序改为最后更新的倒序
11 years ago
guange 366fbcd4d4 #2105 fixed ie8下新建帖子时上传附件导致不能发表问题
11 years ago
guange bcb162c600 #1968 解决IE8不能上传的问题, 只是解决,体验还是没有chrome,firefox的好
11 years ago
sw 3b0a229c43 1.修改意见反馈框默认关闭
11 years ago
sw e4895731ae Merge branch 'develop' into szzh
11 years ago
whimlex aee987d634 邀请Trustie用户
11 years ago
sw e4e56e01b1 修改项目邀请用户失败时的提示
11 years ago
sw ca7c970094 修改意见反馈框位置
11 years ago
z9hang da23b4fd21 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang ff65bf4ba5 app自动更新功能功能,无法下载问题修正
11 years ago
huang cc5a22f2c6 修改新建按钮样式
11 years ago
sw aa8d1741f9 修改项目发送邮箱时的正则验证
11 years ago
huang da02f3fbb4 去掉项目标签为空提示
11 years ago
sw 368a3ce1fa 修改项目创建时间显示不正确
11 years ago
huang 1ed542af09 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang a010c800d6 修改权限库为空情况下403问题
11 years ago
z9hang e165dd6572 修改编码
11 years ago
z9hang 2ccb7ff387 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago