 huang
|
d3c6c0ca99
|
二级目录未登录时回复提示
|
2016-06-06 14:29:33 +08:00 |
|
huang
|
89288c7861
|
Merge branch 'develop' into hjq_beidou
|
2016-06-06 14:23:19 +08:00 |
|
huang
|
c6d36bd738
|
未登录留言判断
|
2016-06-06 14:21:58 +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
|
75f12e3749
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-06 11:05:37 +08:00 |
|
cxt
|
ee12b3540b
|
消息弹窗的还原、微信配置修改
|
2016-06-06 11:05:25 +08:00 |
 yuanke
|
1173bb9039
|
Merge branch 'develop' into yuanke
|
2016-06-06 10:41:13 +08:00 |
|
yuanke
|
4c92e73cf1
|
根据http和https显示视频
|
2016-06-06 09:34:45 +08:00 |
|
huang
|
7cce01872d
|
名字样式
|
2016-06-03 18:11:42 +08:00 |
|
cxt
|
fe22cfa5c5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-03 18:02:41 +08:00 |
|
huang
|
e4ff4ad156
|
Merge branch 'cxt_course' into develop
|
2016-06-03 17:55:42 +08:00 |
|
huang
|
57f3cf713c
|
去掉搜索
|
2016-06-03 17:50:40 +08:00 |
|
huang
|
acc808f003
|
样式问题
|
2016-06-03 17:24:45 +08:00 |
|
cxt
|
dab24567f2
|
微信模板消息
|
2016-06-03 17:21:36 +08:00 |
|
huang
|
429deefadf
|
右一线条样式问题
|
2016-06-03 17:14:28 +08:00 |
|
cxt
|
07941233d8
|
题库点击发送到后，先输入一个不存在的课程ID，点击确定，在出现请先选择课程的提示后删除输入的ID，此时会显示出该用户所有的课程，包括已经删除的
|
2016-06-03 17:03:53 +08:00 |
|
huang
|
65bf816ea4
|
帖子设为首页后，不在模式二中显示问题
|
2016-06-03 17:03:35 +08:00 |
|
huang
|
ea19f19973
|
500问题
|
2016-06-03 16:30:20 +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
|
c7866af1e8
|
组织编辑成员的时候样式乱的问题
|
2016-06-03 16:14:45 +08:00 |
|
huang
|
edbe882cc9
|
管理员栏目其它成员不可见
|
2016-06-03 15:56:04 +08:00 |
|
huang
|
43e586aa90
|
标题过长隐藏效果
|
2016-06-03 15:50:52 +08:00 |
|
huang
|
0b869aaaed
|
去掉定制功能
|
2016-06-03 15:40: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 |
|
huang
|
e726a362d8
|
组织配置页面状态的更新
|
2016-06-03 14:56:38 +08:00 |
|
huang
|
1e34a4f174
|
显示样式一级添加二级目录权限
|
2016-06-03 14:43:20 +08:00 |
|
huang
|
875a604780
|
热点项目描述内容的字数
|
2016-06-03 14:31:49 +08:00 |
|
huang
|
fa2437cdf6
|
添加课程学期
|
2016-06-03 14:28:12 +08:00 |
|
huang
|
1f43ecb8ed
|
隐藏与配置界面一致，
|
2016-06-03 14:19:52 +08:00 |
|
huang
|
2d2e9c540a
|
默认图片及顺序
|
2016-06-03 14:14:50 +08:00 |
|
huang
|
7be18b80b4
|
组织链接
|
2016-06-03 13:45:53 +08:00 |
|
huang
|
5ec9e31626
|
精品项目，精品课程按照动态数排序
|
2016-06-03 13:10:03 +08:00 |
|
huang
|
3af115ee54
|
组织新版样式，及方法优化
|
2016-06-03 12:42:02 +08:00 |
|
huang
|
a0f722837b
|
精品课程加入到左模式二
|
2016-06-03 10:47:57 +08:00 |
|
huang
|
a1200a41b0
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-06-03 10:31:52 +08:00 |
|
huang
|
ca3b072f85
|
热门项目按照项目得分排序及设置界面中默认设置
|
2016-06-03 10:31:29 +08:00 |
 Tim
|
3c6c617d09
|
门户样式冲突问题
|
2016-06-03 10:08:54 +08:00 |
|
huang
|
432baebdc3
|
组织默认activite status
|
2016-06-03 09:38:24 +08:00 |
|
cxt
|
b833c1f0a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-03 09:13:19 +08:00 |
|
Tim
|
57bb2f69a4
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/organizations/_org_custom_right2.html.erb
|
2016-06-03 09:12:36 +08:00 |
|
Tim
|
bb9c9ddddf
|
添加链接鼠标覆盖蓝色效果
|
2016-06-03 09:11:49 +08:00 |
|
cxt
|
1396cae14c
|
消息弹框
|
2016-06-03 08:59:17 +08:00 |
|
huang
|
a71c4a50bb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-03 08:59:09 +08:00 |
|
huang
|
fa03867cc2
|
样式神略问题
|
2016-06-03 08:56:54 +08:00 |
|
huang
|
6fbad6d53d
|
右二优化
|
2016-06-03 08:45:43 +08:00 |
|
Tim
|
a9ad6c05a8
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-06-03 08:42:09 +08:00 |