 Tim
|
f7832b00c9
|
更新历史版本时描述位置调整
|
2016-06-15 14:02:09 +08:00 |
 huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
2016-06-08 11:37:58 +08:00 |
 cxt
|
b6eb5a3668
|
还原作品列表的拖动
|
2016-06-08 11:28:20 +08:00 |
 yuanke
|
e4312674c4
|
KE表格修改
|
2016-06-08 11:11:32 +08:00 |
|
yuanke
|
4cb4213a52
|
修改blockquote样式
|
2016-06-08 10:44:58 +08:00 |
|
yuanke
|
ec39c16c66
|
Merge branch 'develop' into yuanke
|
2016-06-08 09:41:18 +08:00 |
|
yuanke
|
5999189f3a
|
1.视频根据http还是https分类显示。
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
|
2016-06-08 09:02:00 +08:00 |
 guange
|
b965698fdf
|
merge
|
2016-06-07 17:45:19 +08:00 |
|
guange
|
8b05b33e38
|
不刷新返回
|
2016-06-07 17:38:38 +08:00 |
|
huang
|
fdb1846f75
|
Merge branch 'hjq_beidou' into develop
|
2016-06-07 17:37:38 +08:00 |
|
guange
|
1251e31061
|
不刷新返回
|
2016-06-07 17:36:11 +08:00 |
|
guange
|
37975552c9
|
base
|
2016-06-07 17:27:17 +08:00 |
|
guange
|
5b34f498c9
|
base
|
2016-06-07 17:23:56 +08:00 |
|
guange
|
fbfb382d78
|
base
|
2016-06-07 17:22:57 +08:00 |
|
guange
|
f993fa87ff
|
base
|
2016-06-07 17:18:28 +08:00 |
|
guange
|
8fb88dfdea
|
base
|
2016-06-07 17:17:14 +08:00 |
|
guange
|
5fe41d80e9
|
base
|
2016-06-07 17:06:13 +08:00 |
|
guange
|
b01a671fb4
|
base
|
2016-06-07 16:59:26 +08:00 |
|
huang
|
09ff5954bd
|
字体过长演示问题（模式二子页面）
|
2016-06-07 16:56:20 +08:00 |
|
guange
|
90ac57ed6a
|
base
|
2016-06-07 16:46:10 +08:00 |
|
guange
|
eee8a8adb6
|
fix
|
2016-06-07 16:43:37 +08:00 |
|
guange
|
33780759a9
|
修改为html5mode
|
2016-06-07 16:39:42 +08:00 |
|
cxt
|
de58cfb5e5
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-07 16:02:08 +08:00 |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
2016-06-07 16:02:00 +08:00 |
|
guange
|
f5da2ba5f6
|
将current page提前
|
2016-06-07 15:40:16 +08:00 |
|
Tim
|
1d44116841
|
作品列表可拖拽
|
2016-06-07 15:30:17 +08:00 |
|
huang
|
1553eadc58
|
宽度改成1000二级目录模式二样式调整
|
2016-06-07 10:17:16 +08:00 |
|
Tim
|
253d9da345
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-07 09:01:53 +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
|
df8df117a8
|
解决匿名用户登录问题（控制器和view）
|
2016-06-06 15:02:11 +08:00 |
|
Tim
|
a44cb47a26
|
组织未登录回复框提示
|
2016-06-06 14:41:18 +08:00 |
|
cxt
|
91f7e950ee
|
正式版微信
|
2016-06-06 12:22:52 +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 |
|
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
|
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
|
2d2e9c540a
|
默认图片及顺序
|
2016-06-03 14:14:50 +08:00 |
|
Tim
|
3c6c617d09
|
门户样式冲突问题
|
2016-06-03 10:08:54 +08:00 |
|
cxt
|
b833c1f0a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-03 09:13:19 +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 |
|
Tim
|
709ceca1a8
|
托代码改动
|
2016-06-03 08:41:14 +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 |
|
cxt
|
184c17d52f
|
“显示明码”弹出undefined
|
2016-06-02 15:34:43 +08:00 |
|
yuanke
|
c3c639aa77
|
超链接颜色修改
|
2016-06-02 15:27:16 +08:00 |
|
huang
|
ba344a86b5
|
颜色
|
2016-06-02 14:59:32 +08:00 |
|
cxt
|
2431ef6986
|
模板消息引起的问题
|
2016-06-02 13:56:11 +08:00 |
|
yuanke
|
0d38fa53a2
|
1.issue编辑器定下最高高度到了改为滚动条
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别？ 和cn等
5.KE缩进修改等
|
2016-06-02 13:55:40 +08:00 |