jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
15,245 Commits 98 Branches 0 Tags 0 B
Commit Graph

3294 Commits

Author SHA1 Message Date
guange 4db1df0a4d css 2016-06-20 16:29:52 +08:00
guange 311f21ee5a css 2016-06-20 16:23:59 +08:00
guange b4a3d4a5a2 弹出框处理 2016-06-20 16:04:38 +08:00
cxt f4d67bc027 未读消息弹窗“点击展开”显示10条未读消息 2016-06-20 16:03:57 +08:00
guange 47c443e59d 输入框变大一点 2016-06-20 15:56:57 +08:00
Tim 3548c23aad Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-20 15:43:15 +08:00
cxt 048bb7fed5 头像下拉菜单、未读消息的延时 2016-06-20 15:38:43 +08:00
guange b7230333dc code获取修改 2016-06-20 15:21:13 +08:00
guange 3f98562c0f 打包 2016-06-20 14:45:19 +08:00
guange 61c117b8cb 重构老的代码，本地通过session来存放token, 所有的访问直接用老接口 2016-06-20 14:39:20 +08:00
txz b17b92cc3e 微信回复后先加载后启用回复按钮 2016-06-20 11:08:57 +08:00
yuanke 0719313f01 Merge branch 'yuanke' into develop 2016-06-20 09:41:26 +08:00
yuanke 7c729107cc KE复制粘贴的时候保留图片的外链 2016-06-20 09:40:21 +08:00
guange 9d19caa736 . 2016-06-17 18:48:27 +08:00
guange 46018ad388 . 2016-06-17 18:41:16 +08:00
guange 3582849ef3 . 2016-06-17 18:40:03 +08:00
guange a0c0a65d18 绑定用户迁移到接口 2016-06-17 18:37:26 +08:00
guange 98c6548e39 重写登录和注册 2016-06-17 18:18:03 +08:00
yuanke f3014c3993 Merge branch 'yuanke' into develop 2016-06-17 17:25:53 +08:00
huang 2464586ed2 组织样式问题 2016-06-17 17:20:17 +08:00
yuanke 948ec58248 作业二级回复未登录显示样式问题 2016-06-17 17:18:36 +08:00
Tim 4b62a39b15 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-17 16:49:57 +08:00
txz 18df93ba9f 微信动态列表界面问题 2016-06-17 16:16:24 +08:00
txz acf17d6252 微信详情页面链接添加颜色 2016-06-17 15:45:29 +08:00
txz 994ce342d7 微信ul布局优化 2016-06-17 15:35:58 +08:00
yuanke d6d9a366f2 Merge branch 'develop' into yuanke 
Conflicts:
	public/stylesheets/new_user.css
 2016-06-17 14:36:12 +08:00
huang 0f17ac0e9e Merge branch 'lingbing' into develop 
Conflicts:
	app/views/organizations/_org_custom_header.html.erb
 2016-06-17 14:33:31 +08:00
yuanke c51c73f225 所有回复添加未登录提示 2016-06-17 14:31:14 +08:00
yuanke 747b2007cd 项目中未登录提示按钮样式问题 2016-06-17 13:44:11 +08:00
huang 88b838a89a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-06-17 11:33:48 +08:00
huang 35ee17c4ca Merge branch 'yuanke' into develop 2016-06-17 11:32:50 +08:00
yuanke 3ae26a6530 组织配置页面 名师列表 热门项目 学霸 精品课程的右上角字样只对超级管理员显示,图片显示时如果已经带了链接则不增加点击弹框效果。 2016-06-17 11:23:49 +08:00
huang 227f2343a4 登录注册背景图片替换 2016-06-16 17:14:13 +08:00
huang 260bef0ebb 登录祖册鼠标经过颜色 2016-06-16 17:01:51 +08:00
huang 006965df50 导航背景颜色还原 2016-06-16 16:46:44 +08:00
huang 3f697355d2 chorm浏览器兼容问题 2016-06-16 16:01:56 +08:00
huang 312fa61489 输入框线条 2016-06-16 15:57:30 +08:00
huang 6707868915 登录页面新样式 2016-06-16 15:52:54 +08:00
huang d2d15710b5 解决chrome浏览器背景黄色问题 2016-06-16 15:25:43 +08:00
huang a63dffd9d3 资源库导航颜色一致 2016-06-16 14:54:27 +08:00
huang d157155cba Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-16 14:43:35 +08:00
huang d4760bcd6d 一个像素问题 2016-06-16 14:43:19 +08:00
yuanke 82ebd1e4c9 Merge branch 'yuanke' into develop 2016-06-16 14:04:53 +08:00
yuanke 2781605670 课程资源描述增加可编辑 2016-06-16 14:04:12 +08:00
Tim 24458ecb48 table可拖拽，在线测验表格布局优化 2016-06-16 11:31:39 +08:00
huang 24b12513e5 铃铛颜色 2016-06-16 11:16:41 +08:00
huang 474c183050 导航颜色一致 2016-06-16 10:35:53 +08:00
huang 5e3df51ad9 完成新版登录注册 2016-06-16 10:21:21 +08:00
Tim 9cd1630651 优化css添加，将课程，项目，个人主页，组织首页样式替换，登录与个人主页详细css替换 2016-06-16 08:52:13 +08:00
huang 06f97d5cb7 注册页面（未完） 2016-06-15 17:24:46 +08:00
cxt 43192b8648 分组作业的弹框增加人数的验证、点击关闭弹框时还原弹框中的值 2016-06-15 17:04:53 +08:00
huang a2c5cc6da1 登录界面base及新页面 2016-06-15 15:41:13 +08:00
Tim e1d4e35ea6 pull 2016-06-15 14:17:31 +08:00
guange ada15b4212 格式上的调整, 现在可以分开写,但发布时打成一个js提高性能 2016-06-14 16:03:10 +08:00
cxt 254e1f44f6 评分设置提示的修改与提交时的判断 2016-06-14 15:44:03 +08:00
Linda 01bd394a59 门户首页按照祎欣0613版本设计修改 2016-06-14 15:08:13 +08:00
guange b1791f4531 wechat结构分离 2016-06-14 14:24:39 +08:00
txz 270399c5da 点赞时图标移动修复 2016-06-14 14:04:39 +08:00
txz a2450defc6 微信作业详情类别文字处理 2016-06-13 17:32:51 +08:00
txz 962470c582 微信文字显示不全bug 2016-06-13 17:23:35 +08:00
txz 8bbdf3688c 微信加入班级css新增 2016-06-13 15:25:26 +08:00
guange d3d31ca3a2 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-12 17:18:34 +08:00
txz 0e63a3a24c 指派文字显示不全 2016-06-12 15:37:52 +08:00
huang dcb3d8659b Merge branch 'cxt_course' into develop 2016-06-12 15:02:33 +08:00
txz 719774f159 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-12 14:52:29 +08:00
txz b57f6fbc65 微信回复框增加padding 2016-06-12 14:52:24 +08:00
cxt 00528bec60 学生列表没有分班就不显示分班列 2016-06-12 14:50:47 +08:00
guange d3c45fd133 使用jquery1.3比较小 2016-06-12 13:40:14 +08:00
guange 36fedd4d15 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-12 10:21:07 +08:00
guange 793b651393 压缩angularjs 2016-06-09 19:48:58 +08:00
txz 070b48d85f 增加作业类别 2016-06-08 15:48:24 +08:00
txz 981b199a0f 微信图标与数字间距调整，作业增加作业类型 2016-06-08 15:34:14 +08:00
txz 5f26e9e3ee 微信回复文字格式不一致，微信回复换行处理 2016-06-08 15:02:06 +08:00
huang 3e3c300273 Merge branch 'cxt_course' into develop 2016-06-08 11:37:58 +08:00
cxt b6eb5a3668 还原作品列表的拖动 2016-06-08 11:28:20 +08:00
yuanke e4312674c4 KE表格修改 2016-06-08 11:11:32 +08:00
yuanke 4cb4213a52 修改blockquote样式 2016-06-08 10:44:58 +08:00
yuanke ec39c16c66 Merge branch 'develop' into yuanke 2016-06-08 09:41:18 +08:00
txz 24a17d719e Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-08 09:15:41 +08:00
txz 9b4a3a704d 锁定帖子不能回复 2016-06-08 09:15:35 +08:00
yuanke 5999189f3a 1.视频根据http还是https分类显示。 
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
 2016-06-08 09:02:00 +08:00
guange b965698fdf merge 2016-06-07 17:45:19 +08:00
guange 8b05b33e38 不刷新返回 2016-06-07 17:38:38 +08:00
huang fdb1846f75 Merge branch 'hjq_beidou' into develop 2016-06-07 17:37:38 +08:00
guange 1251e31061 不刷新返回 2016-06-07 17:36:11 +08:00
guange 37975552c9 base 2016-06-07 17:27:17 +08:00
guange 5b34f498c9 base 2016-06-07 17:23:56 +08:00
guange fbfb382d78 base 2016-06-07 17:22:57 +08:00
guange f993fa87ff base 2016-06-07 17:18:28 +08:00
guange 8fb88dfdea base 2016-06-07 17:17:14 +08:00
guange 5fe41d80e9 base 2016-06-07 17:06:13 +08:00
guange b01a671fb4 base 2016-06-07 16:59:26 +08:00
huang 09ff5954bd 字体过长演示问题（模式二子页面） 2016-06-07 16:56:20 +08:00
guange 90ac57ed6a base 2016-06-07 16:46:10 +08:00
guange eee8a8adb6 fix 2016-06-07 16:43:37 +08:00
guange 33780759a9 修改为html5mode 2016-06-07 16:39:42 +08:00
cxt de58cfb5e5 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-07 16:02:08 +08:00
cxt 196c92f9c4 动态回复最多只加赞三条，点击展开更多时才加载余下的回复 2016-06-07 16:02:00 +08:00
guange f5da2ba5f6 将current page提前 2016-06-07 15:40:16 +08:00
Tim 1d44116841 作品列表可拖拽 2016-06-07 15:30:17 +08:00
huang 1553eadc58 宽度改成1000二级目录模式二样式调整 2016-06-07 10:17:16 +08:00
Tim 253d9da345 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-07 09:01:53 +08:00
huang 21197c95b3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-06 15:11:59 +08:00
huang df8df117a8 解决匿名用户登录问题（控制器和view） 2016-06-06 15:02:11 +08:00
Tim a44cb47a26 组织未登录回复框提示 2016-06-06 14:41:18 +08:00
cxt 91f7e950ee 正式版微信 2016-06-06 12:22:52 +08:00
yuanke 1173bb9039 Merge branch 'develop' into yuanke 2016-06-06 10:41:13 +08:00
yuanke 4c92e73cf1 根据http和https显示视频 2016-06-06 09:34:45 +08:00
cxt ffe447e5bc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 16:28:23 +08:00
cxt d27a050ffa 消息弹窗的显示 2016-06-03 16:28:11 +08:00
huang 4367cf2233 Merge branch 'yuanke' into develop 2016-06-03 15:01:37 +08:00
huang b128ba5257 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-06-03 14:58:37 +08:00
huang 2d2e9c540a 默认图片及顺序 2016-06-03 14:14:50 +08:00
Tim 3c6c617d09 门户样式冲突问题 2016-06-03 10:08:54 +08:00
cxt b833c1f0a4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 09:13:19 +08:00
cxt 1396cae14c 消息弹框 2016-06-03 08:59:17 +08:00
huang a71c4a50bb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 08:59:09 +08:00
Tim 709ceca1a8 托代码改动 2016-06-03 08:41:14 +08:00
huang 0eb6dbe48a Merge branch 'huang_temp2' into develop 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-06-03 08:30:31 +08:00
cxt 184c17d52f “显示明码”弹出undefined 2016-06-02 15:34:43 +08:00
yuanke c3c639aa77 超链接颜色修改 2016-06-02 15:27:16 +08:00
huang ba344a86b5 颜色 2016-06-02 14:59:32 +08:00
cxt 2431ef6986 模板消息引起的问题 2016-06-02 13:56:11 +08:00
yuanke 0d38fa53a2 1.issue编辑器定下最高高度到了改为滚动条 
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别？ 和cn等
5.KE缩进修改等
 2016-06-02 13:55:40 +08:00
Tim ed46ca0735 可拖拽作业列表 2016-06-02 13:45:06 +08:00
huang 76732a3034 新模式有一 2016-06-02 13:17:38 +08:00
cxt b20dc06e23 微信测试版配置修改 2016-06-02 10:56:04 +08:00
cxt 747128750c Merge branch 'weixin_guange' into cxt_course 2016-06-02 10:42:04 +08:00
huang e5eeba90f6 组织精品课程，热门项目 2016-06-02 09:52:06 +08:00
huang 27a9170318 组织添加设为精品项目，热门课程 2016-06-01 17:38:41 +08:00
Tim 308f247c71 可拖拽调整 2016-06-01 16:09:01 +08:00
cxt cba5b246bc 微信动态的返回不刷新 2016-06-01 14:14:24 +08:00
Tim 3b55e9e39b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/student_work/_evaluation_un_title.html.erb
	app/views/student_work/_evaluation_un_work.html.erb
 2016-06-01 13:59:01 +08:00
Tim 513fe1a93d 作品列表可拖拽 2016-06-01 13:46:05 +08:00
guange 51d3fc3aad 更多修复 2016-05-31 21:31:36 +08:00
guange ceffa6c2c8 更多修复 2016-05-31 21:27:00 +08:00
guange 03357388bd 更多修复 2016-05-31 21:26:31 +08:00
guange 553a02c89d 更多修复 2016-05-31 21:22:44 +08:00
guange c26d544772 更多修复 2016-05-31 21:15:31 +08:00
guange c9eddad45d 更多修复 2016-05-31 21:09:47 +08:00
guange 32ffd2a5b5 返回优化完成 2016-05-31 20:55:46 +08:00
guange 48b36e5d16 优化返回刷新 2016-05-31 20:46:46 +08:00
guange 814fde878e 从后台获取openid即可 2016-05-31 20:19:45 +08:00
guange 13d11e2239 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 20:01:41 +08:00
guange 4815dc3c7b 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:59:34 +08:00
guange 6e44e8355c Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-05-31 19:21:08 +08:00
guange 1bdf8800bd Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-05-31 19:20:45 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
cxt 8540b48091 未绑定微信账号时点击“最新动态”出现提示信息 2016-05-31 17:34:56 +08:00
txz 7e93518d41 app.js配置 2016-05-31 14:56:24 +08:00
txz e121d7d927 二级回复显示边框区分 2016-05-31 14:55:25 +08:00
txz 80452ceef9 app.js文件更改 2016-05-31 14:38:55 +08:00
txz 91be3b9f85 回复提交时按钮变灰 2016-05-31 14:37:45 +08:00
txz f166a951f3 详情页面文字格式问题 2016-05-31 13:49:39 +08:00
cxt 79c106a1c6 微信动态的缺失 2016-05-31 11:04:20 +08:00
txz 19de82359a 微信进入详情页面显示加载中 2016-05-31 10:53:11 +08:00
huang c57c575c84 新版组织静态页面模板 2016-05-30 16:24:51 +08:00
huang 471ed7cbd2 组织logo获取，添加样式图片 2016-05-30 14:58:46 +08:00
cxt d4c0e9754a 课程描述展开后应显示“收起描述信息” 2016-05-30 14:51:54 +08:00
Tim 9cc749bd57 门户样式统一，防止冲突 2016-05-30 14:38:57 +08:00
huang 46e4f2c143 组织新base框架 2016-05-30 14:23:52 +08:00
huang 389172e5b2 CSS样式 2016-05-30 10:45:00 +08:00
yuanke 98244d2a3d 将文章标题的颜色恢复正常 2016-05-27 16:42:05 +08:00
yuanke 5b7011e07b Merge branch 'develop' into yuanke 2016-05-27 15:37:11 +08:00
yuanke d08809bfbd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/project.css
 2016-05-27 15:34:55 +08:00
yuanke 9d9e2ff613 自动识别URL正则匹配修改 2016-05-27 15:31:13 +08:00
huang ff14809237 Merge branch 'cxt_course' into develop 2016-05-27 15:30:35 +08:00
huang 3ba4d09336 Merge branch 'weixin_guange' into develop 2016-05-27 15:29:25 +08:00
cxt 7599bf75a3 分组作业不关联项目时的作品列表样式调整 2016-05-27 15:04:56 +08:00
Tim 5f27519c67 table可拖拽 2016-05-27 14:44:32 +08:00
cxt 400a470a2b 作品列表的样式调整 2016-05-27 14:42:12 +08:00
cxt 3b33732e6f 学生列表的姓名、学号、分班和加入时间做成不可点击的 2016-05-27 14:15:26 +08:00
txz 29faa015ab 微信图标替换，增加空值回复赞文字 2016-05-27 14:01:16 +08:00
yuanke cfc3751f6f Merge branch 'yuanke' into develop 2016-05-27 14:01:02 +08:00
huang 25aaa4b5bc 铃铛、搜索颜色 2016-05-27 11:07:27 +08:00
huang 213b0f75b0 Merge branch 'hjq_resource' into develop 2016-05-27 09:33:44 +08:00
huang ab4aa0f06f 公共资源多个资源发送功能 2016-05-27 09:32:24 +08:00
cxt 99c1821b4e Merge branch 'weixin_guange' into develop 2016-05-27 08:56:26 +08:00
txz 9134e55606 动态纯文本模式，图标处理 2016-05-26 17:40:22 +08:00
txz e7039df875 微信点击跳转区域更改，内容字体大小颜色更改 2016-05-26 17:21:02 +08:00
yuanke 54e62c778a 保证python编程的中文注释可用 2016-05-26 15:49:50 +08:00
cxt ff974d6901 Merge branch 'weixin_guange' into develop 
Conflicts:
	app/views/wechats/login.html.erb
 2016-05-26 15:32:00 +08:00
cxt 4d5ee5a722 微信的欢迎图片及欢迎词的修改,测试版的配置 2016-05-26 15:27:31 +08:00
yuanke 9603115a86 KE编辑时链接的颜色改为和显示的时候一样并将下划线去掉 2016-05-26 14:02:17 +08:00
txz 7bb94d9df4 详情页面将内容和框架同时显示 2016-05-26 13:47:23 +08:00
txz 1c95e76209 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-05-26 10:55:18 +08:00
txz c73ce61afe 微信动态可点击，icon图片替换 2016-05-26 10:55:00 +08:00
guange 01428fad14 merge 2016-05-26 10:51:01 +08:00
huang 0a7d1f1efc 公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug 2016-05-25 17:54:53 +08:00
yuanke 192258a82d 1.取消KE编辑时候段落的上下边距 
2.先编号后段落 可以切换段落样式  正文还不能切换
 2016-05-25 17:04:46 +08:00
cxt 8257770ec9 课程和项目留言的点赞 2016-05-25 16:20:01 +08:00
cxt 5c9ec49457 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-25 15:27:00 +08:00
cxt d9bd13c2fc 复制课程报500 2016-05-25 14:57:46 +08:00
txz 921b01e8e3 输入框支持文字内容滑动 2016-05-25 14:26:49 +08:00
txz c4c0dd3c60 回复内容换行符未显示 2016-05-25 13:50:59 +08:00
yuanke fcaa9666e2 KE内容自动识别网址加上超链接时把颜色也加上 2016-05-25 10:37:35 +08:00
yuanke 46860a838b 1.设置表格边框后所有的表格线宽度都一样 
2.KE改变字体后再点击字体会标明当前的字体
 2016-05-25 10:34:09 +08:00
cxt b1a58ecfb8 Merge branch 'weixin_guange' into develop 
Conflicts:
	1234567
 2016-05-24 20:51:24 +08:00
yuanke 9e8411aac9 修改ke：issue描述只有一行，点击编辑后，描述框被拉高了，有很多空白 2016-05-24 16:22:46 +08:00
Tim 1c0a68e57b 组织配置成员tab，搜索结果太多导致换页断行问题 2016-05-24 15:47:22 +08:00
txz 29ceb7b8e9 微信图标清晰问题，回复点赞右对齐 2016-05-24 15:01:26 +08:00
txz 2a0b35a1b3 微信回复框高度随文字增减 2016-05-24 09:38:49 +08:00
yuanke e7d20c2b98 1.项目用户反馈、课程留言区增加自动识别URL功能 
2.所有自动识别URL区域的链接颜色都改为#15bccf
 2016-05-24 09:11:50 +08:00
yuanke 5eff3db9e8 1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点 
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
 2016-05-23 15:58:32 +08:00
txz 103af96ac2 替换加载中gif图 2016-05-23 10:26:17 +08:00
cxt c3ec7289b7 Merge branch 'develop' into cxt_course 2016-05-23 09:51:59 +08:00
huang c749fe381b Merge branch 'weixin_guange' into develop 2016-05-20 21:02:01 +08:00
huang cdde844e44 Merge branch 'cxt_course' into develop 2016-05-20 21:01:30 +08:00
huang f94806bcdf Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 21:01:18 +08:00
Tim dd4786d639 作品列表查看详情定位 2016-05-20 20:44:13 +08:00
txz d329b60a8a 微信加载中去白底，内容去除固定行高 2016-05-20 20:26:04 +08:00
Tim 5f4a9304fe 提交成绩后，列表成绩没刷新修改；分组作业列表宽度调整 2016-05-20 20:05:39 +08:00
huang e10bc46361 Merge branch 'yuanke' into develop 2016-05-20 18:59:54 +08:00
huang 8ebe8b0d0c 删除提示顺序 
消息样式
 2016-05-20 18:55:17 +08:00
yuanke c9c3aa5f31 Merge branch 'develop' into yuanke 2016-05-20 18:43:20 +08:00
yuanke 6d7eca487f 将KE的newlineTag：'br' 改为'p',方便识别网址 2016-05-20 17:02:43 +08:00
huang fc8cbc2b38 Merge branch 'hjq_beidou' into develop 2016-05-20 16:18:47 +08:00
huang ef1a5d32f2 顶端背景色 2016-05-20 16:18:23 +08:00
huang d108f0a684 Merge branch 'yuanke' into develop 2016-05-20 15:37:44 +08:00
huang 13ac7ef273 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 15:37:02 +08:00
huang 5cefedd20a Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
 2016-05-20 15:35:08 +08:00
yuanke ded5f8f861 页面中显示KE内容的地方都加上自动识别网址的函数 2016-05-20 15:30:25 +08:00
Tim 13f83719c1 作品列表改为table布局 2016-05-20 15:15:42 +08:00
yuanke ed58e78065 KE表格颜色问题 2016-05-19 16:38:48 +08:00
yuanke 5b0ef6ada0 Merge branch 'develop' into yuanke 2016-05-19 16:30:02 +08:00
yuanke 6e749f49e4 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke 2016-05-19 16:29:33 +08:00
yuanke 7da1418069 自动识别URL 2016-05-19 16:24:57 +08:00
huang 4857769c49 Merge branch 'yuanke' into develop 2016-05-19 16:11:06 +08:00
huang fe54a19940 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke 
Conflicts:
	app/views/blogs/_article.html.erb
	app/views/users/_project_boardlist.html.erb
	public/stylesheets/new_user.css
 2016-05-19 16:10:18 +08:00
huang faf5e89cc2 Merge branch 'weixin_guange' into develop 
Conflicts:
	1234567
	app/views/blogs/_article.html.erb
	db/schema.rb
 2016-05-19 16:04:27 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
cxt 3ebef0eae2 消息通知中申请引用作业的用户点击申请的消息打开没有权限访问的页面 2016-05-19 15:57:20 +08:00
txz 66042cb3c9 debug false 2016-05-19 15:21:25 +08:00
txz e2f3ba8e7d 微信问题修改 2016-05-19 15:20:46 +08:00
txz 278ee66368 系统冲突 2016-05-19 13:47:08 +08:00
txz 1b3bc38f8e 拖代码改动 2016-05-19 13:44:03 +08:00
Tim 0e95295570 pull code 2016-05-19 09:24:12 +08:00
yuanke 52724bd9ed KE ol ul标签增加margin-bottom:0 2016-05-18 15:11:53 +08:00
huang 658ea0cf1e 资源引用 结构搭建 数据创建 2016-05-18 14:49:13 +08:00
yuanke 0e016eed2a KE上传非图片格式时弹框用新的,博客帖子发帖时间改为发布 2016-05-18 14:15:39 +08:00
cxt 28edaf2246 课程/项目留言：快速点击提交按钮重复产生多条记录的问题 2016-05-18 10:57:56 +08:00
cxt 357e143c9a Merge branch 'develop' into cxt_course 
Conflicts:
	db/schema.rb
 2016-05-17 16:30:03 +08:00
yuanke 0ac7163b05 KE修改居中换行居中消失的问题 2016-05-17 15:55:24 +08:00
cxt 9b6c629d10 学生列表增加活跃度的统计 2016-05-17 14:18:14 +08:00
yuanke 93fb4441d8 代码测试改用新的提示框 2016-05-17 14:12:42 +08:00
Tim 0b2fe1d88a 分组作业样式 2016-05-17 11:24:29 +08:00
huang 61ba7b0c30 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-17 11:22:03 +08:00
yuanke c0de43ecc0 修改KE字体间距问题，代码测试出错提示。 2016-05-17 10:31:10 +08:00
Tim 76d1251546 将组织门户登录栏挪到与logo同行 2016-05-17 09:36:55 +08:00
guange 80be46dc92 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-16 17:44:32 +08:00
guange 4b4a48b0c4 sso rsa解码这块处理,因为php只能处理117个字节,所以要拆分开 2016-05-16 17:44:08 +08:00
yuanke 025d07e6a4 代码测试编译信息长度限制不小心注释了 2016-05-16 17:02:18 +08:00
yuanke 708cb35fd2 增加一个弹框的通用接口pop_up_box 2016-05-16 16:57:18 +08:00
Tim fbbda96c60 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-16 15:00:21 +08:00
Tim fa788ced1b 资源库添加私有资源 2016-05-16 15:00:08 +08:00
yuanke 24b969e781 Merge branch 'yuanke' into develop 2016-05-15 00:02:49 +08:00
huang 0cc9a9e4c5 Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke 2016-05-13 20:02:32 +08:00
yuanke 6056505f96 复制粘贴时将图片所带链接删掉 2016-05-13 19:07:36 +08:00
cxt c2efb7bdda Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-13 18:28:07 +08:00
huang 55c9faaf7b Merge branch 'yuanke' into develop 2016-05-13 18:26:01 +08:00
cxt 5204e01ee8 课程留言回复的还原 2016-05-13 18:12:06 +08:00
yuanke 2c7a964470 复制粘贴图片相关 2016-05-13 16:59:59 +08:00
huang 0d2a7d8bfd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-13 16:57:39 +08:00
huang e8afcf9157 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/helpers/organizations_helper.rb
	app/views/organizations/_org_subfield_rightM2.html.erb
 2016-05-13 16:56:02 +08:00
Tim d384d1e2b4 名师榜样式调整 2016-05-13 16:28:16 +08:00
yuanke be97675aed 没带图片类型的图片不让点击放大看! 2016-05-13 16:09:26 +08:00
txz 8d338cff9e 微信锁定帖子关闭回复 2016-05-13 15:48:31 +08:00
huang 41214bd762 Merge branch 'cxt_course' into develop 2016-05-13 15:25:53 +08:00
huang 1cd74121ae Merge branch 'yuanke' into develop 2016-05-13 15:25:04 +08:00
yuanke a67ee38ac9 将复制粘贴的图片 链接及class都去掉 2016-05-13 15:18:48 +08:00
huang 33a3b22430 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/org2.css
 2016-05-13 15:12:26 +08:00
yuanke fc0f92738d 复制粘贴时将图片所带链接去掉 2016-05-13 14:58:35 +08:00
cxt 402976cf40 课程留言的回复防止多次提交 2016-05-13 14:33:06 +08:00
yuanke 80c6edd2d3 KE过滤html代码的时候表格的颜色等样式不能被过滤掉 2016-05-13 14:22:10 +08:00
Tim dc92e821a3 名师榜样式调整 2016-05-13 14:08:34 +08:00
huang 7759670fa1 Merge branch 'yuanke' into develop 
Conflicts:
	Gemfile
	public/stylesheets/new_user.css
 2016-05-13 11:39:01 +08:00
yuanke a1323e3d76 表格问题 2016-05-13 11:32:52 +08:00
Tim 61470c9bd4 名师榜css样式添加 2016-05-13 11:29:45 +08:00
cxt 17497cd74e Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-13 10:57:54 +08:00
cxt f1821e54e1 通知和新闻详情页面的回复点击多次不会提交表单多次 2016-05-13 10:56:48 +08:00
Tim 51a6727b07 名师榜样式 2016-05-13 10:41:13 +08:00
Linda a2418396dd 邦本库zip下载样式界面 2016-05-13 10:30:38 +08:00
cxt cc92105da9 作品列表添加序号及样式调整 2016-05-13 09:58:24 +08:00
yuanke c31d4dc3bd 我要回复字不消失 2016-05-13 09:19:47 +08:00
yuanke a39702f962 图片自动上传，代码测试编译错误过长。 2016-05-13 08:38:28 +08:00
Tim 2ac201ffdd Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-12 17:41:42 +08:00
Tim 565d5e3bcc 作业测验列表html代码重构，添加序号列 2016-05-12 17:41:27 +08:00
huang ad2f12c9d0 名师列表搜索功能 2016-05-12 15:02:23 +08:00
cxt ac5a9c87ac 消息通知中的“同意|拒绝”调整宽度 2016-05-12 14:59:12 +08:00
cxt 7481d96166 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/admin_controller.rb
	config/routes.rb
	lib/redmine.rb
 2016-05-12 10:40:35 +08:00
huang 3dde8bd25a Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-11 16:21:17 +08:00
huang 52c8593b09 组织教师列表sql优化 2016-05-11 16:20:55 +08:00
Tim 7957beb64a 发送至按钮样式控制 2016-05-11 15:51:59 +08:00
cxt d232a5241e 新建课程报404 2016-05-11 11:47:16 +08:00
yuanke 135e02504e 图片自动上传 2016-05-11 11:40:01 +08:00
txz a1afd0dc96 微信回复多次点击，仅第一次生效 2016-05-11 09:38:02 +08:00
cxt 5baf467d13 作品评分不覆盖 2016-05-10 15:26:08 +08:00
yuanke e502aa7c43 KE表格项目问题，自动上传图片做了一点 2016-05-10 12:51:42 +08:00
cxt 11017d72c5 老师对作品的评分可为空 2016-05-10 11:28:24 +08:00
Tim c8e0ffbdae 左二和右二文字隐藏时的更多显示 2016-05-10 10:30:28 +08:00