 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
|
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 |
 cxt
|
4f342142e6
|
组织文章的展开更多
|
2016-06-24 17:58:50 +08:00 |
|
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 16:54:19 +08:00 |
|
guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-24 16:53:58 +08:00 |
|
cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 16:52:00 +08:00 |
|
guange
|
c39a982093
|
二维码
|
2016-06-24 16:51:40 +08:00 |
|
cxt
|
eab000306c
|
动态回复的展开更多、收起，组织文章回复不可用
|
2016-06-24 16:38:36 +08:00 |
|
cxt
|
d558a4d357
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-24 16:12:31 +08:00 |
 Tim
|
a542ba46a4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-24 15:55:07 +08:00 |
|
Tim
|
ec33569033
|
取消拖拽
|
2016-06-24 15:54:56 +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 |
 yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 15:11:52 +08:00 |
|
guange
|
485d0e3743
|
ticket处理
|
2016-06-24 14:59:50 +08:00 |
|
yuanke
|
c61c14fa97
|
Merge branch 'yuanke' into develop
|
2016-06-24 14:35:59 +08:00 |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
2016-06-24 14:16:39 +08:00 |
|
guange
|
e21f4e0b4d
|
merge
|
2016-06-24 13:52:11 +08:00 |
|
guange
|
f9075e08ba
|
merge
|
2016-06-24 13:35:26 +08:00 |
|
guange
|
d348981721
|
加入邀请码
|
2016-06-24 13:29:36 +08:00 |
Your Name
|
e17aa4c5d8
|
color
|
2016-06-24 11:20:39 +08:00 |
|
Your Name
|
05eb71036d
|
some css to added
|
2016-06-24 10:47:24 +08:00 |
|
guange
|
52d4d36097
|
邀请码页面
|
2016-06-24 09:01:12 +08:00 |
|
Tim
|
563fb3b459
|
控制table拖拽不靠在一起
|
2016-06-23 14:58:40 +08:00 |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
2016-06-23 14:47:22 +08:00 |
|
Your Name
|
8438bc7bcd
|
somethint to added
|
2016-06-23 14:31:23 +08:00 |
|
huang
|
9f15a8aa4e
|
代码质量分析样式
|
2016-06-22 17:40:13 +08:00 |
|
guange
|
7700445c17
|
加入课程
|
2016-06-22 16:42:20 +08:00 |
|
guange
|
13273d02de
|
修正了安全问题，不暴露openid
|
2016-06-22 12:11:34 +08:00 |
|
cxt
|
1b12c56960
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-21 16:53:36 +08:00 |
|
cxt
|
3f8beaf97c
|
动态回复banner的代码重构
|
2016-06-21 16:53:31 +08:00 |
|
Tim
|
1a4865be09
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-21 15:03:51 +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 |
|
guange
|
4b813ef535
|
加入班级消息
|
2016-06-20 17:26:29 +08:00 |
|
guange
|
62a1b5de7c
|
加入班级更新
|
2016-06-20 17:04:42 +08:00 |
|
yuanke
|
301556b9c3
|
Merge branch 'yuanke' into develop
|
2016-06-20 16:41:23 +08:00 |
|
yuanke
|
d3f3f019a0
|
下拉菜单有时候不显示
|
2016-06-20 16:40:56 +08:00 |
|
yuanke
|
fde06a2327
|
更新资源描述样式修改
|
2016-06-20 16:35:16 +08:00 |
|
guange
|
4db1df0a4d
|
css
|
2016-06-20 16:29:52 +08:00 |
|
guange
|
311f21ee5a
|
css
|
2016-06-20 16:23:59 +08:00 |
|
guange
|
b4a3d4a5a2
|
弹出框处理
|
2016-06-20 16:04:38 +08:00 |
|
cxt
|
f4d67bc027
|
未读消息弹窗“点击展开”显示10条未读消息
|
2016-06-20 16:03:57 +08:00 |
|
guange
|
47c443e59d
|
输入框变大一点
|
2016-06-20 15:56:57 +08:00 |
|
Tim
|
3548c23aad
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-20 15:43:15 +08:00 |
|
cxt
|
048bb7fed5
|
头像下拉菜单、未读消息的延时
|
2016-06-20 15:38:43 +08:00 |
|
guange
|
b7230333dc
|
code获取修改
|
2016-06-20 15:21:13 +08:00 |