 guange
|
48fb02a2d6
|
管理课程
|
2016-07-04 17:04:06 +08:00 |
|
guange
|
60367415fa
|
新建课程功能完成
|
2016-07-04 16:19:05 +08:00 |
|
guange
|
3c295ba5a1
|
merge
|
2016-07-04 10:54:03 +08:00 |
|
guange
|
b010ce2e61
|
发送课程完成
|
2016-07-02 23:46:45 +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 |
|
guange
|
c248249983
|
注册没有loading图问题
|
2016-06-29 21:11:21 +08:00 |
|
guange
|
0bb5c8b5fb
|
注册绑定问题
|
2016-06-29 21:09:49 +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 |
|
guange
|
c501af70ba
|
.
|
2016-06-27 11:09:25 +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 |
|
guange
|
485d0e3743
|
ticket处理
|
2016-06-24 14:59:50 +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 |
|
guange
|
7700445c17
|
加入课程
|
2016-06-22 16:42:20 +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 |
|
yuanke
|
fde06a2327
|
更新资源描述样式修改
|
2016-06-20 16:35:16 +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
|
7c729107cc
|
KE复制粘贴的时候保留图片的外链
|
2016-06-20 09:40:21 +08:00 |
|
guange
|
98c6548e39
|
重写登录和注册
|
2016-06-17 18:18:03 +08:00 |
|
txz
|
18df93ba9f
|
微信动态列表界面问题
|
2016-06-17 16:16:24 +08:00 |
|
txz
|
acf17d6252
|
微信详情页面链接添加颜色
|
2016-06-17 15:45:29 +08:00 |
|
guange
|
ada15b4212
|
格式上的调整, 现在可以分开写,但发布时打成一个js提高性能
|
2016-06-14 16:03:10 +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 |
|
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
|
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 |
|
yuanke
|
e4312674c4
|
KE表格修改
|
2016-06-08 11:11:32 +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 |