Commit Graph

1183 Commits (cb21fb8d3d2748f45476060e5cb15d22671f5c2d)

Author SHA1 Message Date
txz 00c3e880e6 微信详情页面返回定位js
9 years ago
yuanke 86731c34d5 单个课程作业不显示的BUG修改,加入班级时如果班级已被删除需要提示!
9 years ago
cxt 71b5fe1273 Merge branch 'develop' into cxt_course
9 years ago
cxt 60bbe89c0d 博客的自动保存
9 years ago
yuanke 7cd505ea4b 博客详情动态加入二级回复的展开功能一级一级回复的更多功能。
9 years ago
yuanke 67e87df4d5 微信动态详情回复显示修改
9 years ago
yuanke bf600e8f76 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
9 years ago
yuanke 1ce7b22c0e 博客动态回复二级回复修改
9 years ago
txz 5b3c6cc012 输入框高度控制
9 years ago
yuanke 80843d5084 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
9 years ago
yuanke bc1b4c1b85 班级邀请码弹框修改,我的动态回复数计算修改
9 years ago
txz bc0d8cd299 管理班级重命名字体变灰
9 years ago
cxt fdf925a0b8 个人主页留言动态:如图回复当前用户自己的留言却不能删除,“展开回复”后又可删除了,刷新网页后又删除不了
9 years ago
yuanke ff13d2e572 微信增加作业发送,修改发送的权限,修改菜单
9 years ago
yuanke f3d74fcd55 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
9 years ago
yuanke 8968c991ff 微信:作业增加发送功能
9 years ago
guange 51692eadd6 改进上线流程
9 years ago
guange c14979d878 assets
9 years ago
yuanke 6ae57ef23a Merge branch 'weixin_guange' into develop
9 years ago
yuanke 67fa6da8ae 我的资源界面加载前 不显示暂无数据
9 years ago
yuanke 596bfe4bfc 邀请码分享问题修改
9 years ago
yuanke 7dd26bb5d9 邀请码BUG修改
9 years ago
guange 82aa369687 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
9 years ago
guange c02245adfb 邀请码分享
9 years ago
yuanke 6385cc892f Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
9 years ago
yuanke 60dc0e72cf 微信我我的资源更多按钮显示
9 years ago
yuanke 0a1ecd65e8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
txz 0d08d6b192 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
9 years ago
txz 6063932840 课程管理中,对课程,班级名称编辑时,字体变灰
9 years ago
yuanke 9b17724ebf Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
9 years ago
yuanke c476dae15b 微信我的资源中 更多按钮暂时隐藏
9 years ago
guange a177c48a29 erge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
9 years ago
yuanke 2cc42a8f5a 微信修改资源更多问题
9 years ago
guange fff6f4b310 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
9 years ago
guange dd892993dd assets
9 years ago
cxt b7e6725e1f 管理员界面的课程名称双击可点击
9 years ago
guange 0e415fffff merge
9 years ago
yuanke b540ff7017 我的资源里增加更多按钮
9 years ago
cxt 7ea5d7d934 新建班级页面,提示“如果列表中没有对应的课程,请您先创建课程”始终显示
9 years ago
yuanke d50fd40307 Merge branch 'weixin_guange' into develop
9 years ago
cxt e19efc1c8a 博客的二级回复
9 years ago
txz e61aa9e0dc 回复框高度自动增减js同步
9 years ago
yuanke a5acc2641e 微信点赞保证各个切换之间点赞状态保持一致
9 years ago
txz 78a6785b6b 微信回复框自动增高
9 years ago
txz 717bbe2ffa 回复框多行提交后初始化
9 years ago
yuanke 70ed5790b8 修改在动态详情点赞返回和点赞状态不一致的BUG
9 years ago
cxt 5d9bde3c95 课程发送资源到课程
9 years ago
yuanke 374aa9918c 我的资源里面都显示未发布的,新建课程后返回会刷新数据
9 years ago
guange 135b6ca64b assets
10 years ago
guange 7c98e0f392 merge
10 years ago
guange 1413fe82dc merge
10 years ago
yuanke c2166811eb 修改管理课程界面刷新显示问题
10 years ago
yuanke 8d8de084ac Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
10 years ago
yuanke c6099177a4 修改微信发送资源平台不显示发送人的问题,删除班级提示文字不居中的问题等
10 years ago
txz ea5bd94e99 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
10 years ago
txz 9ae7461501 资源列表学生进入时也显示为课件;课程tab页样式替换
10 years ago
guange 3c36e97ff1 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
10 years ago
guange 3c23560d77 我的资源搜索无效
10 years ago
guange 068c8967e1 新增班级时名称为1个字符时报错
10 years ago
yuanke 3a2e2c1174 未命名课程暂不允许进行课程管理
10 years ago
yuanke d38ce793bd Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
10 years ago
yuanke bb62ba40b7 修改微信权限问题、管理课程界面等
10 years ago
huang ef8b127225 Merge branch 'cxt_course' into develop
10 years ago
txz ed39b4b4f1 动态:创建班级;学生进入资源也显示课件;已有班级和新增班级颜色区分
10 years ago
yuanke 06f7594680 Merge branch 'yuanke' into develop
10 years ago
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course
10 years ago
cxt da7509f64c 课程大纲的优化
10 years ago
guange a2ba65956c .
10 years ago
yuanke 3a6470b1f3 删除班级时增加提示确定信息
10 years ago
guange 7859bf9c32 .
10 years ago
guange a17a6ed596 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
10 years ago
guange 10789d2505 added alert2
10 years ago
cxt a99b03ff76 管理员界面增加配置课程
10 years ago
yuanke 9d46040f7a 课程列表 + - 按钮增加效果,资源发送界面课程列表显示和课程列表界面保持一直
10 years ago
yuanke 6fe8d7ddf5 点击图片弹框右下角统一用“关闭”
10 years ago
yuanke b994e786ab 我的动态中三类动态之间切换的效果
10 years ago
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course
10 years ago
yuanke d49bc8b114 发送课程的时候提示语修改
10 years ago
yuanke da19bbd3a0 优化了下修改资料界面的代码
10 years ago
guange 373e3d3422 merge
10 years ago
guange 48fb02a2d6 管理课程
10 years ago
yuanke 9d0b5789d9 1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改
10 years ago
guange 60367415fa 新建课程功能完成
10 years ago
cxt cc649ae64b 课程讨论区、项目讨论区、帖子详情页面的二级回复
10 years ago
guange 3c295ba5a1 merge
10 years ago
guange 201abd6358 assets
10 years ago
guange b010ce2e61 发送课程完成
10 years ago
cxt e834d09469 Merge branch 'cxt_course' into develop
10 years ago
cxt 0ff8f0a774 课程大纲的删除和课程大纲描述的删除
10 years ago
cxt bdaa9983e3 Merge branch 'cxt_course' into develop
10 years ago
cxt 2c1e0f534c 课程大纲
10 years ago
cxt ac4218bfb0 课程大纲列表
10 years ago
guange 0bb5c8b5fb 注册绑定问题
10 years ago
cxt e066445036 课程大纲的显示和编辑
10 years ago
cxt 383483de26 课程大纲的左侧栏base,新建课程大纲、新建班级的调整
10 years ago
guange e9f280b4aa .
10 years ago
guange 047903ddff 重构课程地址
10 years ago
guange 1e6454efc0 加入我的资源
10 years ago
guange 5477c794ba Merge remote-tracking branch 'origin/develop' into weixin_guange
10 years ago
guange 3b383dfa65 老师课程界面
10 years ago
yuanke ab99645148 Merge branch 'yuanke' into develop
10 years ago
yuanke dd397a060b 修改删除组织成员跨域的BUG
10 years ago
guange 05f09c4595 Merge remote-tracking branch 'origin/develop' into weixin_guange
10 years ago
guange c501af70ba .
10 years ago
cxt 4f342142e6 组织文章的展开更多
10 years ago
cxt 0611ddcc43 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
guange 2c2e1892e5 Merge remote-tracking branch 'origin/develop' into weixin_guange
10 years ago
guange c39a982093 二维码
10 years ago
cxt eab000306c 动态回复的展开更多、收起,组织文章回复不可用
10 years ago
cxt d558a4d357 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
Tim a542ba46a4 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
Tim ec33569033 取消拖拽
10 years ago
cxt 260759e4db Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
guange da09983f9e Merge branch 'weixin_guange' into cxt_course
10 years ago
cxt ac629440b1 课程邀请码
10 years ago
yuanke c6be37020f Merge branch 'cxt_course' into develop
10 years ago
guange 485d0e3743 ticket处理
10 years ago
yuanke 86a5eccae6 组织设置中添加成员BUG解决
10 years ago
guange e21f4e0b4d merge
10 years ago
guange f9075e08ba merge
10 years ago
guange d348981721 加入邀请码
10 years ago
guange 52d4d36097 邀请码页面
10 years ago
Tim 563fb3b459 控制table拖拽不靠在一起
10 years ago
cxt 126bf9c195 个人留言、课程留言的二级回复
10 years ago
guange 7700445c17 加入课程
10 years ago
guange 13273d02de 修正了安全问题,不暴露openid
10 years ago
guange 5a8de44c43 添加我的班级控制器
10 years ago
guange b4a3d4a5a2 弹出框处理
10 years ago
Tim 3548c23aad Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
guange b7230333dc code获取修改
10 years ago
guange 3f98562c0f 打包
10 years ago
guange 61c117b8cb 重构老的代码,本地通过session来存放token, 所有的访问直接用老接口
10 years ago
txz b17b92cc3e 微信回复后先加载后启用回复按钮
10 years ago
guange 9d19caa736 .
10 years ago
guange 46018ad388 .
10 years ago
guange 3582849ef3 .
10 years ago
guange a0c0a65d18 绑定用户迁移到接口
10 years ago
guange 98c6548e39 重写登录和注册
10 years ago
Tim 4b62a39b15 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
huang 88b838a89a Merge branch 'cxt_course' into develop
10 years ago
huang 35ee17c4ca Merge branch 'yuanke' into develop
10 years ago
yuanke 3ae26a6530 组织配置页面 名师列表 热门项目 学霸 精品课程的右上角字样只对超级管理员显示,图片显示时如果已经带了链接则不增加点击弹框效果。
10 years ago
yuanke 82ebd1e4c9 Merge branch 'yuanke' into develop
10 years ago
yuanke 2781605670 课程资源描述增加可编辑
10 years ago
Tim 24458ecb48 table可拖拽,在线测验表格布局优化
10 years ago
huang 5e3df51ad9 完成新版登录注册
10 years ago
huang 06f97d5cb7 注册页面(未完)
10 years ago
cxt 43192b8648 分组作业的弹框增加人数的验证、点击关闭弹框时还原弹框中的值
10 years ago
guange ada15b4212 格式上的调整, 现在可以分开写,但发布时打成一个js提高性能
10 years ago
cxt 254e1f44f6 评分设置提示的修改与提交时的判断
10 years ago
guange b1791f4531 wechat结构分离
10 years ago
guange d3d31ca3a2 Merge remote-tracking branch 'origin/develop' into weixin_guange
10 years ago
guange d3c45fd133 使用jquery1.3比较小
10 years ago
guange 36fedd4d15 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
10 years ago
guange 793b651393 压缩angularjs
10 years ago
txz 5f26e9e3ee 微信回复文字格式不一致,微信回复换行处理
10 years ago
huang 3e3c300273 Merge branch 'cxt_course' into develop
10 years ago
cxt b6eb5a3668 还原作品列表的拖动
10 years ago
yuanke ec39c16c66 Merge branch 'develop' into yuanke
10 years ago
yuanke 5999189f3a 1.视频根据http还是https分类显示。
10 years ago
guange 8b05b33e38 不刷新返回
10 years ago
guange 1251e31061 不刷新返回
10 years ago
guange 37975552c9 base
10 years ago
guange 5b34f498c9 base
10 years ago
guange fbfb382d78 base
10 years ago
guange f993fa87ff base
10 years ago
guange 8fb88dfdea base
10 years ago
guange 5fe41d80e9 base
10 years ago
guange b01a671fb4 base
10 years ago
guange eee8a8adb6 fix
10 years ago
guange 33780759a9 修改为html5mode
10 years ago
cxt de58cfb5e5 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
cxt 196c92f9c4 动态回复最多只加赞三条,点击展开更多时才加载余下的回复
10 years ago
guange f5da2ba5f6 将current page提前
10 years ago
Tim 1d44116841 作品列表可拖拽
10 years ago
Tim 253d9da345 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
yuanke 1173bb9039 Merge branch 'develop' into yuanke
10 years ago
yuanke 4c92e73cf1 根据http和https显示视频
10 years ago
huang 4367cf2233 Merge branch 'yuanke' into develop
10 years ago
huang b128ba5257 Merge branch 'hjq_beidou' into develop
10 years ago
huang a71c4a50bb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang 0eb6dbe48a Merge branch 'huang_temp2' into develop
10 years ago
cxt 184c17d52f “显示明码”弹出undefined
10 years ago
yuanke c3c639aa77 超链接颜色修改
10 years ago
huang ba344a86b5 颜色
10 years ago
cxt 2431ef6986 模板消息引起的问题
10 years ago
yuanke 0d38fa53a2 1.issue编辑器定下最高高度到了改为滚动条
10 years ago
Tim ed46ca0735 可拖拽作业列表
10 years ago
cxt b20dc06e23 微信测试版配置修改
10 years ago
cxt 747128750c Merge branch 'weixin_guange' into cxt_course
10 years ago
huang e5eeba90f6 组织精品课程,热门项目
10 years ago
huang 27a9170318 组织添加设为精品项目,热门课程
10 years ago
Tim 308f247c71 可拖拽调整
10 years ago
Tim 3b55e9e39b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
Tim 513fe1a93d 作品列表可拖拽
10 years ago
guange 51d3fc3aad 更多修复
10 years ago
guange ceffa6c2c8 更多修复
10 years ago
guange 03357388bd 更多修复
10 years ago
guange 553a02c89d 更多修复
10 years ago
guange c26d544772 更多修复
10 years ago
guange c9eddad45d 更多修复
10 years ago
guange 32ffd2a5b5 返回优化完成
10 years ago
guange 48b36e5d16 优化返回刷新
10 years ago
guange 814fde878e 从后台获取openid即可
10 years ago
guange 13d11e2239 用户动态如果没有绑定则跳到绑定页面.
10 years ago
guange 4815dc3c7b 用户动态如果没有绑定则跳到绑定页面.
10 years ago
cxt 8540b48091 未绑定微信账号时点击“最新动态”出现提示信息
10 years ago
cxt d4c0e9754a 课程描述展开后应显示“收起描述信息”
10 years ago
yuanke 5b7011e07b Merge branch 'develop' into yuanke
10 years ago
yuanke 9d9e2ff613 自动识别URL正则匹配修改
10 years ago
Tim 5f27519c67 table可拖拽
10 years ago
yuanke cfc3751f6f Merge branch 'yuanke' into develop
10 years ago
huang 213b0f75b0 Merge branch 'hjq_resource' into develop
10 years ago
huang ab4aa0f06f 公共资源多个资源发送功能
10 years ago
yuanke 54e62c778a 保证python编程的中文注释可用
10 years ago
txz 1c95e76209 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
10 years ago
huang 0a7d1f1efc 公共资源库添加资源多个发送功能,修复项目、课程多个发送的bug
10 years ago
cxt d9bd13c2fc 复制课程报500
10 years ago
txz 921b01e8e3 输入框支持文字内容滑动
10 years ago
yuanke fcaa9666e2 KE内容自动识别网址加上超链接时把颜色也加上
10 years ago
cxt b1a58ecfb8 Merge branch 'weixin_guange' into develop
10 years ago
txz 29ceb7b8e9 微信图标清晰问题,回复点赞右对齐
10 years ago
txz 2a0b35a1b3 微信回复框高度随文字增减
10 years ago
yuanke 5eff3db9e8 1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点
10 years ago
txz 103af96ac2 替换加载中gif图
10 years ago
yuanke 6d7eca487f 将KE的newlineTag:'br' 改为'p',方便识别网址
10 years ago
yuanke ded5f8f861 页面中显示KE内容的地方都加上自动识别网址的函数
10 years ago
yuanke 5b0ef6ada0 Merge branch 'develop' into yuanke
10 years ago
yuanke 6e749f49e4 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
10 years ago
yuanke 7da1418069 自动识别URL
10 years ago
huang 4857769c49 Merge branch 'yuanke' into develop
10 years ago
huang fe54a19940 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
10 years ago
huang faf5e89cc2 Merge branch 'weixin_guange' into develop
10 years ago
huang 3985c190bf Merge branch 'cxt_course' into develop
10 years ago
txz 66042cb3c9 debug false
10 years ago
txz e2f3ba8e7d 微信问题修改
10 years ago
cxt 28edaf2246 课程/项目留言:快速点击提交按钮重复产生多条记录的问题
10 years ago
yuanke 0ac7163b05 KE修改居中换行居中消失的问题
10 years ago
yuanke 93fb4441d8 代码测试改用新的提示框
10 years ago
yuanke c0de43ecc0 修改KE字体间距问题,代码测试出错提示。
10 years ago
yuanke 025d07e6a4 代码测试编译信息长度限制不小心注释了
10 years ago
yuanke 708cb35fd2 增加一个弹框的通用接口pop_up_box
10 years ago
yuanke 24b969e781 Merge branch 'yuanke' into develop
10 years ago
huang 0cc9a9e4c5 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
10 years ago
cxt c2efb7bdda Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang 55c9faaf7b Merge branch 'yuanke' into develop
10 years ago
cxt 5204e01ee8 课程留言回复的还原
10 years ago
yuanke 2c7a964470 复制粘贴图片相关
10 years ago
yuanke be97675aed 没带图片类型的图片不让点击放大看!
10 years ago
huang 41214bd762 Merge branch 'cxt_course' into develop
10 years ago