Commit Graph

4846 Commits (05d17361e954a5cf8463811d06291b60b8cd8cee)

Author SHA1 Message Date
huang 4bfc72dc28 用新表统计动态
10 years ago
sw 2ee04d55f2 修改项目邀请用户的界面
10 years ago
huang 6fa5863665 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 0ba7ef0560 修改邮箱邀请时,邮件为空时提示错误
10 years ago
z9hang 7e7da7e445 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang a05061af73 #1859 课程--资源库:全站搜索中“选入我的其他课程”弹出的课程列表中包括当前课程
10 years ago
sw 717be2b045 修改部分用户的用户首页报错
10 years ago
sw 5340ad7fc1 修改组织首页不显示私有项目
10 years ago
sw 69eecf49d1 还原冲突
10 years ago
sw 2ac2c1848c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex 6f4ef81eb9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex 65ee3fdc74 项目主页国际化,项目主页JS冲突解决
10 years ago
sw 5258b7585b 处理冲突还原代码
10 years ago
huang 64bbbff879 添加里程碑
10 years ago
sw b27bb34662 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang c773e0fd39 JS冲突,去掉多余标点
10 years ago
huang 29655838f0 项目超过的部分用“展示更多信息”拉开
10 years ago
huang c36db9fd63 项目左侧按钮实现配置-模块进行显示/隐藏管理
10 years ago
whimlex 11da65c9ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex 57c8575470 新版项目模块国际化,目前完成各项目主页,项目动态,项目评分
10 years ago
sw 4b831c9e65 #2001 项目--工具集中wiki-“查看差别”中有html标签
10 years ago
huang 3ee9ac2b50 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 8f0af4c00d 修改了未登陆情况下通过URL访问不允访问的
10 years ago
sw 04e5aee3c2 版本库和新建版本库两个不同的权限
10 years ago
lizanle d7c550b15b 给projects项目新建的时候添加创建人
10 years ago
sw 4d58116da5 #1997 项目--工具集中的“创建版本库”和配置中“新建版本库”打开的窗口不一样
10 years ago
sw 1e262ec731 修改项目上传资源链接
10 years ago
lizanle 88ee202a4c issue2012,分页显示方式修改
10 years ago
lizanle 8f3f9ea2ed Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle a8a62ab750 issue2012,分页显示方式修改
10 years ago
sw 52dfb0b0ed Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 27e72c1f39 #2000 增加项目每个模块的访问控制
10 years ago
huang 078d2fa488 解决项目中文档为空情况显示异常
10 years ago
z9hang ec455de3d4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang 11c8c0510a app版本管理报错问题
10 years ago
z9hang c552a22fb2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang 14fe487835 将app个人课程动态接口中作业留言归类到更新了作业中
10 years ago
huang cbfb72bd5b 修改新建资源库显示
10 years ago
huang aa2a41d368 修改文档 从项目动态点入后导航栏显示错误
10 years ago
whimlex 93df92e660 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex 540ddd4a1b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex 0eafbb92d5 意见反馈模块国际化
10 years ago
huang 49cf6e1319 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 32a2e7ae1f 修改默认情况下 用户反馈框处于关闭状态
10 years ago
z9hang 743a642cf1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang eec155f077 课程资源页面app自动登陆处理
10 years ago
sw b0eba062a8 修复项目、课程留言不正确的BUG
10 years ago
guange 38c3b40ca1 #1701 修复在编辑作业时,删附件会导致名称编辑内容丢失
10 years ago
sw 9060c9acbc #1977 项目发布新贴跳转有问题
10 years ago
sw aa3ab86fb0 #2013 个人主页--留言--留言输入框不见了
10 years ago
guange e5e46819b4 #867 新建缺陷:校验失败也要保存上传文件信息
10 years ago
guange fd676f13b5 #994 作品下载:资源排序修正
10 years ago
z9hang 57ba46ff00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang 43e9a9a495 1、完成手机app版本管理,上传客户端功能。2、手机app检查更新接口完成
10 years ago
sw 138fac9509 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle 87394fe4ce issue2626,建议什么时候创建工程的信息也要加进来。
10 years ago
lizanle 58cbfa6af7 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 383d90bb12 issue2626,建议什么时候创建工程的信息也要加进来。
10 years ago
guange 31351bc9e8 #1095 在issue主题下,输1个字符可以进行搜索,500错误解决
10 years ago
z9hang 87f0d73ac0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang 803f4a3eaf 1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加
10 years ago
sw 4034e3565a 修改新建项目html代码不争取
10 years ago
sw 8a7fc85e8b 系统中部分回复的本地化文件缺失
10 years ago
guange 5d1a5a0b11 #1738 修复图片下载次数不正确问题
10 years ago
sw bdd1980876 修复个人动态首页报错
10 years ago
whimlex 57c97f3dc8 层级回复留言标签修改
10 years ago
z9hang 08f625446e app版本管理功能新建版本界面
10 years ago
whimlex 4b19463db7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex 115eb38a02 完善用户资料模块,用户主页课程栏、留言栏、项目栏和标签模块国际化;对一些存储在数据表中的固定的中文属性,比如学期,职称,在helper和model中定义方法封装;平台导航模块,包括各模块内部导航的国际化;课程平台模块国际化整理和修改,去除重复功能标签
10 years ago
sw 61167e55c9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang 052afefa5e 用户课程动态按更新时间倒序排列
10 years ago
z9hang 6ca853edc7 1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能
10 years ago
z9hang 26adc13ca2 修改用户课程动态接口
10 years ago
sw 81b58e5c87 修改base_project中代码错误
10 years ago
z9hang 83cc1b41f3 修正api配置
10 years ago
z9hang d634532789 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang d96b87cf42 修改用户课程动态接口返回数据
10 years ago
sw d1912865d3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 0402fee6de 修改邮件邀请
10 years ago
huang 402f3701da Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang d947ebff0c 添加国际化
10 years ago
sw 8c44d25750 处理资源标签搜索中标签丢失的问题
10 years ago
sw 659a87ef60 修复部分本地化标签丢失
10 years ago
lizanle bd9a645c2c project动态分页页码数显示个数减少
10 years ago
lizanle 53d144e8d2 project动态当前页在最后。
10 years ago
sw 7c03b03fa9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw b0897638d9 修改进入问卷结果页面描述样式显示不正确的BUG
10 years ago
sw 6a7c7a732c 修改首页报500
10 years ago
z9hang 610746301f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang 5a3d324ce4 添加课程留言列表接口
10 years ago
sw 3af9c63ae0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
alan 838c39da69 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
alan 48ac3dbea8 修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能
10 years ago
z9hang 0f2ded4d25 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang 782071ab64 显示接口不能用问题,app版本管理部分代码
10 years ago
huang ba09213023 添加新闻模块、部分样式
10 years ago
sw b292df42d7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw c6788e2f40 修复首页报错
10 years ago
huang eb6deed682 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 749e10592d 修改邮件页面样式
10 years ago
sw fea7bd6ad1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 3f3bb62678 非项目成员添加新闻、添加讨论区按钮不可见
10 years ago
lizanle a701eb91a2 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle e8bdc13f24 缺陷1975,打开project 330的时候报错
10 years ago
sw 945b9ff9cf 修复进入我的动态,关注人没有进行权限过滤的BUG
10 years ago
alan 6cf7e156d1 Signed-off-by: alan <547533434@qq.com>
10 years ago
alan 5c1a6f7754 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
sw 3e3cde0805 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
alan 151fc561ac 修改邮件样式,增加相应的提示
10 years ago
sw ff2b4c610c 1、修改用户动态每页显示条目不正确
10 years ago
huang e22b389971 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang b043d07d61 修改发布新贴显示问题
10 years ago
alan 5ff43fdea7 项目添加新用户邮件发送功能
10 years ago
huang ce792f6ce8 修改邮件发送界面
10 years ago
huang b3cbfd39ca 修改一些缺陷,删掉多余的文件
10 years ago
huang f898e2aa91 16:22
10 years ago
z9hang 6e7b294452 注释掉不用的API
10 years ago
z9hang c1c05067e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang 754acc6945 移动端版本管理
10 years ago
huang b2b978d540 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang c159bb2c48 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw a6b3ddcfcb Merge branch 'szzh' into dev_zanle
10 years ago
sw e58f5d4af5 #1941 问卷描述,当编辑时有输入空格行时,点击确定js不会刷新,而且不会对剪辑的格式进行存储
10 years ago
huang beac15475d 新项目及用户反馈框的修改!!
10 years ago
lizanle 10faab0129 新建的项目发布新问题报500
10 years ago
lizanle 140cb81748 测试版发布课程通知和讨论区发布新帖报500
10 years ago
sw e326934027 调整组织首页缺少项目时的显示样式
10 years ago
sw 5692cbf202 #1965 公共贴吧取消软件创客入口
10 years ago
sw 3c1f1d8bad 修改部分浏览器下发布问卷、取消发布问卷样式显示不正确
10 years ago
sw 26081c6120 新建项目时增加不选择所属组织
10 years ago
sw 1f2b5eedb8 Merge branch 'dev_zanle' into szzh
10 years ago
sw d947a914cc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw e2307366f6 实现组织的增、删、改、查功能及相关界面
10 years ago
z9hang 3334299808 app版本管理功能(表添加,页面部分添加)
10 years ago
lizanle 8d322edb90 Merge branch 'szzh' into dev_zanle
10 years ago
sw 3c4b502e97 1、修改进入组织主页项目列表显示不正确的问题
10 years ago
sw 5f8595d874 admin页面增加组织列表
10 years ago
sw 45fe622f26 1、修改进入系统首页报错
10 years ago
sw 3b4bf8b99d 增加组织的index界面,以及index界面到组织首页的跳转
10 years ago
sw dead08a0d6 添加、修改项目增加所属组织的选择
10 years ago
sw d1edd86e11 1、修改组织首页项目获取
10 years ago
z9hang 04dea372c5 添加意见反馈接口
10 years ago
sw a64671f9de Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw bcc8abdee9 1、增加组织相关数据表
10 years ago
z9hang d1651f7252 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang d01aa5f15c 关注接口限制不能关注自己
10 years ago
sw ef5b7c9fca Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 7f249d29f4 修整页面代码
10 years ago
z9hang 199ef4ebe6 匿评作品详情列表补上cur_page字段
10 years ago
z9hang 509a37a575 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang 411d201fc3 作业详情接口添加留言列表
10 years ago
sw a2d986f70c 修改页面代码
10 years ago
lizanle 7ee58d1d44 项目动态重写,并去掉首页缓存
10 years ago
sw 032e28067d #1959 项目评分是0的,就不显示了!
10 years ago
sw 33e9a3e326 #1958 关注有用户0个后边取消冒号
10 years ago
sw 5bba54432d #1930 项目缺陷显示个数修改
10 years ago
sw 2c4e864080 #1949 学生可以通过url访问老师并未发布的问卷并进行作答
10 years ago
sw da21e61afd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang 451a022d5f 作业详情、作业列表返回数据修改
10 years ago
sw 9233213127 修复未登录时进入指定学校课程列表显示却是国防科大课程列表的BUG
10 years ago
z9hang 7b5eb9db8b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang 32264fb4a6 课程动态接口修改为用户所有课程动态接口
10 years ago
sw bbeaa6e80c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 90d9e77b32 修复课程主页没有2015年课程
10 years ago
alan 22ac578ede Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
alan f374bfd7e2 修复《窗口跳转问题》
10 years ago
sw d999a9f4a6 修复新建课程时报错的BUG
10 years ago
z9hang 18271946d7 作业详情,课程作业列表接口返回数据格式修改(增加了作业作者相关信息)
10 years ago
z9hang 2f762973b4 课程动态接口返回数据格式修改
10 years ago
z9hang 196ceff138 返回课程的接口补上当前用户是否为课程成员,课程老师信息
11 years ago
alan c00deabf75 修改《邮件样式》
11 years ago
alan aa8f58530c 给黄总提供接口
11 years ago
alan 4bfc4493eb 添加《邮件周日发送》功能,修改《贴吧》邮件发送策略
11 years ago
z9hang a6882d0f88 获取所有课程及显示课程接口返回数据中添加当前用户是否是课程成员、及是否是课程教师字段
11 years ago
z9hang e4442bfe04 用户课程、搜索课程接口返回数据添加当前用户是否是课程成员、及是否是课程老师两字段
11 years ago
z9hang 85782cdb8d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 3018ee206c 修改时间格式解析
11 years ago
sw 5ef1bc1d02 修改本地登录后报错
11 years ago
sw 73d2e2e5e2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 22aae1910b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 59a2c8283a 国际化结构调整
11 years ago
z9hang 103a411b40 修改用户搜索接口
11 years ago
sw f380d781e7 增加根据已有课程复制成新课程的路由以及方法实现
11 years ago
sw 2ceb21b83b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
alan 7442cc1ca4 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify
11 years ago
alan 6e72e07028 Merge branch 'szzh' into email_verify
11 years ago
alan 6f9e2bad63 mail weekly
11 years ago
z9hang d913f89a82 添加课程动态接口
11 years ago
z9hang cc83b30fc6 修正搜索用户接口,添加课程动态接口
11 years ago
sw 859889b750 简化查询匿评数量的代码
11 years ago
sw 3c8f851c37 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 4cdb3c83dd 增加获取用户在指定课程内作业数量的接口
11 years ago
sw 0b41afa571 修改作业匿评界面,左侧附件名显示混乱
11 years ago
z9hang cd25628208 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang b1903dba11 添加课程留言接口
11 years ago
lizanle d902d76ae2 将google统计换为了百度统计
11 years ago
sw 50244e6860 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 95b757ba09 修改问卷发布成功和取消发布成功后弹框提示样式
11 years ago
z9hang 0dfa428377 手机API添加回复留言接口
11 years ago
z9hang ef203ff40c 修正作业留言接口
11 years ago