 txz
|
9134e55606
|
动态纯文本模式，图标处理
|
2016-05-26 17:40:22 +08:00 |
|
txz
|
55b3751beb
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-26 17:21:15 +08:00 |
|
txz
|
e7039df875
|
微信点击跳转区域更改，内容字体大小颜色更改
|
2016-05-26 17:21:02 +08:00 |
 cxt
|
0cac1e99c7
|
微信动态的描述过滤掉html
|
2016-05-26 17:18:58 +08:00 |
|
cxt
|
6fea9c2ba8
|
微信文字和图片的显示
|
2016-05-26 17:14:52 +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
|
8fbe4d636c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-26 13:48:13 +08:00 |
|
txz
|
7bb94d9df4
|
详情页面将内容和框架同时显示
|
2016-05-26 13:47:23 +08:00 |
 guange
|
b48b1c97b3
|
weixin
|
2016-05-26 13:02:27 +08:00 |
|
guange
|
d034474f90
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-26 12:59:33 +08:00 |
|
guange
|
e4653426d2
|
将openid存到session
|
2016-05-26 12:59:15 +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
|
a3d90df5ce
|
delete unuse file
|
2016-05-26 10:51:39 +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
|
c8467a50a0
|
自己可以给自己点赞
|
2016-05-25 16:19:41 +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
|
09b831c189
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-25 14:57:59 +08:00 |
|
cxt
|
d9bd13c2fc
|
复制课程报500
|
2016-05-25 14:57:46 +08:00 |
|
txz
|
921b01e8e3
|
输入框支持文字内容滑动
|
2016-05-25 14:26:49 +08:00 |
|
huang
|
457cf72263
|
断行样式
发送JS
|
2016-05-25 14:08:05 +08:00 |
|
huang
|
0a8d21ea55
|
公共资源底端发送JS
|
2016-05-25 14:05:09 +08:00 |
|
txz
|
c4c0dd3c60
|
回复内容换行符未显示
|
2016-05-25 13:50:59 +08:00 |
|
huang
|
72ae31b7f9
|
作业导出资源代码回复
|
2016-05-25 11:23:19 +08:00 |
|
huang
|
415b624e0b
|
样式问题
|
2016-05-25 11:07:36 +08:00 |
|
huang
|
2abb68c00c
|
组织代码公共部分整理
|
2016-05-25 10:54:49 +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 |
|
huang
|
b6de2dbd2d
|
发布作业导入资源
|
2016-05-25 09:44:30 +08:00 |
|
huang
|
4280d79eab
|
Merge branch 'develop' into hjq_beidou
|
2016-05-25 09:11:55 +08:00 |
|
huang
|
d75943efe5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-25 09:11:26 +08:00 |
|
huang
|
197f054c18
|
注释掉申请私有资源功能
|
2016-05-25 09:10:41 +08:00 |
|
huang
|
d1e11d4260
|
代码审查后代码简化
|
2016-05-25 08:58:58 +08:00 |
|
cxt
|
b1a58ecfb8
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
|
2016-05-24 20:51:24 +08:00 |
|
huang
|
b38bd0c1e5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 20:13:42 +08:00 |
|
cxt
|
ed2f413949
|
代码还原
|
2016-05-24 20:04:06 +08:00 |
|
cxt
|
7b7f9cf8f2
|
删除wechat无用代码
|
2016-05-24 19:52:51 +08:00 |
|
cxt
|
4ec0d6812b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 18:11:18 +08:00 |
|
huang
|
909d40b4eb
|
默认显示公共资源
|
2016-05-24 17:14:01 +08:00 |
|
cxt
|
fc3b47e3aa
|
测验统计结果的js问题
|
2016-05-24 16:37:21 +08:00 |
|
yuanke
|
9e8411aac9
|
修改ke：issue描述只有一行，点击编辑后，描述框被拉高了，有很多空白
|
2016-05-24 16:22:46 +08:00 |
|
huang
|
a4f2ebb73b
|
Merge branch 'develop' into hjq_beidou
|
2016-05-24 16:12:27 +08:00 |
|
huang
|
a7a2be6a4b
|
作业导入资源问题
|
2016-05-24 16:01:02 +08:00 |
|
Tim
|
1c0a68e57b
|
组织配置成员tab，搜索结果太多导致换页断行问题
|
2016-05-24 15:47:22 +08:00 |