 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 |
|
huang
|
0eb6dbe48a
|
Merge branch 'huang_temp2' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-06-03 08:30:31 +08:00 |
|
huang
|
257165dbaf
|
模式二中添加课程定配
|
2016-06-02 21:32:56 +08:00 |
|
huang
|
e2848f4dec
|
创建栏目时默认状态
|
2016-06-02 21:10:07 +08:00 |
|
huang
|
dc4f927c39
|
完成右二模式
|
2016-06-02 21:01:39 +08:00 |
|
huang
|
52bc4aab81
|
右二（未完）
|
2016-06-02 18:46:15 +08:00 |
|
huang
|
0b3ec0322f
|
右一模式
|
2016-06-02 18:41:00 +08:00 |
|
huang
|
e05e6ba53d
|
样式对齐问题
|
2016-06-02 18:04:00 +08:00 |
|
huang
|
5d880db18e
|
详情页面没登陆可以回复
|
2016-06-02 17:54:12 +08:00 |
|
huang
|
fb1a13a522
|
隐藏版本库功能
|
2016-06-02 17:05:51 +08:00 |
|
huang
|
d047409d31
|
项目动态
|
2016-06-02 16:01:58 +08:00 |
|
cxt
|
04764a0e4f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-02 15:26:30 +08:00 |
|
huang
|
ba344a86b5
|
颜色
|
2016-06-02 14:59:32 +08:00 |
|
huang
|
d532cd3c6c
|
权限
|
2016-06-02 14:58:13 +08:00 |
|
huang
|
e374b1679f
|
权限
|
2016-06-02 14:54:54 +08:00 |
|
huang
|
135e50b2e7
|
链接
|
2016-06-02 14:54:04 +08:00 |
|
huang
|
1f073c19ae
|
域名问题
|
2016-06-02 13:57:07 +08:00 |
|
cxt
|
3d9b7aedb1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-02 13:56:29 +08:00 |
|
cxt
|
2431ef6986
|
模板消息引起的问题
|
2016-06-02 13:56:11 +08:00 |
|
huang
|
22cafdbd05
|
二级目录弹出
|
2016-06-02 13:43:30 +08:00 |
|
huang
|
31f3d74b0f
|
组织栏目中，匿名用户可以回复
|
2016-06-02 13:37:38 +08:00 |
|
huang
|
eecf12eda6
|
添加链接
|
2016-06-02 13:32:50 +08:00 |
|
huang
|
76732a3034
|
新模式有一
|
2016-06-02 13:17:38 +08:00 |
|
cxt
|
b20dc06e23
|
微信测试版配置修改
|
2016-06-02 10:56:04 +08:00 |
|
cxt
|
747128750c
|
Merge branch 'weixin_guange' into cxt_course
|
2016-06-02 10:42:04 +08:00 |
|
cxt
|
b72ad364db
|
微信模板消息：用户绑定成功、作业消息、个人留言、班级通知
|
2016-06-02 10:39:11 +08:00 |
|
huang
|
e5eeba90f6
|
组织精品课程，热门项目
|
2016-06-02 09:52:06 +08:00 |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
2016-06-01 17:38:41 +08:00 |
|
cxt
|
32dca93b59
|
统一项目反馈、课程留言、讨论区的回复显示：显示留言者姓名
|
2016-06-01 15:35:26 +08:00 |
|
cxt
|
fa73171818
|
点击“课程活跃度”和“课程英雄榜”跳到学生列表，并分别以“活跃度”、“英雄榜”倒序排列
|
2016-06-01 14:58:59 +08:00 |
|
huang
|
b1cb4e5f94
|
完成左一的配置
|
2016-06-01 14:31:42 +08:00 |
|
cxt
|
5097abbe1e
|
Merge branch 'develop' into cxt_course
|
2016-06-01 14:22:43 +08:00 |
|
huang
|
2acc545896
|
完成组织左二模式
|
2016-06-01 10:24:50 +08:00 |
|
huang
|
5c27aee2bd
|
模式二课程模块 定义公共方法（显示描述内容以省略号结束）
|
2016-06-01 09:08:08 +08:00 |
|
cxt
|
0cc8cb9928
|
刚提交的回复时间显示为“刚刚”
|
2016-06-01 08:57:27 +08:00 |
 guange
|
32ffd2a5b5
|
返回优化完成
|
2016-05-31 20:55:46 +08:00 |
|
huang
|
9ecdf0892b
|
完成左三模式的配置
|
2016-05-31 20:45:54 +08:00 |
|
guange
|
814fde878e
|
从后台获取openid即可
|
2016-05-31 20:19:45 +08:00 |
|
guange
|
e01da32c75
|
tempate=>file
|
2016-05-31 19:54:45 +08:00 |
|
guange
|
ac5d91a428
|
用户动态如果没有绑定则跳到绑定页面.
|
2016-05-31 19:51:38 +08:00 |
|
guange
|
1c5a31e8f1
|
用户动态如果没有绑定则跳到绑定页面.
|
2016-05-31 19:49:57 +08:00 |
|
guange
|
49a1a9de32
|
用户动态如果没有绑定则跳到绑定页面.
|
2016-05-31 19:46:30 +08:00 |
|
guange
|
e73c946806
|
用户动态如果没有绑定则跳到绑定页面.
|
2016-05-31 19:43:27 +08:00 |
|
guange
|
7b5a7a93f5
|
用户动态如果没有绑定则跳到绑定页面.
|
2016-05-31 19:40:54 +08:00 |
|
guange
|
6e44e8355c
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-05-31 19:21:08 +08:00 |
|
guange
|
7f811d7551
|
用户动态如果没有绑定则跳到绑定页面.
|
2016-05-31 19:20:15 +08:00 |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-05-31 18:38:05 +08:00 |
|
huang
|
a96fafd704
|
模式三（未完）
|
2016-05-31 18:37:21 +08:00 |
|
cxt
|
ed84783f26
|
私有课程作业的公开作品
|
2016-05-31 17:03:50 +08:00 |
|
huang
|
8d56d8556f
|
完成模式6
|
2016-05-31 16:03:48 +08:00 |
|
huang
|
bb7204846f
|
新版资源类型定制模式6
|
2016-05-31 14:41:50 +08:00 |
|
cxt
|
796125bd1c
|
修改微信端的时间提示
|
2016-05-31 14:18:40 +08:00 |
|
huang
|
6bfe344cbf
|
组织模式一左侧权限控制
|
2016-05-31 13:59:29 +08:00 |
|
huang
|
8f897cbf89
|
组织管理员模式，二级目录局部刷新
|
2016-05-31 13:47:05 +08:00 |
|
huang
|
c369b271a0
|
组织管理员配置后的权限控制及局部刷新
|
2016-05-31 11:24:47 +08:00 |
|
cxt
|
79c106a1c6
|
微信动态的缺失
|
2016-05-31 11:04:20 +08:00 |
|
huang
|
c333a0c55d
|
组织管理员提供学霸功能
|
2016-05-31 10:31:08 +08:00 |
|
cxt
|
30f1d87fbf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-31 08:57:39 +08:00 |
|
cxt
|
c421933cf6
|
微信最新动态
|
2016-05-31 08:57:08 +08:00 |
|
guange
|
858ad47338
|
作业长度定为50
|
2016-05-30 18:40:22 +08:00 |
|
guange
|
acc323e46d
|
issue7890解决
|
2016-05-30 18:35:47 +08:00 |
|
huang
|
c57c575c84
|
新版组织静态页面模板
|
2016-05-30 16:24:51 +08:00 |
|
cxt
|
f024764e29
|
课内学生看到的学生列表中学生“姓名”不应显示昵称
|
2016-05-30 14:59:05 +08:00 |
|
huang
|
471ed7cbd2
|
组织logo获取，添加样式图片
|
2016-05-30 14:58:46 +08:00 |
|
cxt
|
d4c0e9754a
|
课程描述展开后应显示“收起描述信息”
|
2016-05-30 14:51:54 +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 |
|
guange
|
8b623e3a0c
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-05-27 22:59:11 +08:00 |
|
guange
|
bb30709fa1
|
window close
|
2016-05-27 22:54:57 +08:00 |
|
guange
|
63b9aaefe2
|
window close
|
2016-05-27 22:22:09 +08:00 |
|
guange
|
be94d445a9
|
window close
|
2016-05-27 22:19:49 +08:00 |
|
guange
|
4561bdfd0d
|
code=>params[:code]
|
2016-05-27 22:18:03 +08:00 |
|
guange
|
4137fe07f3
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-27 22:14:55 +08:00 |
|
guange
|
622d71c476
|
已绑定成功的，直接提示
|
2016-05-27 22:14:41 +08:00 |
|
cxt
|
0cafebb3a2
|
新闻列表的点赞
|
2016-05-27 17:14:37 +08:00 |
|
huang
|
94dd8befc8
|
Merge branch 'yuanke' into develop
|
2016-05-27 17:13:39 +08:00 |
|
huang
|
f7cb9bdffd
|
Merge branch 'cxt_course' into develop
|
2016-05-27 17:13:01 +08:00 |
|
huang
|
12ac353de9
|
北斗新base
|
2016-05-27 17:08:50 +08:00 |
 yuanke
|
e650dca1ed
|
修改用户反馈中二级回复 回复框不消失的问题
|
2016-05-27 17:06:34 +08:00 |
|
cxt
|
086ccedc08
|
先隐藏作业信息，再点击查询或分班后“显示作业信息”的按钮不见了
|
2016-05-27 16:45:04 +08:00 |