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

1273 Commits

Author SHA1 Message Date
yuanke d38ce793bd Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 16:23:29 +08:00
yuanke bb62ba40b7 修改微信权限问题、管理课程界面等 2016-07-08 16:23:07 +08:00
huang ef8b127225 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
 2016-07-08 11:33:51 +08:00
txz ed39b4b4f1 动态：创建班级；学生进入资源也显示课件；已有班级和新增班级颜色区分 2016-07-08 11:29:33 +08:00
yuanke 06f7594680 Merge branch 'yuanke' into develop 2016-07-08 09:15:55 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
 2016-07-07 15:14:11 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
guange a2ba65956c . 2016-07-07 15:03:45 +08:00
yuanke 3a6470b1f3 删除班级时增加提示确定信息 2016-07-07 14:55:41 +08:00
guange 7859bf9c32 . 2016-07-07 14:51:54 +08:00
guange a17a6ed596 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-07 14:35:26 +08:00
guange 10789d2505 added alert2 2016-07-07 14:35:15 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
yuanke 9d46040f7a 课程列表 + - 按钮增加效果，资源发送界面课程列表显示和课程列表界面保持一直 2016-07-06 17:08:22 +08:00
yuanke 6fe8d7ddf5 点击图片弹框右下角统一用“关闭” 2016-07-06 16:03:50 +08:00
yuanke b994e786ab 我的动态中三类动态之间切换的效果 2016-07-06 11:06:32 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-05 16:49:50 +08:00
yuanke d49bc8b114 发送课程的时候提示语修改 2016-07-05 14:44:50 +08:00
yuanke da19bbd3a0 优化了下修改资料界面的代码 2016-07-05 09:02:34 +08:00
guange 373e3d3422 merge 2016-07-04 17:06:26 +08:00
guange 48fb02a2d6 管理课程 2016-07-04 17:04:06 +08:00
yuanke 9d0b5789d9 1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改 2016-07-04 16:50:49 +08:00
guange 60367415fa 新建课程功能完成 2016-07-04 16:19:05 +08:00
cxt cc649ae64b 课程讨论区、项目讨论区、帖子详情页面的二级回复 2016-07-04 14:14:51 +08:00
guange 3c295ba5a1 merge 2016-07-04 10:54:03 +08:00
guange 201abd6358 assets 2016-07-03 00:08:51 +08:00
guange b010ce2e61 发送课程完成 2016-07-02 23:46:45 +08:00
cxt e834d09469 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 17:52:29 +08:00
cxt 0ff8f0a774 课程大纲的删除和课程大纲描述的删除 2016-07-01 16:25:52 +08:00
cxt bdaa9983e3 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 11:30:24 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
cxt ac4218bfb0 课程大纲列表 2016-06-30 15:36:46 +08:00
guange 0bb5c8b5fb 注册绑定问题 2016-06-29 21:09:49 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
cxt 383483de26 课程大纲的左侧栏base，新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +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 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
cxt 4f342142e6 组织文章的展开更多 2016-06-24 17:58:50 +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
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
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 86a5eccae6 组织设置中添加成员BUG解决 2016-06-24 14:16:39 +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
guange 52d4d36097 邀请码页面 2016-06-24 09:01:12 +08:00
Tim 563fb3b459 控制table拖拽不靠在一起 2016-06-23 14:58:40 +08:00
cxt 126bf9c195 个人留言、课程留言的二级回复 2016-06-23 14:47:22 +08:00
guange 7700445c17 加入课程 2016-06-22 16:42:20 +08:00
guange 13273d02de 修正了安全问题，不暴露openid 2016-06-22 12:11:34 +08:00
guange 5a8de44c43 添加我的班级控制器 2016-06-20 19:42:51 +08:00
guange b4a3d4a5a2 弹出框处理 2016-06-20 16:04:38 +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
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
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
Tim 4b62a39b15 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-17 16:49:57 +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
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 5e3df51ad9 完成新版登录注册 2016-06-16 10:21:21 +08:00
huang 06f97d5cb7 注册页面（未完） 2016-06-15 17:24:46 +08:00
cxt 43192b8648 分组作业的弹框增加人数的验证、点击关闭弹框时还原弹框中的值 2016-06-15 17:04:53 +08:00
guange ada15b4212 格式上的调整, 现在可以分开写,但发布时打成一个js提高性能 2016-06-14 16:03:10 +08:00
cxt 254e1f44f6 评分设置提示的修改与提交时的判断 2016-06-14 15:44:03 +08:00
guange b1791f4531 wechat结构分离 2016-06-14 14:24:39 +08:00
guange d3d31ca3a2 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-12 17:18:34 +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 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 ec39c16c66 Merge branch 'develop' into yuanke 2016-06-08 09:41:18 +08:00
yuanke 5999189f3a 1.视频根据http还是https分类显示。 
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
 2016-06-08 09:02:00 +08:00
guange 8b05b33e38 不刷新返回 2016-06-07 17:38: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
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
Tim 253d9da345 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-07 09:01:53 +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
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 a71c4a50bb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 08:59:09 +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
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
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
cxt 8540b48091 未绑定微信账号时点击“最新动态”出现提示信息 2016-05-31 17:34:56 +08:00
cxt d4c0e9754a 课程描述展开后应显示“收起描述信息” 2016-05-30 14:51:54 +08:00
yuanke 5b7011e07b Merge branch 'develop' into yuanke 2016-05-27 15:37:11 +08:00
yuanke 9d9e2ff613 自动识别URL正则匹配修改 2016-05-27 15:31:13 +08:00
Tim 5f27519c67 table可拖拽 2016-05-27 14:44:32 +08:00
yuanke cfc3751f6f Merge branch 'yuanke' into develop 2016-05-27 14:01:02 +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
yuanke 54e62c778a 保证python编程的中文注释可用 2016-05-26 15:49:50 +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
huang 0a7d1f1efc 公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug 2016-05-25 17:54:53 +08:00
cxt d9bd13c2fc 复制课程报500 2016-05-25 14:57:46 +08:00
txz 921b01e8e3 输入框支持文字内容滑动 2016-05-25 14:26:49 +08:00
yuanke fcaa9666e2 KE内容自动识别网址加上超链接时把颜色也加上 2016-05-25 10:37:35 +08:00
cxt b1a58ecfb8 Merge branch 'weixin_guange' into develop 
Conflicts:
	1234567
 2016-05-24 20:51:24 +08:00
txz 29ceb7b8e9 微信图标清晰问题，回复点赞右对齐 2016-05-24 15:01:26 +08:00
txz 2a0b35a1b3 微信回复框高度随文字增减 2016-05-24 09:38:49 +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
yuanke 6d7eca487f 将KE的newlineTag：'br' 改为'p',方便识别网址 2016-05-20 17:02:43 +08:00
yuanke ded5f8f861 页面中显示KE内容的地方都加上自动识别网址的函数 2016-05-20 15:30:25 +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
txz 66042cb3c9 debug false 2016-05-19 15:21:25 +08:00
txz e2f3ba8e7d 微信问题修改 2016-05-19 15:20:46 +08:00
cxt 28edaf2246 课程/项目留言：快速点击提交按钮重复产生多条记录的问题 2016-05-18 10:57:56 +08:00
yuanke 0ac7163b05 KE修改居中换行居中消失的问题 2016-05-17 15:55:24 +08:00
yuanke 93fb4441d8 代码测试改用新的提示框 2016-05-17 14:12:42 +08:00
yuanke c0de43ecc0 修改KE字体间距问题，代码测试出错提示。 2016-05-17 10:31:10 +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
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
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
yuanke be97675aed 没带图片类型的图片不让点击放大看! 2016-05-13 16:09:26 +08:00
huang 41214bd762 Merge branch 'cxt_course' into develop 2016-05-13 15:25:53 +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
cxt 402976cf40 课程留言的回复防止多次提交 2016-05-13 14:33:06 +08:00
huang 7759670fa1 Merge branch 'yuanke' into develop 
Conflicts:
	Gemfile
	public/stylesheets/new_user.css
 2016-05-13 11:39:01 +08:00
cxt f1821e54e1 通知和新闻详情页面的回复点击多次不会提交表单多次 2016-05-13 10:56:48 +08:00
yuanke c31d4dc3bd 我要回复字不消失 2016-05-13 09:19:47 +08:00
huang ad2f12c9d0 名师列表搜索功能 2016-05-12 15:02:23 +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
cxt d232a5241e 新建课程报404 2016-05-11 11:47:16 +08:00
txz a1afd0dc96 微信回复多次点击，仅第一次生效 2016-05-11 09:38:02 +08:00
cxt 11017d72c5 老师对作品的评分可为空 2016-05-10 11:28:24 +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
huang d212d4f4c5 Merge branch 'cxt_course' into develop 2016-05-03 18:17:54 +08:00
cxt bcb02e49d3 课程问答区的名片显示 2016-05-03 17:23:56 +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 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
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
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
cxt 0222038899 缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息 2016-04-27 10:28:36 +08:00
huang 81210fd475 顶部导航及样式 2016-04-25 15:35:32 +08:00
cxt b86669d49c 微信模板消息的详情页面 2016-04-25 14:57:55 +08:00
txz dcb150559e angularjs路径修改 2016-04-22 16:37:01 +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
txz 2345eb9d64 路径修改 2016-04-21 11:22:52 +08:00
txz 0bab42256c 微信loading弹框改 2016-04-21 11:21:29 +08:00
txz 8e254ff722 微信loading弹框 2016-04-21 10:38:36 +08:00
yuanke dc3837da76 Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-20 09:59:37 +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 f1090d45ad Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-15 14:13:44 +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
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 f5122d7ef0 微信url切换到正式版 2016-04-13 14:52:18 +08:00
cxt a6f4b7f505 测试版 2016-04-12 16:23:52 +08:00
cxt e420be8ee9 Merge branch 'weixin_guange' into develop 
Conflicts:
	app/models/blog_comment.rb
 2016-04-12 15:56:08 +08:00
cxt 1882cd8f4f 用户姓名不显示 2016-04-12 15:42:59 +08:00
txz 3665597153 详情页面排版调整 2016-04-12 14:56:17 +08:00
guange 7c5d62b8a8 头像url不显示 2016-04-09 23:16:22 +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
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
cxt 89330f9e40 调试 2016-04-08 17:03:48 +08:00
cxt d6daa906b6 回复 2016-04-08 16:58:27 +08:00
cxt fcddaf403c 删除博客为空的数据 2016-04-08 15:59:23 +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
cxt 1503686ddb 无更多动态时不显示更多 2016-04-08 10:09:45 +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 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
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
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 c9687a8764 课程通知详情页面 2016-04-06 14:44:35 +08:00
txz feb0014bf8 作业详情页面 2016-04-06 11:29:50 +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
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
Yiang Gan 392c5708f2 作业详情页面 2016-03-31 20:43:06 +08:00
Tim 77e11fe0fe 微信最新动态修改 2016-03-30 17:47:44 +08:00
Yiang Gan 4de598873f 动态和作业的api 2016-03-30 10:32:45 +08:00
ouyangxuhua 9e599da365 组织动态，点击展开更多没有反应问题解决 2016-03-29 15:47:05 +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
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
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
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
guange 59923dfb03 merge 2016-03-18 16:38:21 +08:00
guange b356c6cd1f 答案提交加入超时处理 2016-03-18 15:40:02 +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 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 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
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
yuanke 27a2aad3d6 修改KE贴吧回复添加视频图片不能显示的BUG 2016-03-14 18:19:23 +08:00
yuanke 465a236049 修改KE贴吧等地图片显示不出来的问题 2016-03-14 17:16:11 +08:00
luoquan 270a290df9 修改视频不能播放问题。 2016-03-14 15:18:56 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
ouyangxuhua 766569afa6 1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间 2016-03-10 16:43:50 +08:00
yuanke 5dcd3b6826 解决KE工具栏一行与两行显示不一致的情况 2016-03-09 15:32:08 +08:00
cxt 91d000c8f3 编程作业：编程测试集的弹框中，多行却只显示一行 2016-03-07 17:01:10 +08:00
guange 509d4a3df7 绑定提交改为ajax 2016-03-01 16:56:37 +08:00
guange 445bae6de9 patch mysql5.7的create table 2016-03-01 16:13:13 +08:00
cxt 072300331b 编程测试集的输入输出添加序号 2016-02-29 17:05:11 +08:00
ouyangxuhua 956ce8045d Merge branch 'ouyangxuhua' into develop 2016-02-26 16:18:17 +08:00
ouyangxuhua 8784c7cec6 超链接不能正常显示的问题 2016-02-26 16:13:14 +08:00
cxt 347efa275d Merge branch 'develop' into cxt_course 2016-02-24 09:50:53 +08:00
ouyangxuhua a4ca676ccb Merge branch 'szzh' into ouyangxuhua 
Conflicts:
	app/views/org_document_comments/edit.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-02-20 16:49:19 +08:00
ouyangxuhua 5df44ba44f 1.ke回复框能自动增加高度；2.组织页面右上角链接修改 2016-02-20 15:18:24 +08:00
ouyangxuhua 63b644dbb9 解决”组织帖子附件超过20个后，编辑时不能增加附件“的问题 2016-02-20 11:06:21 +08:00
guange ac121ce585 组织文章无法编辑问题 2016-02-18 15:26:07 +08:00
cxt e6d4d7d0cb 描述框的自动增高 2016-02-02 17:16:50 +08:00
cxt d42f144f23 作业、组织帖子描述框的自动增高 2016-02-02 15:50:28 +08:00
cxt 265359cd74 发布作业时作业类型的切换 2016-01-29 18:17:27 +08:00
ouyangxuhua 280f679b0c 1.调整项目中的问题快捷编辑的宽度；2.https://www.trustie.net/manual/feedback链接到帮助中心；3.编辑框显示更多选项 2016-01-28 16:49:25 +08:00
ouyangxuhua c857fb734b 快捷回复中，设置回复框的高度和宽度 2016-01-28 10:16:45 +08:00
ouyangxuhua 89a919163c 一旦组织私有，就disabled掉允许游客下载选项 2016-01-26 15:25:25 +08:00
cxt f632a3d4fb 编程弹框固定位置 2016-01-22 22:17:52 +08:00
cxt 8f1bffd28b 留言不能为空 2016-01-22 21:53:32 +08:00
cxt bb67a8f77d 若测试集够长，点击增加测试集，此时应该自动定位到测试集输入框 2016-01-22 17:34:35 +08:00
cxt 338c224846 课程配置页面的结束学期可修改 2016-01-22 15:17:11 +08:00
ouyangxuhua b8ae62db84 Merge branch 'szzh' into dev_hjq 2016-01-21 15:32:18 +08:00
ouyangxuhua c303f7ff3f 将分享的js方法统一，分享文件、通知等均可复用 2016-01-21 14:33:31 +08:00
cxt 247924af26 动态内容显示不全 2016-01-21 11:24:26 +08:00
cxt 1ff244ad98 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-20 18:38:00 +08:00
cxt 3b180aca90 用户个人留言页面的改版 2016-01-20 18:37:47 +08:00
Tim c7edf0d73b 弹框样式修改 2016-01-20 17:55:20 +08:00
ouyangxuhua 340d404ecd 组织栏目的通知增加查、改、删功能 2016-01-20 17:23:02 +08:00
Tim ffba281de5 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
huang c936304314 课程默认收起 2016-01-15 15:37:17 +08:00
Tim 8feea07825 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-01-14 15:59:50 +08:00
ouyangxuhua 7bcf995eaf Merge branch 'develop' into dev_hjq 
Conflicts:
	db/schema.rb
	public/stylesheets/share.css
 2016-01-13 09:58:14 +08:00
ouyangxuhua d5fc0277a2 3.2组织资源的样式更新 2016-01-12 16:43:40 +08:00
guange e96496ddcd avatar.js和attachments.js冲突,导致头像不能上传 2016-01-08 23:01:16 +08:00