Commit Graph

4891 Commits (dev_newrep)

Author SHA1 Message Date
huang d7faed7f6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt 35260f2f6d Merge branch 'cxt_course' into develop
9 years ago
cxt f4e965c9fb Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
9 years ago
cxt 2759d562ac 首页项目列表
9 years ago
daiao 4a9967674a 1. 强制编辑基本资料,在删除单位时给出消息通知
9 years ago
huang 93f8ac31f1 项目资源库新分页及ajax刷新
9 years ago
yuanke a979bd3d54 微信修改绑定成功的模版消息内容
9 years ago
huang 37df983009 项目列表
9 years ago
yuanke 9b52c1504e 调试
9 years ago
yuanke 2ff83aff81 调试
9 years ago
huang 75971120f7 Merge branch 'develop' into rep_quality
9 years ago
huang 047eea125d 课程资源分页及局部刷新
9 years ago
yuanke d60857eaea 调试
9 years ago
yuanke 1f8ea39765 调试
9 years ago
yuanke 2cfd876f2f 调试
9 years ago
yuanke c307f7769f 调试
9 years ago
yuanke ded55ca022 调试
9 years ago
yuanke fd036d758e 调试
9 years ago
yuanke bce3513424 分享修改
9 years ago
yuanke 24a0bfea77 分享修改
9 years ago
yuanke 822ca15c78 分享修改
9 years ago
yuanke 5c42cdb39c 分享内容时改为用户信息授权方式
9 years ago
yuanke 6af15b7121 微信自动绑定用户修改
9 years ago
yuanke 4e6c58ae37 动态点提交如果没绑定则自动创建一个帐号绑定,然后注册的时候将已绑定的用户信息修改为注册的信息
9 years ago
cxt 951390092b 我的作业报500
9 years ago
cxt 322868f063 班级的课程id变为空时打印日志
9 years ago
cxt 80b8fc4444 “我的作业”中有挂起的作业时会报500
9 years ago
huang 3df8a46634 PUll request代码简化及reverse评论
9 years ago
yuanke 14e70541db 平台加入项目发微信模版消息
9 years ago
yuanke ea926395c3 Merge branch 'develop' into weixin_guange
9 years ago
yuanke f100d3ebea 项目发起人显示名称修改
9 years ago
yuanke 0d69fa0cc0 微信私有动态内容加上提示
9 years ago
huang b14cdb0b6d some log
9 years ago
cxt 7edb30754b student_works添加字段commit_time,记录学生作品实际的提交时间
9 years ago
huang 5ad063b830 记录接受PR用户信息,并且唯一性判断
9 years ago
Tim f5f88c5204 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
9 years ago
yuanke 57737ff15d 微信细节优化
9 years ago
Tim e85f9373c8 点回复按钮回复框获取焦点;班级通知内容冗余;班级、项目邀请文字更友善;班级、项目中人数后箭头与人数对齐;邀请码提示增加间距;回复中@删除链接;二维码页面增加默认加入身份提示;公众号联系我们文字更改
9 years ago
huang 8270344794 job
9 years ago
huang f2a13540a2 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
9 years ago
huang e2557aede8 test jenkins
9 years ago
huang 5ae59f6b6c 邀请码去掉前后空格
9 years ago
cxt 9594aada50 Merge branch 'cxt_course' into develop
9 years ago
cxt a3011c319b 我的题库显示我的所有作业
9 years ago
huang 4f3b41f323 详情页面提供分页(评论、变更、提交)
9 years ago
cxt 65f6b0fc70 新建课程报500
9 years ago
huang 867434531d pull request 列表页面添加分页
9 years ago
cxt 739edd68bf Merge branch 'cxt_course' into develop
9 years ago
cxt c891a41ef1 打印log
9 years ago
huang dcdc09d864 修改gitlab api接口
9 years ago
huang 87c5f50545 PULL request 评论创建及局部刷新
9 years ago
huang b7bccc7d22 PR添加评论 列表页面
9 years ago
huang 6319a1bac6 PR添加评论定义
9 years ago
cxt 547aae0743 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt 6c9a4a6620 首页的左侧项目栏无法展开
9 years ago
huang d1b4e83fee 完成pull request 关闭功能
9 years ago
yuanke 2b7ff3c76b 修改各个页面验证绑定登录的方式。
9 years ago
huang 518d6bacbe 添加关闭pull request功能
9 years ago
huang ecc6f5601e 接受请求后显示admin问题
9 years ago
cxt 5b8883960b Merge branch 'cxt_course' into develop
9 years ago
cxt d3db6719eb “我的作业”中编辑作业不跳转到“题库”,而是返回到“我的作业”
9 years ago
cxt 55637808ff 班级作品:两种角色的成员,先学生身份提交作品,再教辅身份评阅自己的作品,评阅结果不能自动刷新
9 years ago
cxt f5a2d6acdb 班级作品:学生提交作品弹出作品校验框,点击重试后,作品列表中默认生成的作品记录就没有了
9 years ago
huang 3afdeda4d3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
huang 3ef2509d27 报告人员加入项目不用提醒
9 years ago
cxt e7e873e0df Merge branch 'dev_shcool' into develop
9 years ago
cxt 3178700131 Merge branch 'cxt_course' into develop
9 years ago
daiao 7fbca5f260 单位审查消息及其BUG修复
9 years ago
cxt 0d86a28c54 我的作业
9 years ago
huang 81ce93e88b Merge branch 'rep_quality' into develop
9 years ago
huang 43a4e0a2bf fork成功不跳转提示
9 years ago
huang b62ac02c15 自身分支创建PR修改
9 years ago
huang b86b2299a7 fork分支选择 js
9 years ago
huang b297446778 select选择框
9 years ago
cxt f9bfe278c0 多重身份的学生匿评变为了教辅评分
9 years ago
huang ab6acb460e forke项目发送pull request API
9 years ago
huang f4bda16469 fork分支PR
9 years ago
huang 5419103268 修改API(gitlab中创建所有pullrequest为Admin的问题)
9 years ago
huang 515649beb6 接受PR局部刷新及跳转
9 years ago
yuanke 12a9c95c01 微信项目及班级邀请码相关BUG修改
9 years ago
cxt 6c7b53f7d4 首页左侧栏
9 years ago
huang a62ede1a33 先建pull request及局部刷新
9 years ago
huang 2e91da4f28 项目分支获取
9 years ago
huang f8b53b8dfc Pull request列表页面分类
9 years ago
huang 22a8adb64e 添加统计数目
9 years ago
huang b8cccdffda 完成changes数据获取及展示
9 years ago
huang 27e755a0a9 数据获取及展示
9 years ago
cxt cecf917764 从题库选用作业时增加提示:“您选中的题是“我收到的作业”,不能选用”
9 years ago
huang 0a9224d036 每次请求提交的代码
9 years ago
huang be081f5c66 添加Api(提交内容,改动)及相关方法路由
9 years ago
cxt acc3ba121f 测试集的显示、新版分页
9 years ago
cxt 718b13e6c1 新版题库
9 years ago
huang 1cb6809bdf Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
9 years ago
huang 182c861b30 创建pull request
9 years ago
Tim e7fa38e52c pull request show页面
9 years ago
daiao 5f969c6593 单位审核相关Bug修复
9 years ago
yuanke 65719add19 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
9 years ago
guange 2632f7aa59 引入wechat js sdk
9 years ago
huang 3ce1ac80b4 pull_request ---> new
9 years ago
huang 20bdd23665 pull requtst show
9 years ago
yuanke a4281b4934 Merge branch 'develop' into weixin_guange
9 years ago
huang 7658844a28 鼠标经过弹框消息提示
9 years ago
huang 94b36e227c 申请加入项目消息刷新,同时更新其它管理员的消息状态
9 years ago
huang 0b113bb985 项目邀请码识别小写
9 years ago
huang 3660f8cbce gitlab相关方法的封装
9 years ago
Tim 1fc617d5fa pull request页面删除
9 years ago
huang b718803bd9 修改控制器名称及控制器查询访问权限
9 years ago
huang 685f9d8090 项目左侧权限控制
9 years ago
daiao 24783705b5 Merge branch 'dev_shcool' into develop
9 years ago
huang 7c4759f3b7 项目左侧添加pull request入口
9 years ago
yuanke dde89b72fa 加入项目二维码修改
9 years ago
daiao fc1fc0bd7d 单位审核bug修复
9 years ago
yuanke f016027e8f 微信加入项目修改
9 years ago
huang 96b04f39b1 pull requests框架搭建(路由控制器、views)
9 years ago
yuanke 2c86ae3eb2 二维码识别 项目和班级区分
9 years ago
yuanke c1bd3b6bf1 增加日志测试
9 years ago
cxt 18539b45de Merge branch 'dev_shcool' into develop
9 years ago
cxt 6d17329a6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt 3bc696a597 申请学校的更改
9 years ago
daiao 5272f20de8 单位审核bug的修复
9 years ago
yuanke 4c9e183cd0 微信菜单点击加入项目修改
9 years ago
yuanke bb0bfa21cc 加入项目邀请码修改
9 years ago
yuanke f0cf7adcdf 加入项目邀请码
9 years ago
huang f7e8c5232c 个人主页加入项目,如果已经申请了则提示已申请
9 years ago
huang 30ce469483 申请加入项目删除邮件
9 years ago
daiao 15227907ea Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
huang 07ff420a6a 退出项目的时候清楚申请信息
9 years ago
daiao db690bedab 单位名称列表缺陷修复
9 years ago
huang b1fd7048fe 报告人员问题
9 years ago
yuanke 7d0d208676 Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
9 years ago
yuanke dce84484ff 修改单位的省市个人资料省市也得修改
9 years ago
daiao 911a769670 Merge branch 'develop' into dev_shcool
9 years ago
daiao 5b93d40f67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
daiao 39478eb4e4 Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
9 years ago
daiao d6178ec7dd 管理员界面单位申请
9 years ago
yuanke 1704462986 管理员界面单位申请修改
9 years ago
huang 847cae6d41 Merge branch 'develop' into rep_quality
9 years ago
huang 5414080646 删除用户和拒绝用户可以再申请
9 years ago
yuanke 1f47eb5ea8 单位申请列表修改
9 years ago
huang 8d625eff5e 修改方式就用户图像显示
9 years ago
daiao 3251890c91 Merge branch 'rep_quality' into dev_shcool
9 years ago
huang 643b06484b 消息表添加字段
9 years ago
daiao 430a93e4b2 单位名称列表功能代码
9 years ago
huang 0bf9b5c6e6 消息红点记录 个人主页添加加入项目入口
9 years ago
cxt e3d538c3fa Merge branch 'cxt_course' into develop
9 years ago
cxt 72977886c7 Merge branch 'cs_optimize_txz' into cxt_course
9 years ago
cxt 335b82c046 加入班级的弹框
9 years ago
huang 824b430fbd 解决质量分支弹出空白页面问题
9 years ago
cxt a1553c7a8f 角色的修改
9 years ago
daiao 5b30036639 单位名称列表功能
9 years ago
huang 450217e7c2 同意加入消息发送,及添加成员
9 years ago
huang c07677ef99 项目邀请框架 拒绝消息
9 years ago
cxt a1a2b3dd33 Merge branch 'rep_quality' into cxt_course
9 years ago
cxt 848c56d54e 班级主页身份切换、成员管理页面的多重身份
9 years ago
daiao 6bd9f47222 Merge branch 'dev_shcool' into develop
9 years ago
daiao 50ec127c5b 单位名称列表功能
9 years ago
yuanke 93844e757c 微信:角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改
9 years ago
huang a8fa4a55e3 项目申请消息发送
9 years ago
yuanke 6d594cfcbe git pull后重新commit
9 years ago
yuanke cf65e6748b 微信项目相关功能开发,班级角色功能等
9 years ago
huang 4a9eec0cce 完成项目邀请及公共弹框的封装
9 years ago
huang c6bc5c9cb8 Merge branch 'dev_shcool' into rep_quality
9 years ago
huang 7413298aad 项目邀请码申请及弹框
9 years ago
huang 2f79e521ca 单位批准发送消息;申请单位给系统每位管理员发送消息
9 years ago
huang 29edd60ce6 Merge branch 'daiao_dev' into dev_shcool
9 years ago
daiao 9e788c9b6f 单位批准及消息框架搭建
9 years ago
daiao f35b33b09e 单位申请记录用户信息(添加user_id)
9 years ago
cxt a0f2f518cf 回复他人的博客首页不应跳到自己的博客首页
9 years ago
daiao 0d59f5a358 Merge branch 'daiao_dev' into develop
9 years ago
cxt feb45a07bf 课程列表分为我创建的课程和我加入的课程
9 years ago
huang f12423e8a6 issue动态中不能删除问题
9 years ago
huang d51295127d issue删除回复删除附件的问题 同事关联删除
9 years ago
huang e7f862458f issue回复问题; 二级回复编辑issue弹空白框问题
9 years ago
daiao 6ab2c15504 修复先删除课程下的某班级,再删除该课程报错
9 years ago
huang b01e228d51 修复issue回复不能点击的问题
9 years ago
huang 463c09f02c 项目邀请弹框
9 years ago
daiao 67bdea314a 作品列表-分班过滤:点击“请选择分班”过滤显示所有学生
9 years ago
daiao 5883b451ca 在管理员界面添加单位名称列表
9 years ago
guange 6a871e2116 .
9 years ago
guange 9d2900d58f 解决没绑定用户不跳转到绑定页问题
9 years ago
cxt 0564ddb6ea 课程大纲的回复
9 years ago
huang 35172dab59 管理员界面单位申请框架
9 years ago
daiao 9ff728f080 Merge branch 'develop' into daiao_dev
9 years ago
cxt 6c7925a7b4 样式调整
9 years ago
cxt 45fb2d0a3e Merge branch 'develop' into cxt_course
9 years ago
cxt 808b553e43 班级动态只有10条,底部却显示“点击展开更多”
9 years ago
huang 0e1a52726f Merge branch 'cxt_course' into develop
9 years ago
cxt 02a5254943 课程大纲的回复展开更多无反应
9 years ago
huang 19734c1aa4 组织匿名用户问题
9 years ago
yuanke cdb7782849 除了issue 和news都增加了二级回复显示
9 years ago
cxt 9422e2886c 新版班级主页
9 years ago
huang 6fea64afe2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt 1e28ff880d 新版课程大纲
9 years ago
huang ff8cad5cf2 项目动态中添加提交动态
9 years ago
yuanke 86731c34d5 单个课程作业不显示的BUG修改,加入班级时如果班级已被删除需要提示!
9 years ago
cxt 71b5fe1273 Merge branch 'develop' into cxt_course
9 years ago
yuanke f0840d0f31 Merge branch 'develop' into weixin_guange
9 years ago
yuanke 7cd505ea4b 博客详情动态加入二级回复的展开功能一级一级回复的更多功能。
9 years ago
cxt 9a4c210d16 组织文章的“点击展开隐藏楼层”
9 years ago
cxt c84a9e6e10 个人主页,不需要对其他用户显示关注人的动态。例如,我看周老师的个人主页时,不应该显示我的博客动态;但他本人看自己的主页时,应该显示尹刚的博客动态,因为他关注我了。
9 years ago
cxt f3c95906d8 项目缺陷的二级回复
9 years ago
daiao b7cf7a2468 Merge branch 'develop' into daiao_dev
9 years ago
cxt 7853b8aa54 班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复, 二级回复代码的整合
9 years ago
huang 3a43b7beb5 redirect to repository when delete jenkins job
9 years ago
huang e99c76a0de resolve edit problem of jenkins job
9 years ago
huang 1935176500 Merge branch 'develop' into rep_quality
9 years ago
guange 674c45f1d9 去掉上传的csrf报错
9 years ago
huang cf04bb5ec6 迁移上线
9 years ago
huang 04fe06eff9 gitlab数据迁移
9 years ago
cxt fdf925a0b8 个人主页留言动态:如图回复当前用户自己的留言却不能删除,“展开回复”后又可删除了,刷新网页后又删除不了
9 years ago
cxt 8e3488132b 导入作业:公共题库中显示的却是我的题库,我的题库中显示的却是公共题库
9 years ago
yuanke ff13d2e572 微信增加作业发送,修改发送的权限,修改菜单
9 years ago
huang 5c046f922e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
huang 097374df14 去掉全局变量,通过filter获取
9 years ago
cxt a9ee1d10cd 新增班级成员的消息通知,跳转至该班级的成员配置页面
9 years ago
huang 3198f8a473 解决版本库提交记录中:上传图片或者非可以预览文件 显示详情500问题
9 years ago
yuanke 6ae57ef23a Merge branch 'weixin_guange' into develop
9 years ago
yuanke 0a1ecd65e8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt dbc8f87346 Merge branch 'yuanke' into develop
9 years ago
cxt 1c967ce569 Merge branch 'rep_quality' into develop
9 years ago
cxt e260c0b7cc Merge branch 'cxt_course' into develop
9 years ago
cxt 11e0101f56 导航栏题库中 我的题库放在前面
9 years ago
cxt b7e6725e1f 管理员界面的课程名称双击可点击
9 years ago
guange 0e415fffff merge
9 years ago
huang 38cc3c2010 发送过来的资源在项目中添加动态
9 years ago
yuanke dc2ba96353 用户注册发送绑定成功消息通知,加入班级消息通知点击跳入班级
9 years ago
yuanke b8c8b2c4ae 修改加入班级的提示
9 years ago
yuanke 6ab1269c01 修改微信反馈框加入重复班级提示有误的问题
9 years ago
cxt b77779ca55 文章的二级回复和组织帖子的二级回复
9 years ago
yuanke d50fd40307 Merge branch 'weixin_guange' into develop
9 years ago
cxt e19efc1c8a 博客的二级回复
9 years ago
huang 3485d48163 Merge branch 'develop' into rep_quality
9 years ago
huang 9b59ca20de 修复issue详情页面,删除回复后再编辑保存issue弹出白色框问题
9 years ago
yuanke 1e8f496718 代码查重结果 不显示未提交的作品
9 years ago
daiao dcc37ef847 增加作品查看界面中,班级查询条件下,增加暂无分班的查询条件
9 years ago
cxt ded8f48d34 博客的二级回复
9 years ago
huang 61bf6604b1 解决ajax情况下,issue状态选框不显示问题
9 years ago
cxt 16cf8a56a1 管理员和老师可看到课程下的所有班级
9 years ago
huang 191261d3b8 each time to 10s
9 years ago
yuanke 824f9d9174 新增创建班级的模版消息
9 years ago
guange 4908a68a7d 时间utc问题
9 years ago
guange ae3212082c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
guange 8df0dcae7a 调用编辑接口不成功时,打印具体的信息
9 years ago
huang e766adf087 add delete to qa
9 years ago
yuanke d75e2b740f 微信点击我的课程里面的两个按钮时没绑定会提示绑定
9 years ago
huang 22745edb9b Merge branch 'rep_quality' into develop
9 years ago
huang 8b5a2ac1cb message 500
9 years ago
cxt b4e6561e50 Merge branch 'cxt_course' into develop
9 years ago
cxt d71e10c8ac Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt 0b4db97756 班级动态
9 years ago