 huang
|
1e2d151152
|
Merge branch 'hjq_beidou' into develop
|
2016-04-02 00:02:21 +08:00 |
|
huang
|
0bcd2ddcf8
|
0
|
2016-04-02 00:02:09 +08:00 |
|
huang
|
0dc7b1f621
|
上传图片
|
2016-04-02 00:00:36 +08:00 |
|
huang
|
86aecd21b9
|
上传图片
|
2016-04-01 23:56:05 +08:00 |
|
huang
|
0459856a2c
|
上线logo更换
|
2016-04-01 21:30:32 +08:00 |
|
huang
|
ac1b3338c5
|
logo图标替换
|
2016-04-01 20:10:28 +08:00 |
|
huang
|
218a6b9358
|
Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-04-01 19:25:01 +08:00 |
|
huang
|
c00c674c34
|
Merge branch 'develop' into hjq_beidou
Conflicts:
app/controllers/organizations_controller.rb
|
2016-04-01 19:24:41 +08:00 |
|
huang
|
007419f9cc
|
精华样式问题
|
2016-04-01 18:38:05 +08:00 |
|
huang
|
94478829b6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-01 17:23:37 +08:00 |
|
huang
|
9e7c595e55
|
组织发送动态的显示
|
2016-04-01 17:23:15 +08:00 |
 linchun
|
02ebaf23d1
|
修改管理员界面组织列表总组织的链接
|
2016-04-01 16:17:26 +08:00 |
|
linchun
|
0798046847
|
Merge branch 'develop' into linchun
|
2016-04-01 15:56:51 +08:00 |
|
linchun
|
c1c19f6d60
|
修改管理员界面作业列表报500错误的bug
|
2016-04-01 15:54:59 +08:00 |
|
huang
|
a9412b959e
|
动态一致问题
|
2016-04-01 11:54:58 +08:00 |
|
huang
|
aee695e94d
|
组织动态添加poll、
|
2016-04-01 11:48:13 +08:00 |
|
huang
|
25da925497
|
课程列表显示内容统一
|
2016-04-01 11:38:20 +08:00 |
|
huang
|
638280a07e
|
样式问题
|
2016-04-01 10:31:16 +08:00 |
|
huang
|
8f4ff2bf91
|
列表样式问题
|
2016-04-01 10:20:31 +08:00 |
|
huang
|
92a08dc606
|
作业500问题
admin组织编辑500问题
|
2016-04-01 09:37:31 +08:00 |
|
huang
|
4cca290592
|
组织编辑500问题
作业列表500问题
|
2016-04-01 09:33:50 +08:00 |
|
huang
|
10371e8bdd
|
添加附件图片功能
|
2016-04-01 00:27:34 +08:00 |
|
huang
|
68a4413759
|
Merge branch 'develop' into hjq_beidou
|
2016-03-31 22:54:13 +08:00 |
|
huang
|
5ce14991cf
|
新闻链接问题
|
2016-03-31 21:32:19 +08:00 |
|
huang
|
12c3de6dc9
|
500问题
|
2016-03-31 21:14:07 +08:00 |
|
huang
|
d71035159a
|
修改more链接
|
2016-03-31 20:54:01 +08:00 |
|
huang
|
ba658e44c0
|
组织more权限
|
2016-03-31 20:46:55 +08:00 |
|
huang
|
5866dfb7ff
|
登录
没内容more
logo不加链接
|
2016-03-31 20:12:20 +08:00 |
|
huang
|
865f274c61
|
修改登录
|
2016-03-31 19:56:29 +08:00 |
|
huang
|
230dab6d9d
|
栏目样式
|
2016-03-31 19:42:05 +08:00 |
|
huang
|
1fdd562bd3
|
修改组织一些功能jibug
|
2016-03-31 19:33:43 +08:00 |
|
huang
|
ebb2f30f3b
|
配置完点确定，自动跳转
|
2016-03-31 19:14:58 +08:00 |
|
huang
|
4797cbe65d
|
模式默认选中
|
2016-03-31 19:09:11 +08:00 |
|
huang
|
756a2db4aa
|
组织配置样式问题
链接more空白问题
|
2016-03-31 19:04:31 +08:00 |
|
huang
|
67d1798163
|
修改news500问题
|
2016-03-31 18:11:29 +08:00 |
|
huang
|
7490c7f90d
|
添加图片链接和用户名链接
|
2016-03-31 17:51:23 +08:00 |
|
huang
|
45343a44b8
|
修改链接
|
2016-03-31 17:13:40 +08:00 |
|
huang
|
6af8c48d3b
|
Merge branch 'hjq_beidou' into develop
|
2016-03-31 17:06:30 +08:00 |
|
huang
|
f662bfa40b
|
组织科配置
|
2016-03-31 17:06:00 +08:00 |
|
huang
|
c431658333
|
setting中后台编辑
|
2016-03-31 16:19:59 +08:00 |
|
linchun
|
2af261056c
|
h回复改过的分页错误代码，修改有误
|
2016-03-31 15:33:48 +08:00 |
|
huang
|
1ccb3a2c41
|
Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
db/schema.rb
|
2016-03-31 15:25:24 +08:00 |
|
huang
|
c6f6030e10
|
组织新样式
|
2016-03-31 15:25:02 +08:00 |
 cxt
|
893fad2b48
|
组织配置里的栏目 “排列做成可编辑的”
|
2016-03-31 15:21:40 +08:00 |
|
linchun
|
914117230e
|
解决管理员界面用户列表报500错误的bug，，分页错误
|
2016-03-31 15:15:11 +08:00 |
|
huang
|
cf946687d0
|
类型
|
2016-03-31 14:02:35 +08:00 |
|
huang
|
20ea251cab
|
添加字段
|
2016-03-31 14:01:09 +08:00 |
|
huang
|
3465a39285
|
添加配置
隐藏不显示
|
2016-03-31 13:07:12 +08:00 |
|
cxt
|
37e3377fd3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop_new
|
2016-03-31 09:44:35 +08:00 |
|
cxt
|
6a5b79cf6d
|
管理员的作业页面报500
|
2016-03-31 09:44:21 +08:00 |