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

3757 Commits

Author SHA1 Message Date
txz 2596231ce7 微信新动态样式更新 2016-06-29 15:44:32 +08:00
huang 2105d2bbdb Merge branch 'develop' into rep_quality 
Conflicts:
	app/views/repositories/show.html.erb
	db/migrate/20160624103411_add_name_to_quality_analyses.rb
	db/schema.rb
 2016-06-29 14:18:17 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
yuanke 376ec39035 Merge branch 'develop' into yuanke_org 2016-06-29 08:48:07 +08:00
Your Name a08edcca8a quanxian 2016-06-28 17:18:50 +08:00
cxt 383483de26 课程大纲的左侧栏base，新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
txz b2b6536a0f 微信css样式更新 2016-06-28 14:48:33 +08:00
guange e9f280b4aa . 2016-06-28 11:07:15 +08:00
guange 047903ddff 重构课程地址 2016-06-28 10:57:58 +08:00
guange 1e6454efc0 加入我的资源 2016-06-27 17:24:06 +08:00
guange 5477c794ba Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 16:03:55 +08:00
guange 3b383dfa65 老师课程界面 2016-06-27 16:03:07 +08:00
yuanke 11d38fc3e3 Merge branch 'yuanke' into develop 2016-06-27 15:58:26 +08:00
yuanke a83400f233 粘贴图片 留言和回复框 保持一直截图都可以粘贴进去 2016-06-27 15:57:45 +08:00
yuanke ab99645148 Merge branch 'yuanke' into develop 2016-06-27 15:52:01 +08:00
yuanke dd397a060b 修改删除组织成员跨域的BUG 2016-06-27 15:48:33 +08:00
guange 05f09c4595 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 11:09:31 +08:00
guange c501af70ba . 2016-06-27 11:09:25 +08:00
huang 46cde061a6 Merge branch 'rep_quality' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
	public/stylesheets/public.css
 2016-06-24 19:17:26 +08:00
cxt 4f342142e6 组织文章的展开更多 2016-06-24 17:58:50 +08:00
Tim bb4d93f911 图片路径有效化 2016-06-24 17:32:30 +08:00
cxt 0611ddcc43 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_reply_to.html.erb
 2016-06-24 16:54:19 +08:00
guange 2c2e1892e5 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-24 16:53:58 +08:00
cxt 76e7c50bf4 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_reply_to.html.erb
 2016-06-24 16:52:00 +08:00
guange c39a982093 二维码 2016-06-24 16:51:40 +08:00
cxt eab000306c 动态回复的展开更多、收起，组织文章回复不可用 2016-06-24 16:38:36 +08:00
cxt d558a4d357 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-24 16:12:31 +08:00
Tim a542ba46a4 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-24 15:55:07 +08:00
Tim ec33569033 取消拖拽 2016-06-24 15:54:56 +08:00
Tim a3738c4cb2 新建组织，题库和资源库弹框样式检查 2016-06-24 15:42:42 +08:00
cxt 260759e4db Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-24 15:36:03 +08:00
guange da09983f9e Merge branch 'weixin_guange' into cxt_course 2016-06-24 15:34:32 +08:00
cxt ac629440b1 课程邀请码 2016-06-24 15:33:45 +08:00
yuanke c6be37020f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_reply_to.html.erb
 2016-06-24 15:11:52 +08:00
guange 485d0e3743 ticket处理 2016-06-24 14:59:50 +08:00
yuanke c61c14fa97 Merge branch 'yuanke' into develop 2016-06-24 14:35:59 +08:00
yuanke 86a5eccae6 组织设置中添加成员BUG解决 2016-06-24 14:16:39 +08:00
Tim a28d775cb2 资源库，题库样式检查 2016-06-24 14:01:49 +08:00
guange e21f4e0b4d merge 2016-06-24 13:52:11 +08:00
guange f9075e08ba merge 2016-06-24 13:35:26 +08:00
guange d348981721 加入邀请码 2016-06-24 13:29:36 +08:00
Your Name e17aa4c5d8 color 2016-06-24 11:20:39 +08:00
Your Name 05eb71036d some css to added 2016-06-24 10:47:24 +08:00
guange 52d4d36097 邀请码页面 2016-06-24 09:01:12 +08:00
Tim d14a462f2b 替换css文件源，css样式修改 2016-06-23 17:28:21 +08:00
Tim 563fb3b459 控制table拖拽不靠在一起 2016-06-23 14:58:40 +08:00
cxt 126bf9c195 个人留言、课程留言的二级回复 2016-06-23 14:47:22 +08:00
Your Name 8438bc7bcd somethint to added 2016-06-23 14:31:23 +08:00
huang 9f15a8aa4e 代码质量分析样式 2016-06-22 17:40:13 +08:00
guange 7700445c17 加入课程 2016-06-22 16:42:20 +08:00
yuanke b68e227531 没激活的帐号界面 2016-06-22 14:04:47 +08:00
guange 13273d02de 修正了安全问题，不暴露openid 2016-06-22 12:11:34 +08:00
cxt 1b12c56960 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-21 16:53:36 +08:00
cxt 3f8beaf97c 动态回复banner的代码重构 2016-06-21 16:53:31 +08:00
Tim 1a4865be09 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-21 15:03:51 +08:00
cxt 2176ad1ede Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-21 11:18:37 +08:00
cxt dc70b40309 kindeditor中的a标签属性编辑 2016-06-21 11:04:35 +08:00
guange 5a8de44c43 添加我的班级控制器 2016-06-20 19:42:51 +08:00
guange 4b813ef535 加入班级消息 2016-06-20 17:26:29 +08:00
guange 62a1b5de7c 加入班级更新 2016-06-20 17:04:42 +08:00
yuanke 301556b9c3 Merge branch 'yuanke' into develop 2016-06-20 16:41:23 +08:00
yuanke d3f3f019a0 下拉菜单有时候不显示 2016-06-20 16:40:56 +08:00
yuanke fde06a2327 更新资源描述样式修改 2016-06-20 16:35:16 +08:00
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
Tim 2461a5c918 组织门户二级目录位置重新设置 2016-05-09 19:40:53 +08:00
Tim b32693ca2a Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-09 18:44:43 +08:00
Tim cf1cf58bab 组织门户二级目录添加分栏"|"以及登录未登录位置控制 2016-05-09 18:44:20 +08:00
huang fc36e4c01e 教师列表 2016-05-09 18:10:22 +08:00
huang e8c458c163 Merge branch 'yuanke' into develop 2016-05-06 22:03:36 +08:00
yuanke 350e3f8eb4 表格颜色问题没改好暂时还原之前的 2016-05-06 21:34:08 +08:00
huang 3469d928d8 图片变的很大问题 2016-05-06 20:17:11 +08:00
huang 23a23fd085 组织logo上传图片 2016-05-06 19:53:13 +08:00
huang f4a5aeec07 样式优化 2016-05-06 18:29:26 +08:00
huang 0a989daf31 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	public/stylesheets/courses.css
	public/stylesheets/new_user.css
 2016-05-06 18:12:08 +08:00
huang 6ba4b9dfa2 Merge branch 'yuanke' into develop 2016-05-06 18:07:24 +08:00
yuanke 34ea7662b2 将内容省略显示的固定字数改为传参 2016-05-06 17:59:27 +08:00
cxt 10d26f89d9 作业列表的二级回复 2016-05-06 17:36:28 +08:00
huang b40a112015 配置页面一级域名超过的时候显示样式 2016-05-06 17:25:50 +08:00
huang 9c18b37349 Merge branch 'hjq_beidou' into develop 2016-05-06 17:05:27 +08:00
Tim c3aec4d115 组织一级栏目名称过长时溢出 2016-05-06 16:31:40 +08:00
huang 7f9a327166 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/views/sub_document_comments/show.html.erb
 2016-05-06 16:25:41 +08:00
Tim cd95ed0558 二级回复展开更多效果实现 2016-05-06 16:20:39 +08:00
yuanke d32e07bda9 项目符号有的地方多余，issue详情里面项目符号显示为数字改为圆点. 2016-05-06 14:22:45 +08:00
huang df1c70880a Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_homework_repository.html.erb
	public/stylesheets/new_user.css
 2016-05-06 12:22:43 +08:00
huang 572a051b04 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/users_controller.rb
	app/views/blogs/_article.html.erb
	app/views/layouts/new_base_user.html.erb
 2016-05-06 11:35:27 +08:00
yuanke a863c143f3 收缩箭头修改 2016-05-06 10:22:48 +08:00
huang 9e0176bc55 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/controllers/organizations_controller.rb
	app/helpers/organizations_helper.rb
	db/schema.rb
	public/images/homepage_icon.png
	public/stylesheets/new_user.css
 2016-05-06 10:16:56 +08:00
Tim 4bf1883ba2 组织门户导航栏二级显隐 2016-05-06 10:02:31 +08:00
yuanke 283a83013c KE 修改项目符号、表格颜色问题 2016-05-06 08:48:15 +08:00
Tim d0f97275cc 组织二级栏目显隐效果 2016-05-05 16:20:49 +08:00
cxt 55718f2d44 设置课程大纲时若博客标题太长以省略号结束 2016-05-05 11:34:31 +08:00
Tim c3514f5b6a 二级栏目名长度控制 2016-05-05 09:28:49 +08:00
Tim 787dbaaffc 二维码处文字样式处理 2016-05-05 09:08:01 +08:00
Tim abbbe9b7d6 二级子目录样式处理 2016-05-04 16:53:59 +08:00
cxt 6c184b9248 题库的分享请求 2016-05-04 16:17:37 +08:00
huang 65a907bc99 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
 2016-05-04 15:06:20 +08:00
huang 8a14ce004f 以弹框模式显示二级目录 2016-05-04 15:05:54 +08:00
Linda cbec7cc8f8 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
 2016-05-04 14:41:54 +08:00
Linda 0fc142d822 组织配置logo样式 2016-05-04 14:40:25 +08:00
Tim 714deebe21 二级导航调整 2016-05-04 14:08:57 +08:00
huang 7fbf6f4011 模式二帖子列表添加分页 2016-05-04 11:04:41 +08:00
cxt ff160ff793 题库的申请改为绿色按钮 2016-05-04 10:15:22 +08:00
huang d212d4f4c5 Merge branch 'cxt_course' into develop 2016-05-03 18:17:54 +08:00
cxt d3e3e9d22b 补交作品的样式 2016-05-03 18:15:40 +08:00
cxt bcb02e49d3 课程问答区的名片显示 2016-05-03 17:23:56 +08:00
huang 5e8ff06140 Merge branch 'yuanke' into develop 2016-05-03 17:15:46 +08:00
huang 8446fbe39a Merge branch 'weixin_guange' into develop 
Conflicts:
	app/services/wechat_service.rb
	public/stylesheets/weui/weixin.css
 2016-05-03 17:14:58 +08:00
huang a602a6aa63 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_course_message.html.erb
 2016-05-03 17:12:38 +08:00
cxt ada4407e63 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
txz de8b303b93 微信数据请求时显示加载中 2016-05-03 15:37:35 +08:00
yuanke 5f24fb6496 锁的样式修改 2016-05-03 14:40:33 +08:00
cxt 14a539bd0a 样式冲突 2016-05-03 11:40:24 +08:00
cxt a9cb556a20 题库的切换报500 2016-04-29 19:21:54 +08:00
Tim 56a4a64d09 北斗详情翻页更改；位置超出省略号 2016-04-29 17:09:15 +08:00
Tim 1f87d105d0 添加二级目录弹窗，翻页css 2016-04-29 16:47:06 +08:00
yuanke 1353c27f64 Merge branch 'yuanke' into develop 
Conflicts:
	app/helpers/application_helper.rb
 2016-04-29 15:54:37 +08:00
yuanke 789f3906a5 课程列表，列表描述内容去掉空格 2016-04-29 15:07:46 +08:00
yuanke 1da8288fe7 列表显示修改 2016-04-29 13:42:58 +08:00
Tim ebe6004833 组织二级目录添加列表 2016-04-29 10:53:04 +08:00
Tim 5c795b92ee 图片百分百显示； 默认大图尺寸调整 2016-04-28 11:12:44 +08:00
yuanke dc53b86a4e Merge branch 'cxt_course' into yuanke 
Conflicts:
	app/controllers/student_work_controller.rb
	db/schema.rb
 2016-04-28 10:49:05 +08:00
yuanke 647e6a7f92 Merge branch 'yuanke' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 10:45:57 +08:00
huang ae8bb8e83b Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-28 10:25:42 +08:00
huang b596c0d66f 二级目录的创建等 2016-04-28 10:25:26 +08:00
yuanke c729c1252d 项目、课程列表显示修改 2016-04-28 10:19:59 +08:00
Tim 024667d035 title多行实现省略号效果，默认页面不对齐显示问题，高度控制，标题单行省略显示等 2016-04-28 10:17:59 +08:00
cxt 3aa891acf6 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	app/views/praise_tread/_praise.html.erb
	db/schema.rb
 2016-04-27 16:27:55 +08:00
Tim 5d44dc5bba 滚动栏js效果修改 2016-04-27 15:16:23 +08:00
yuanke 4258790453 Merge branch 'hjq_beidou' into yuanke_1 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
 2016-04-27 14:30:28 +08:00
yuanke dac717bd97 列表左边菜单收缩 2016-04-27 14:12:56 +08:00
cxt 78c7db1150 Merge branch 'weixin_guange' into develop 2016-04-27 10:36:24 +08:00
cxt 0222038899 缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息 2016-04-27 10:28:36 +08:00
Tim c9cc4739aa 北斗组织微信块调整 2016-04-27 09:57:41 +08:00
yuanke 23f48b7189 项目列表、项目讨论区列表 2016-04-27 09:54:49 +08:00
Tim b8d6ca0229 北斗组织门户样式更改 2016-04-27 09:36:54 +08:00
huang 17b2e82963 banner类型 2016-04-26 16:23:08 +08:00
Tim 86751e31fb 题库加入私有课程题目，可申请使用 2016-04-26 15:35:42 +08:00
yuanke 43c1120b19 课程问答区 项目讨论区列表 2016-04-26 15:10:47 +08:00
huang 76f93a54c6 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/helpers/organizations_helper.rb
	app/views/layouts/base_org2.html.erb
	app/views/organizations/_org_content.html.erb
 2016-04-26 11:03:21 +08:00
huang d8f71da1fb 完成模块8配置 2016-04-26 11:01:12 +08:00
Tim 53e6b41d93 北斗登录效果调整 2016-04-26 10:02:16 +08:00
huang 81210fd475 顶部导航及样式 2016-04-25 15:35:32 +08:00
cxt b86669d49c 微信模板消息的详情页面 2016-04-25 14:57:55 +08:00
huang c1437bb75b 北斗界面 2016-04-24 14:39:33 +08:00
txz dcb150559e angularjs路径修改 2016-04-22 16:37:01 +08:00
yuanke 6191c3636d Merge branch 'yuanke' into yuanke_1 
Conflicts:
	public/javascripts/homework.js
 2016-04-22 14:18:30 +08:00
yuanke 016177a078 Merge branch 'yuanke' into develop 2016-04-22 14:14:15 +08:00
yuanke f6a5ffc6a5 测试代码的时候点击一下然后按钮消失等结果返回才出现 2016-04-22 14:13:24 +08:00
yuanke 5c5d212193 博客列表 2016-04-22 13:52:33 +08:00
huang cccc2a7eb7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-21 16:21:49 +08:00
huang ab8c1a0bad Merge branch 'hjq_beidou' into develop 2016-04-21 16:21:39 +08:00
txz 2345eb9d64 路径修改 2016-04-21 11:22:52 +08:00
txz 0bab42256c 微信loading弹框改 2016-04-21 11:21:29 +08:00
txz 39c64c9198 解决冲突 2016-04-21 10:41:54 +08:00
txz 8e254ff722 微信loading弹框 2016-04-21 10:38:36 +08:00
txz 6e6a29cfa6 api路径更改 2016-04-20 17:04:59 +08:00
yuanke 29115bca3a 博客列表修改 2016-04-20 16:12:20 +08:00
txz 0b82bf50c2 微信内容中图片正常显示 2016-04-20 15:45:33 +08:00
txz 282e1b41e1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-20 10:08:16 +08:00
txz 6957c24da5 微信最新动态页面调整 2016-04-20 10:08:03 +08:00
yuanke dc3837da76 Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-20 09:59:37 +08:00
yuanke bc59ce0b60 Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-20 09:55:29 +08:00
yuanke 0f5fe51f97 1.管理员界面代码测试列表的修改 
2.代码查重按钮位置
3.查重结果样式
 2016-04-20 09:51:51 +08:00
txz d0331da0c2 微信最新动态样式调整 2016-04-19 16:26:05 +08:00
huang 4e4cb309a9 版本库目录最新动态 2016-04-19 15:03:47 +08:00
huang adc17c5038 代码优化 
文件目录动态获取接口
文件目录显示样式
 2016-04-19 09:34:55 +08:00
txz 73b89cdde5 微信边框，回复点赞样式更改 2016-04-18 11:19:13 +08:00
cxt 51478bd232 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 17:21:07 +08:00
cxt b07c3947d6 Merge branch 'cxt_course' into develop 2016-04-15 17:20:55 +08:00
cxt 8611fbbdec 新建课程界面中关于学时的输入提示不合理，提示为只能输入数字，但是输入负数或小数时不能执行提交操作，应该修改为只能输入正整数。 2016-04-15 17:10:44 +08:00
yuanke 3dbedcdcbf Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-15 17:08:51 +08:00
yuanke 764dffd95e 动态里面加上代码查重 2016-04-15 17:07:38 +08:00
huang 16bba76f61 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 16:52:15 +08:00
huang 6027b6d0f5 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
 2016-04-15 16:51:37 +08:00
huang 4a8d572cb1 项目动态中版本库统计样式 2016-04-15 15:38:08 +08:00
yuanke f1090d45ad Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-15 14:13:44 +08:00
cxt 36e8b05f9c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 11:32:38 +08:00
cxt bca0a4bf39 Merge branch 'cxt_course' into develop 2016-04-15 11:32:24 +08:00
yuanke e58f1ab94b Merge branch 'yuanke' into develop 2016-04-15 11:29:40 +08:00
yuanke 998106b37b 修改代码查重的一些弹框显示效果等问题 2016-04-15 11:28:20 +08:00
Tim f479277a96 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-04-14 14:38:34 +08:00
cxt d948536a10 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-14 12:33:15 +08:00
cxt e5b07c6c12 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 12:33:11 +08:00
yuanke ef4b256313 Merge branch 'yuanke' into develop 
Conflicts:
	app/models/homework_common.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-14 11:32:35 +08:00
cxt 5e1284605f Merge branch 'hjq_beidou' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 11:29:26 +08:00
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表. 2016-04-14 11:29:22 +08:00
txz 13576ca477 app.js 2016-04-14 09:43:43 +08:00
huang adf6cca435 完成代码行数的提交和统计 2016-04-13 20:39:20 +08:00
cxt 2befcd6634 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-13 16:52:52 +08:00
cxt f5122d7ef0 微信url切换到正式版 2016-04-13 14:52:18 +08:00
Tim deda05b048 作业下拉选择 2016-04-13 14:23:24 +08:00
cxt fcd1684658 作业列表按更新时间排序 作业列表左上角添加作业的下拉列表 2016-04-13 11:20:38 +08:00
cxt a6f4b7f505 测试版 2016-04-12 16:23:52 +08:00
huang 04849659de 版本库统计 2016-04-12 16:00:54 +08:00
cxt e420be8ee9 Merge branch 'weixin_guange' into develop 
Conflicts:
	app/models/blog_comment.rb
 2016-04-12 15:56:08 +08:00
txz 38c182d76a 作业发布者真名为空时，显示昵称 2016-04-12 15:51:18 +08:00
cxt 1882cd8f4f 用户姓名不显示 2016-04-12 15:42:59 +08:00
txz 3665597153 详情页面排版调整 2016-04-12 14:56:17 +08:00
txz a6fcb072c0 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-11 15:11:12 +08:00
txz f82ad97a68 详情页面回复框宽度问题 2016-04-11 15:11:01 +08:00
guange 7c5d62b8a8 头像url不显示 2016-04-09 23:16:22 +08:00
guange 18f5f08bb7 Merge branch 'weixin_guange' into develop 2016-04-09 22:48:40 +08:00
guange 73ad787e23 修改到正式版 2016-04-09 22:48:10 +08:00
guange cadb5f3f15 更换服务器至test.course.trustie.net 2016-04-09 18:15:54 +08:00
huang a2a3d6b6b9 Merge remote-tracking branch 'remotes/origin/weixin_guange' into develop 
Conflicts:
	app/models/blog_comment.rb
 2016-04-09 17:01:20 +08:00
cxt c041f742c1 缺陷和留言的回复 2016-04-09 16:21:13 +08:00
cxt 007fee95bd 作业和留言回复的模板消息 2016-04-09 14:41:45 +08:00
cxt 3f365e75b5 讨论区的模板消息 2016-04-09 14:13:59 +08:00
cxt b6adaf61db Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-09 13:29:34 +08:00
cxt 930d95f8b5 私有动态不显示的问题 2016-04-09 13:29:26 +08:00
txz 02a5e7752d 微信环境切换 2016-04-08 21:46:41 +08:00
cxt 281fcf315f 点击模板消息页面为空 2016-04-08 21:01:15 +08:00
huang cd9ad535f5 1、修改默认图片 
2、作品弹框问题
 2016-04-08 20:44:09 +08:00
txz 0262e3b8ab 回复长单词显示问题 2016-04-08 18:46:46 +08:00
cxt 89330f9e40 调试 2016-04-08 17:03:48 +08:00
cxt d6daa906b6 回复 2016-04-08 16:58:27 +08:00
cxt de8d630fc1 解决冲突 2016-04-08 16:02:10 +08:00
cxt fcddaf403c 删除博客为空的数据 2016-04-08 15:59:23 +08:00
txz c88e924843 博客留言html内容转义 2016-04-08 15:31:43 +08:00
cxt 1cb1835a1a 动态 2016-04-08 14:51:26 +08:00
cxt c5048d7c72 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:46:49 +08:00
cxt e007ee58ef 博客动态 2016-04-08 14:46:42 +08:00
guange ef317089f1 错误信息打印到日志 2016-04-08 14:46:00 +08:00
guange a35511195a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 14:42:39 +08:00
guange abf4a80942 错误信息打印到日志 2016-04-08 14:42:23 +08:00
cxt eee7b89388 项目动态 2016-04-08 14:38:35 +08:00
txz 707127631e 微信公众号样式调整 2016-04-08 14:07:49 +08:00
guange 4e50a9e289 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 10:45:10 +08:00
guange aa9cb4e579 merge 2016-04-08 10:44:36 +08:00
txz 4ab96586de Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 10:10:19 +08:00
txz f3738519e9 长单词折行问题 2016-04-08 10:10:08 +08:00
cxt 1503686ddb 无更多动态时不显示更多 2016-04-08 10:09:45 +08:00
huang 3501d6f1d6 完成组织模块的开发 2016-04-07 17:05:22 +08:00
cxt bb71d1c322 调试模式 2016-04-07 16:59:46 +08:00
txz 411a8be8b8 点击展开 2016-04-07 16:58:06 +08:00
txz 139a7931ee 点赞功能修改 2016-04-07 16:39:04 +08:00
cxt 60c8320f82 praise api的修改 2016-04-07 15:42:08 +08:00
txz 938bf48d08 点赞功能修改 2016-04-07 15:26:23 +08:00
cxt 2fe32fda61 点赞的js 2016-04-07 15:17:42 +08:00
txz eb996280a6 点赞功能 2016-04-07 15:07:37 +08:00
cxt f1783c06a2 详情页面传参openid 2016-04-07 14:24:15 +08:00
txz 3008c0c44d activities.html冲突解决 2016-04-07 14:16:51 +08:00
txz 0b1b08bd3d 点赞 2016-04-07 14:15:19 +08:00
guange 80f47476cb Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
# Conflicts:
#	public/javascripts/wechat/app.js
 2016-04-07 13:58:23 +08:00
guange 99f39696d0 点击展开功能完成 2016-04-07 13:57:38 +08:00
txz 572d84b55d Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-07 11:40:27 +08:00
txz 6d8ffabb39 代码优化 2016-04-07 11:40:20 +08:00
guange 8ac8e1c9e5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-07 11:23:15 +08:00
guange 79dcd48d8c 重构 2016-04-07 11:22:22 +08:00
cxt a0e95976ac 详情页面的点赞 2016-04-07 11:21:59 +08:00
cxt edb18bd1b8 api提供has_praise 2016-04-07 11:16:38 +08:00
txz 8e1473a484 点赞代码优化等 2016-04-07 09:26:24 +08:00
txz ec47fb1949 项目缺陷详情页面修改 2016-04-06 19:29:00 +08:00
txz a1ef398b9d Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 16:24:41 +08:00
txz 422621759e 项目讨论区详情修改 2016-04-06 16:24:35 +08:00
cxt 20bb8c1e09 留言详情页面 2016-04-06 16:23:21 +08:00
cxt 7cc98db541 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 15:45:43 +08:00
cxt 2ede6e2b9d 博客详情页面 2016-04-06 15:43:37 +08:00
txz 6115e374bf Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 15:34:59 +08:00
txz a1a9dbd8a3 项目讨论区详情页面 2016-04-06 15:34:54 +08:00
guange 42bd2dcfc5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
# Conflicts:
#	public/javascripts/wechat/app.js
 2016-04-06 15:23:48 +08:00
guange 3ee79a6889 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
# Conflicts:
#	public/javascripts/wechat/app.js
 2016-04-06 15:23:20 +08:00
guange 70c2c9cc9f 把activities列表存起来,防止返回时页面变空 2016-04-06 15:19:18 +08:00
txz 468f3ae63e Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 14:44:46 +08:00
txz c9687a8764 课程通知详情页面 2016-04-06 14:44:35 +08:00
cxt e46c963931 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 11:40:16 +08:00
cxt 6c527a9a54 点赞的api 2016-04-06 11:40:05 +08:00
txz feb0014bf8 作业详情页面 2016-04-06 11:29:50 +08:00
huang 2162d7d4b8 组织banner上传功能 2016-04-06 10:40:38 +08:00
txz 18cda892d9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 09:43:31 +08:00
cxt be30ac889b 冲突 2016-04-06 09:43:04 +08:00
txz 0d04f996c5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-06 09:40:53 +08:00
cxt 035b47d2b7 issue页面的调整 2016-04-06 09:38:46 +08:00
guange 606599047d 详情页出错 2016-04-05 17:35:27 +08:00
guange 23ec67b2eb 详情页出错 2016-04-05 17:23:36 +08:00
guange afd779f292 使用cookies存储openid 2016-04-05 17:19:00 +08:00
guange 80d5424ff3 详情页出错 2016-04-05 16:36:18 +08:00
guange 619b07b5c2 服务器上调试openid成功 2016-04-05 16:32:42 +08:00
txz 50c6b565e7 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-05 16:32:38 +08:00
txz 11651fc866 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-05 15:58:11 +08:00
guange bb5a527f9e 配置新菜单 2016-04-05 15:57:19 +08:00
txz b2a892bd22 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-05 15:12:50 +08:00
guange 417484f3ad 加入调试标志 2016-04-05 15:12:05 +08:00
txz 48e26fce62 冲突解决 2016-04-05 10:43:51 +08:00
txz 8c7de04dbf 项目问答详情页面 2016-04-05 10:30:25 +08:00
guange 36f3e3a46c 改为angularjs实现 2016-04-04 22:24:13 +08:00
guange 58c1b27600 加入openid传参 2016-04-02 08:13:52 +08:00
guange e1f1c6fbc0 openid参数 2016-04-02 08:05:49 +08:00
guange 1926f0ba53 修改openid路由 2016-04-02 07:49:36 +08:00
guange 9c93b3f9a6 修改openid调用位置 2016-04-02 07:43:55 +08:00
guange 7d4de36521 修改openid调用位置 2016-04-02 07:39:46 +08:00
guange 5839959f0a 修改openid调用位置 2016-04-02 07:32:40 +08:00
cxt 9da89ef5e2 课程通知的回复 2016-04-02 00:37:24 +08:00
huang 86aecd21b9 上传图片 2016-04-01 23:56:05 +08:00
cxt d47f887fd1 issue回复的修改 2016-04-01 23:48:29 +08:00
cxt bc5e455f0f 解决冲突 2016-04-01 23:25:19 +08:00
cxt 790b452a9b issue回复 2016-04-01 23:22:39 +08:00
txz d45604c4a0 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 23:21:25 +08:00
txz 3b70970651 问题跟踪详情页面修改 2016-04-01 23:21:18 +08:00
cxt cc2fe6108a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 22:38:57 +08:00
cxt 5e697e5367 作业的回复 2016-04-01 22:38:45 +08:00
txz 0d24de7198 详情页面回复 2016-04-01 22:35:44 +08:00
cxt 7dccb0d963 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-01 21:32:56 +08:00
cxt 88c39512b9 journal的修改 2016-04-01 21:32:33 +08:00
txz 58e5fe85c3 issue 详情页面 2016-04-01 21:28:25 +08:00
txz 4902361b3f 冲突解决 2016-04-01 20:56:50 +08:00
txz 596bf641ac 最新动态各详情页面 2016-04-01 20:53:21 +08:00
cxt b3b0488bf5 动态点击更多 2016-04-01 20:46:38 +08:00
Yiang Gan 4088fb9cb4 课程作业详情页面 2016-04-01 14:58:41 +08:00
huang 8f4ff2bf91 列表样式问题 2016-04-01 10:20:31 +08:00
Yiang Gan 392c5708f2 作业详情页面 2016-03-31 20:43:06 +08:00
huang 5866dfb7ff 登录 
没内容more
logo不加链接
 2016-03-31 20:12:20 +08:00
huang 45343a44b8 修改链接 2016-03-31 17:13:40 +08:00
huang f662bfa40b 组织科配置 2016-03-31 17:06:00 +08:00
huang c431658333 setting中后台编辑 2016-03-31 16:19:59 +08:00
Yiang Gan f23c0e7602 最新动态修改 2016-03-30 18:02:33 +08:00
Tim 77e11fe0fe 微信最新动态修改 2016-03-30 17:47:44 +08:00
Yiang Gan 6dc374cf9a 最新动态 2016-03-30 17:41:18 +08:00
huang 0244008b32 一些链接和样式 2016-03-30 17:33:22 +08:00
huang 7c55356ace 组织新界面修改 2016-03-30 17:22:23 +08:00
Yiang Gan 4de598873f 动态和作业的api 2016-03-30 10:32:45 +08:00
huang 961a264e05 创建时间统一date 2016-03-29 19:04:51 +08:00
huang 65e80b1978 用户图像样式 2016-03-29 18:25:16 +08:00
huang 2728cccd41 Merge branch 'develop' into hjq_beidou 2016-03-29 16:54:44 +08:00
huang d28a46c48a 北斗资源库板块 2016-03-29 16:45:14 +08:00
ouyangxuhua 74d8dffc14 发送功能样式调整 2016-03-29 16:07:00 +08:00
ouyangxuhua 9e599da365 组织动态，点击展开更多没有反应问题解决 2016-03-29 15:47:05 +08:00
huang 80cd5089a4 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-03-29 13:51:46 +08:00
huang 2b9ddf3594 组织新版 2016-03-29 13:43:28 +08:00
huang b80bc98fcb 组织首页 2016-03-29 11:31:58 +08:00
ouyangxuhua a69997f6c7 Merge branch 'develop' into ouyangxuhua 2016-03-29 10:21:29 +08:00
yuanke 213cf48c09 编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管 2016-03-29 09:02:54 +08:00
ouyangxuhua 1a1d5b4c49 解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题 2016-03-28 19:20:09 +08:00
Tim 406bb7930c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	public/javascripts/wechat/wechat-dev.js
 2016-03-28 14:47:11 +08:00
Tim a9fd79ec63 微信动态筛选 2016-03-28 14:45:11 +08:00
huang 4b6b5504ca 北斗框架（未完） 2016-03-28 14:11:40 +08:00
guange d5124e128e 添加调试功能 2016-03-26 15:56:36 +08:00
guange 60931dde6a 添加获取openid的功能 2016-03-26 15:52:14 +08:00
yuanke 5116d75eb7 编程作业空格用□表示 2016-03-26 14:48:57 +08:00
Tim 4f7d698076 wechat init 2016-03-26 14:45:57 +08:00
yuanke e62ee2eade 修改评测问题 2016-03-26 13:44:13 +08:00
yuanke 63ae921c40 return 放错位置了 2016-03-25 17:07:06 +08:00
yuanke 674b63d106 Merge branch 'develop' into yuanke 
Conflicts:
	app/views/student_work/_programing_work_show.html.erb
 2016-03-25 15:59:49 +08:00
yuanke 3c1be19702 修改编程提示语句 2016-03-25 15:41:14 +08:00
yuanke 1f9d2ceffb 修改下编程的提示 2016-03-25 15:38:14 +08:00
cxt 46a05d1000 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 15:37:15 +08:00
yuanke 0fd164d2bb 修改编程的几个提示语句 2016-03-25 15:24:31 +08:00
yuanke 3af257eb77 评测服务器有问题时得提示 2016-03-25 15:18:33 +08:00
yuanke dea947e9ce Merge branch 'develop' into yuanke 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
	public/javascripts/homework.js
	public/stylesheets/new_user.css
 2016-03-25 14:58:17 +08:00
yuanke c6361406b5 代码评测超时优化 2016-03-25 14:43:51 +08:00
ouyangxuhua 5cc31fb511 组织资源栏目排序，带过滤条件，如tag类型、搜索条件等 2016-03-25 12:30:33 +08:00
ouyangxuhua 2d4f5284df 删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题 2016-03-24 17:03:51 +08:00
cxt f90b25b230 作业附件的用户名省略号太早 2016-03-22 15:50:06 +08:00
guange aaa2a0dea7 手机头修改 2016-03-21 18:26:35 +08:00
guange 7804a1e9ec url更改 2016-03-21 18:23:34 +08:00
guange 908b3dfdbd 利用reactjs前后端分离 2016-03-21 18:18:11 +08:00
guange fbe1b2dac2 Merge branch 'guange_dev' into weixin_guange 
# Conflicts:
#	Gemfile
#	db/schema.rb
 2016-03-21 18:17:39 +08:00
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +08:00
yuanke a10830c90f Merge branch 'develop' into yuanke 
Conflicts:
	public/stylesheets/new_user.css
 2016-03-21 14:40:47 +08:00
guange 59923dfb03 merge 2016-03-18 16:38:21 +08:00
guange b356c6cd1f 答案提交加入超时处理 2016-03-18 15:40:02 +08:00
cxt d2bff21de5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:39:27 +08:00
cxt 54a00ca867 题库作业信息框的样式调整 2016-03-18 15:39:20 +08:00
huang 51bd745b8d 课程讨论区限制改成20000 2016-03-18 13:39:28 +08:00
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-03-17 16:18:30 +08:00
huang 7e0aa44b68 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-17 16:06:36 +08:00
huang 28cb1755d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/files/_org_subfield_list.html.erb
	db/schema.rb
 2016-03-17 16:06:05 +08:00
cxt 6b8ae56ce4 Merge branch 'alan_develop' into develop 2016-03-17 16:04:06 +08:00
cxt d72aa3a93c Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/homework_common_controller.rb
	app/views/student_work/show.js.erb
	public/javascripts/application.js
	public/stylesheets/base.css
	public/stylesheets/public_new.css
 2016-03-17 15:27:52 +08:00
cxt a8780be9b4 提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子 2016-03-17 15:03:34 +08:00
alan 9265186307 修改user动态中issue行高，使之与project中的一样 2016-03-17 14:36:05 +08:00
huang 7ff946e488 课程资源库提供历史版本下载 2016-03-17 12:37:05 +08:00
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/organizations/_org_course_news.html.erb
	app/views/organizations/_org_project_issue.html.erb
	app/views/organizations/_project_message.html.erb
	app/views/organizations/_show_org_document.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-15 13:40:33 +08:00
huang bf4116906f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/public.css
 2016-03-15 11:09:11 +08:00
cxt 5476016b79 调整题库高度与资源库一致 2016-03-15 09:47:58 +08:00
huang 2b21213b7f 公共资源库，排序 2016-03-15 09:26:26 +08:00
huang a7990a4c3c Merge branch 'yuanke' into develop 2016-03-14 18:25:26 +08:00
yuanke 27a2aad3d6 修改KE贴吧回复添加视频图片不能显示的BUG 2016-03-14 18:19:23 +08:00
huang 3d06d5a503 Merge branch 'yuanke' into develop 
Conflicts:
	public/stylesheets/new_user.css
 2016-03-14 17:31:53 +08:00
yuanke 465a236049 修改KE贴吧等地图片显示不出来的问题 2016-03-14 17:16:11 +08:00
cxt c770fd157c 题库：题目描述变窄，缺省文字：【尹刚提供】 2016-03-14 16:33:16 +08:00
luoquan 006731ea61 修改以下问题： 
KE问题：编辑时行间距挺好，发布后，在项目讨论区中的显示行间距稍微有点挤。
KE问题：缺省的文字颜色：在编辑时是黑色，但发布后就是灰色。应该发布后也是黑色。
 2016-03-14 15:51:50 +08:00
luoquan 270a290df9 修改视频不能播放问题。 2016-03-14 15:18:56 +08:00
cxt 7d2bb572b2 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	public/stylesheets/new_user.css
 2016-03-11 19:43:36 +08:00
cxt 12c60547ad 题库支持按引用数和发布时间排序 2016-03-11 18:06:43 +08:00
luoquan e0922e9b19 调整视频播放默认图大小 2016-03-11 16:25:05 +08:00
Tim de3a4718ab 个人，课程，项目，组织访问量添加 2016-03-11 15:49:24 +08:00
luoquan 901409ebb4 Merge branch 'yuanke' into luoquan 
Conflicts:
	public/assets/kindeditor/kindeditor.js
 2016-03-11 14:40:07 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
luoquan 1e256add7f 媒体播放默认样式 2016-03-11 13:17:15 +08:00
luoquan 033c7991e1 修改媒体播放 2016-03-11 13:16:44 +08:00
luoquan ec4b7e3744 视频默认图标 2016-03-11 11:24:10 +08:00
luoquan a418c0937d Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan 
Conflicts:
	public/assets/kindeditor/kindeditor.js
	public/assets/kindeditor/plugins/code/previewcode.css
 2016-03-11 10:21:59 +08:00
luoquan 62f91865e0 kindeditor视频添加默认图片 2016-03-11 10:21:16 +08:00
luoquan 7d70e63f8d 代码重置 2016-03-11 10:18:10 +08:00
luoquan e80caf87b2 还原行距问题 2016-03-11 09:52:36 +08:00
luoquan 2d14b26c11 还原行距问题 2016-03-11 09:52:11 +08:00
ouyangxuhua 766569afa6 1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间 2016-03-10 16:43:50 +08:00
yuanke 28b481cf36 修改KE点击上传图片时选择非图片格式时的提示信息 2016-03-10 15:37:07 +08:00
yuanke 6fa2fd8b47 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into yuanke 2016-03-10 15:11:33 +08:00
yuanke 9b5cd8f880 KE表格修改 2016-03-10 11:28:56 +08:00