 cxt
|
6100abe0da
|
课程大纲
|
2016-06-14 10:38:11 +08:00 |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
2016-06-07 16:02:00 +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
|
3af115ee54
|
组织新版样式，及方法优化
|
2016-06-03 12:42:02 +08:00 |
|
cxt
|
2431ef6986
|
模板消息引起的问题
|
2016-06-02 13:56:11 +08:00 |
|
cxt
|
b72ad364db
|
微信模板消息：用户绑定成功、作业消息、个人留言、班级通知
|
2016-06-02 10:39:11 +08:00 |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
2016-06-01 17:38:41 +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 |
|
huang
|
649b3918c4
|
通知、消息创建的时候异步发送消息
|
2016-05-27 15:25:27 +08:00 |
|
huang
|
d1e11d4260
|
代码审查后代码简化
|
2016-05-25 08:58:58 +08:00 |
|
huang
|
a4f2ebb73b
|
Merge branch 'develop' into hjq_beidou
|
2016-05-24 16:12:27 +08:00 |
|
huang
|
ed7c6cbcfe
|
组织新建帖子增减status状态
|
2016-05-24 09:40:16 +08:00 |
|
huang
|
b1c70db28a
|
上线暂时还原代码
|
2016-05-23 16:34:31 +08:00 |
|
huang
|
a3abf09841
|
delayjob封装
|
2016-05-23 16:04:06 +08:00 |
|
huang
|
d70f42b413
|
发布课程通知消息异步发送（测试版）
|
2016-05-23 15:03:22 +08:00 |
|
huang
|
eead7962cf
|
资源申请权限控制
|
2016-05-21 11:39:50 +08:00 |
|
cxt
|
40f45ea697
|
发布通知的微信模板消息内容有重复
|
2016-05-20 19:13:19 +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 |
|
cxt
|
82568b5951
|
缺陷状态更改或内容更改时不发模板消息
|
2016-05-20 11:39:30 +08:00 |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-19 16:01:07 +08:00 |
|
huang
|
984f706722
|
可发送权限控制
|
2016-05-19 15:59:59 +08:00 |
|
cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
2016-05-19 15:26:23 +08:00 |
|
huang
|
99cbf0b54e
|
资源引用消息通知
|
2016-05-19 11:32:58 +08:00 |
|
huang
|
f3f75a57bd
|
申请资源消息资源发布这收到消息
|
2016-05-18 17:37:48 +08:00 |
|
cxt
|
670b2c48c7
|
缺陷的模板消息要细化缺陷类型
|
2016-05-18 16:08:40 +08:00 |
|
cxt
|
3b3cafbc81
|
微信模板消息的还原
|
2016-05-18 14:49:49 +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 |
 guange
|
1767e1200d
|
school不用Base64解码，两边都是utf8
|
2016-05-17 15:56:06 +08:00 |
|
cxt
|
55a98d8d6e
|
作业二级回复的消息通知
|
2016-05-17 15:33:16 +08:00 |
|
huang
|
855b33c4a5
|
Merge branch 'develop' into hjq_beidou
|
2016-05-17 09:02:43 +08:00 |
|
huang
|
13cc5ceaa6
|
model中添加获取二级域名的方法
|
2016-05-17 09:02:17 +08:00 |
|
huang
|
5ee6c9e5d3
|
子域名添加成员问题
|
2016-05-16 18:08:05 +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 |
|
huang
|
ff20b50aa2
|
Merge branch 'cxt_course' into develop
|
2016-05-16 11:15:01 +08:00 |
|
cxt
|
5e56e11982
|
暂时禁掉作业的模板消息和消息通知
|
2016-05-16 11:14:21 +08:00 |
|
guange
|
f217b3f510
|
去除用户名域名
|
2016-05-14 16:00:04 +08:00 |
|
huang
|
fbcae050ad
|
项目500问题
|
2016-05-13 17:16:09 +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
|
3853d5b7ad
|
右三模式定制
|
2016-05-13 13:39:44 +08:00 |
|
huang
|
1673ae451b
|
名师榜新增一个后就不能再新增
|
2016-05-13 10:50:34 +08:00 |
|
cxt
|
ca5f03f2ea
|
作业回复的消息通知，评阅作品的消息通知修改
|
2016-05-12 14:13:34 +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
|
f4b8f2c794
|
学生追加附件发送消息
|
2016-05-12 10:29:43 +08:00 |
|
cxt
|
9ec488684b
|
分享申请的消息更改
|
2016-05-12 09:30:06 +08:00 |
|
cxt
|
83f7de597a
|
暂时屏蔽通知的微信消息和消息通知
|
2016-05-10 15:30:27 +08:00 |