 huang
|
2105d2bbdb
|
Merge branch 'develop' into rep_quality
Conflicts:
app/views/repositories/show.html.erb
db/migrate/20160624103411_add_name_to_quality_analyses.rb
db/schema.rb
|
2016-06-29 14:18:17 +08:00 |
 guange
|
222855ea79
|
越过course表的validate,以防save invitecode 失败
|
2016-06-28 19:19:59 +08:00 |
|
guange
|
3c425edc3c
|
修复邀请码会变的问题
|
2016-06-28 17:46:27 +08:00 |
Your Name
|
dd6b19a8b5
|
some status of sonar
|
2016-06-28 14:48:09 +08:00 |
|
guange
|
1e6454efc0
|
加入我的资源
|
2016-06-27 17:24:06 +08:00 |
|
guange
|
3b383dfa65
|
老师课程界面
|
2016-06-27 16:03:07 +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 |
|
huang
|
012eae9b93
|
gems
|
2016-06-24 19:54:01 +08:00 |
|
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
2016-06-24 19:17:26 +08:00 |
|
Your Name
|
537f152562
|
0
|
2016-06-24 18:47:54 +08:00 |
|
Your Name
|
244c178758
|
666
|
2016-06-24 17:39:10 +08:00 |
|
Your Name
|
eae70f9c71
|
some config
|
2016-06-24 16:18:17 +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 |
|
guange
|
16a9f017b6
|
error
|
2016-06-24 15:28:44 +08:00 |
|
guange
|
485d0e3743
|
ticket处理
|
2016-06-24 14:59:50 +08:00 |
|
Your Name
|
06fe02890f
|
index for sonar result
|
2016-06-24 14:59:17 +08:00 |
|
guange
|
d348981721
|
加入邀请码
|
2016-06-24 13:29:36 +08:00 |
|
Your Name
|
ce6e6116b5
|
get data from sonar API
|
2016-06-22 17:09:54 +08:00 |
|
Your Name
|
9e7cde6056
|
stable version for sonar
|
2016-06-22 11:25:59 +08:00 |
|
cxt
|
c4cea93a44
|
消息列表的“展开更多”指针手势修改
|
2016-06-21 13:58:17 +08:00 |
|
cxt
|
4f80e259e8
|
消息弹窗的延时显示
|
2016-06-21 11:16:45 +08:00 |
|
cxt
|
860068f7ed
|
新注册用户的留言
|
2016-06-21 11:03:50 +08:00 |
|
guange
|
98c6548e39
|
重写登录和注册
|
2016-06-17 18:18:03 +08:00 |
|
guange
|
8fd4d518b2
|
添加邀请码
|
2016-06-15 13:44:28 +08:00 |
|
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 |