 guange
|
d3d31ca3a2
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-12 17:18:34 +08:00 |
|
guange
|
1cb63055cb
|
api可以通过openid来认证
|
2016-06-12 17:18:05 +08:00 |
|
guange
|
cbc4f2f6fd
|
菜单更新
|
2016-06-12 15:05:45 +08:00 |
|
guange
|
d3c45fd133
|
使用jquery1.3比较小
|
2016-06-12 13:40:14 +08:00 |
 huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
2016-06-08 11:37:58 +08:00 |
|
guange
|
b965698fdf
|
merge
|
2016-06-07 17:45:19 +08:00 |
|
guange
|
33780759a9
|
修改为html5mode
|
2016-06-07 16:39:42 +08:00 |
 cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
2016-06-07 16:02:00 +08:00 |
|
cxt
|
91f7e950ee
|
正式版微信
|
2016-06-06 12:22:52 +08:00 |
|
cxt
|
5ea6913278
|
配置修改
|
2016-06-06 11:19:10 +08:00 |
|
cxt
|
6a25adb37e
|
最新动态改成我的动态，提示修改
|
2016-06-06 11:13:35 +08:00 |
|
cxt
|
ee12b3540b
|
消息弹窗的还原、微信配置修改
|
2016-06-06 11:05:25 +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 |
 yuanke
|
0d38fa53a2
|
1.issue编辑器定下最高高度到了改为滚动条
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别？ 和cn等
5.KE缩进修改等
|
2016-06-02 13:55:40 +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 |
|
cxt
|
b72ad364db
|
微信模板消息：用户绑定成功、作业消息、个人留言、班级通知
|
2016-06-02 10:39:11 +08:00 |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
2016-06-01 17:38:41 +08:00 |
|
guange
|
814fde878e
|
从后台获取openid即可
|
2016-05-31 20:19:45 +08:00 |
|
guange
|
7b5a7a93f5
|
用户动态如果没有绑定则跳到绑定页面.
|
2016-05-31 19:40:54 +08:00 |
|
guange
|
7f811d7551
|
用户动态如果没有绑定则跳到绑定页面.
|
2016-05-31 19:20:15 +08:00 |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-05-31 18:38:05 +08:00 |
|
huang
|
c333a0c55d
|
组织管理员提供学霸功能
|
2016-05-31 10:31:08 +08:00 |
|
cxt
|
4d5ee5a722
|
微信的欢迎图片及欢迎词的修改,测试版的配置
|
2016-05-26 15:27:31 +08:00 |
|
cxt
|
e62a4cc646
|
绑定新的微信公众号
|
2016-05-23 16:29:38 +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 |
|
cxt
|
c165d0b37e
|
作业二级回复的模板通知
|
2016-05-20 14:52:47 +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 |
|
huang
|
99cbf0b54e
|
资源引用消息通知
|
2016-05-19 11:32:58 +08:00 |
|
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
2016-05-18 14:49:13 +08:00 |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
2016-05-17 16:30:03 +08:00 |
|
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
2016-05-17 14:18:14 +08:00 |
|
guange
|
5dff3556fb
|
配置出错
|
2016-05-14 16:46:27 +08:00 |
|
guange
|
b681e3a597
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-14 16:02:11 +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 |
|
huang
|
2d701b7d03
|
Merge branch 'cxt_course' into develop
|
2016-05-13 11:34:39 +08:00 |
|
huang
|
343e9d9434
|
修改日志分割关闭
|
2016-05-13 11:32:50 +08:00 |
|
huang
|
37ee03374e
|
完成设置名师功能
|
2016-05-13 09:53:22 +08:00 |
|
huang
|
ad2f12c9d0
|
名师列表搜索功能
|
2016-05-12 15:02:23 +08:00 |
|
cxt
|
7761bd5313
|
微信模板消息的“有新缺陷了”改成“有新的问题动态了”
|
2016-05-12 10:49: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
|
52c8593b09
|
组织教师列表sql优化
|
2016-05-11 16:20:55 +08:00 |
|
guange
|
67d552b2e3
|
[deprecated] I18n.enforce_available_locales will default to true in the future. If you really want to skip validation of your locale you can set I18n.enforce_available_locales = false to avoid this message.
|
2016-05-11 14:05:51 +08:00 |
|
huang
|
43f06c0826
|
版本库ZIP下载
|
2016-05-11 13:44:15 +08:00 |
|
cxt
|
9bc8ccbb9e
|
教辅可只评语不评分
|
2016-05-11 09:18:55 +08:00 |