 Tim
|
a96470ad66
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-06-06 16:42:53 +08:00 |
|
Tim
|
5b2c22d264
|
历史版本名称过长导致折行
|
2016-06-06 16:42:41 +08:00 |
 huang
|
793978f196
|
组织--名师、学霸：如图搜索结果有多页，翻页后建议输入的搜索条件仍显示在搜索框内
|
2016-06-06 16:15:35 +08:00 |
|
huang
|
21197c95b3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-06 15:11:59 +08:00 |
|
huang
|
bfa447c195
|
未登录状态下anonymos改为未登录
|
2016-06-06 15:11:07 +08:00 |
 cxt
|
0bf46f2ecd
|
帮助中心的弹框
|
2016-06-06 15:03:21 +08:00 |
|
huang
|
df8df117a8
|
解决匿名用户登录问题（控制器和view）
|
2016-06-06 15:02:11 +08:00 |
|
Tim
|
a44cb47a26
|
组织未登录回复框提示
|
2016-06-06 14:41:18 +08:00 |
|
huang
|
d3c6c0ca99
|
二级目录未登录时回复提示
|
2016-06-06 14:29:33 +08:00 |
|
huang
|
c6d36bd738
|
未登录留言判断
|
2016-06-06 14:21:58 +08:00 |
|
cxt
|
91f7e950ee
|
正式版微信
|
2016-06-06 12:22:52 +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 |
|
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
|
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 |
|
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 |
|
Tim
|
ed46ca0735
|
可拖拽作业列表
|
2016-06-02 13:45:06 +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 |
|
Tim
|
308f247c71
|
可拖拽调整
|
2016-06-01 16:09:01 +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 |
|
Tim
|
3b55e9e39b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/student_work/_evaluation_un_title.html.erb
app/views/student_work/_evaluation_un_work.html.erb
|
2016-06-01 13:59:01 +08:00 |
|
Tim
|
513fe1a93d
|
作品列表可拖拽
|
2016-06-01 13:46:05 +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 |