 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 |
|
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 |
|
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 |
|
huang
|
74ee3205bd
|
淘宝源
|
2016-06-02 15:47:17 +08:00 |
|
cxt
|
184c17d52f
|
“显示明码”弹出undefined
|
2016-06-02 15:34:43 +08:00 |
 yuanke
|
c3c639aa77
|
超链接颜色修改
|
2016-06-02 15:27:16 +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 |
|
yuanke
|
0d38fa53a2
|
1.issue编辑器定下最高高度到了改为滚动条
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别？ 和cn等
5.KE缩进修改等
|
2016-06-02 13:55:40 +08:00 |
|
Tim
|
ed46ca0735
|
可拖拽作业列表
|
2016-06-02 13:45:06 +08:00 |
|
huang
|
22cafdbd05
|
二级目录弹出
|
2016-06-02 13:43:30 +08:00 |