huang
|
c57c575c84
|
新版组织静态页面模板
|
2016-05-30 16:24:51 +08:00 |
huang
|
471ed7cbd2
|
组织logo获取,添加样式图片
|
2016-05-30 14:58:46 +08:00 |
huang
|
81ab73e286
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/organizations/_org_custom_header.html.erb
|
2016-05-30 14:48:12 +08:00 |
huang
|
698e4bd7b3
|
header
|
2016-05-30 14:41:53 +08:00 |
Tim
|
9cc749bd57
|
门户样式统一,防止冲突
|
2016-05-30 14:38:57 +08:00 |
huang
|
46e4f2c143
|
组织新base框架
|
2016-05-30 14:23:52 +08:00 |
huang
|
389172e5b2
|
CSS样式
|
2016-05-30 10:45:00 +08:00 |
huang
|
12ac353de9
|
北斗新base
|
2016-05-27 17:08:50 +08:00 |
huang
|
74384d10a5
|
组织 论坛编辑
|
2016-05-27 10:06:25 +08:00 |
huang
|
0a8d21ea55
|
公共资源底端发送JS
|
2016-05-25 14:05:09 +08:00 |
huang
|
415b624e0b
|
样式问题
|
2016-05-25 11:07:36 +08:00 |
huang
|
2abb68c00c
|
组织代码公共部分整理
|
2016-05-25 10:54:49 +08:00 |
huang
|
4280d79eab
|
Merge branch 'develop' into hjq_beidou
|
2016-05-25 09:11:55 +08:00 |
huang
|
d75943efe5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-25 09:11:26 +08:00 |
huang
|
197f054c18
|
注释掉申请私有资源功能
|
2016-05-25 09:10:41 +08:00 |
huang
|
d1e11d4260
|
代码审查后代码简化
|
2016-05-25 08:58:58 +08:00 |
cxt
|
b1a58ecfb8
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
|
2016-05-24 20:51:24 +08:00 |
huang
|
b38bd0c1e5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 20:13:42 +08:00 |
cxt
|
ed2f413949
|
代码还原
|
2016-05-24 20:04:06 +08:00 |
cxt
|
7b7f9cf8f2
|
删除wechat无用代码
|
2016-05-24 19:52:51 +08:00 |
cxt
|
4ec0d6812b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 18:11:18 +08:00 |
huang
|
909d40b4eb
|
默认显示公共资源
|
2016-05-24 17:14:01 +08:00 |
huang
|
a4f2ebb73b
|
Merge branch 'develop' into hjq_beidou
|
2016-05-24 16:12:27 +08:00 |
huang
|
a7a2be6a4b
|
作业导入资源问题
|
2016-05-24 16:01:02 +08:00 |
txz
|
29ceb7b8e9
|
微信图标清晰问题,回复点赞右对齐
|
2016-05-24 15:01:26 +08:00 |
huang
|
bc0e24d39e
|
资源引用代码注释
|
2016-05-24 10:28:17 +08:00 |
cxt
|
6af9e849d9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 09:51:45 +08:00 |
cxt
|
13676ec9c3
|
微信的链接修改
|
2016-05-24 09:51:27 +08:00 |
huang
|
61eeee702c
|
migrate
|
2016-05-24 09:40:47 +08:00 |
huang
|
ed7c6cbcfe
|
组织新建帖子增减status状态
|
2016-05-24 09:40:16 +08:00 |
txz
|
2a0b35a1b3
|
微信回复框高度随文字增减
|
2016-05-24 09:38:49 +08:00 |
huang
|
b1c70db28a
|
上线暂时还原代码
|
2016-05-23 16:34:31 +08:00 |
cxt
|
e62a4cc646
|
绑定新的微信公众号
|
2016-05-23 16:29:38 +08:00 |
huang
|
0e03798f6e
|
组织框架结构(yeild)修改
|
2016-05-23 16:24:32 +08:00 |
huang
|
96223b414d
|
Merge branch 'hjq_mail' into develop
|
2016-05-23 15:03:45 +08:00 |
huang
|
d70f42b413
|
发布课程通知消息异步发送(测试版)
|
2016-05-23 15:03:22 +08:00 |
huang
|
a60356091b
|
issue中添加类型tag
|
2016-05-23 11:02:21 +08:00 |
huang
|
e9c7ad9337
|
Merge branch 'develop' into hjq_beidou
|
2016-05-23 10:34:27 +08:00 |
txz
|
103af96ac2
|
替换加载中gif图
|
2016-05-23 10:26:17 +08:00 |
huang
|
eead7962cf
|
资源申请权限控制
|
2016-05-21 11:39:50 +08:00 |
huang
|
66709b16e5
|
Merge branch 'yuanke' into develop
|
2016-05-20 22:09:58 +08:00 |
huang
|
27d029271b
|
Merge branch 'cxt_course' into develop
|
2016-05-20 22:08:45 +08:00 |
huang
|
86ff725b8a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 22:08:32 +08:00 |
yuanke
|
76006ef3e7
|
组织一级二级帖子删除文章问题
|
2016-05-20 22:07:33 +08:00 |
huang
|
039d11e862
|
资源发送权限问题
|
2016-05-20 21:48:51 +08:00 |
Tim
|
51cd9c6dd1
|
学号溢出bug
|
2016-05-20 21:47:31 +08:00 |
huang
|
0fcd8ae86d
|
导入资源鼠标点击效果
|
2016-05-20 21:10:53 +08:00 |
huang
|
c749fe381b
|
Merge branch 'weixin_guange' into develop
|
2016-05-20 21:02:01 +08:00 |
huang
|
cdde844e44
|
Merge branch 'cxt_course' into develop
|
2016-05-20 21:01:30 +08:00 |
huang
|
f94806bcdf
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 21:01:18 +08:00 |