 alan
|
fd97302947
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 09:53:15 +08:00 |
 huang
|
ce792f6ce8
|
修改邮件发送界面
|
2015-03-07 09:32:27 +08:00 |
|
huang
|
b3cbfd39ca
|
修改一些缺陷，删掉多余的文件
|
2015-03-07 01:07:50 +08:00 |
|
alan
|
c144544eb4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-03-06 16:37:05 +08:00 |
|
alan
|
f50ea0f780
|
Signed-off-by: alan <547533434@qq.com>
|
2015-03-06 16:36:12 +08:00 |
|
huang
|
f898e2aa91
|
16:22
|
2015-03-06 16:22:07 +08:00 |
 z9hang
|
6e7b294452
|
注释掉不用的ＡＰＩ
|
2015-03-06 15:37:24 +08:00 |
|
z9hang
|
c1c05067e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/admin_controller.rb
db/schema.rb
|
2015-03-06 15:36:47 +08:00 |
|
z9hang
|
754acc6945
|
移动端版本管理
|
2015-03-06 15:33:59 +08:00 |
|
alan
|
2e0187fc5a
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-03-06 15:33:47 +08:00 |
 sw
|
001b8bb112
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-06 15:33:24 +08:00 |
|
sw
|
108856edf1
|
增加忽略文件
|
2015-03-06 15:33:03 +08:00 |
|
alan
|
364d2affeb
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-03-06 15:29:13 +08:00 |
|
alan
|
d390c84de0
|
Signed-off-by: alan <547533434@qq.com>
|
2015-03-06 15:29:05 +08:00 |
|
huang
|
b2b978d540
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-06 15:27:32 +08:00 |
|
huang
|
9e2c479590
|
new project
|
2015-03-06 15:26:40 +08:00 |
|
huang
|
c159bb2c48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/issues/show.html.erb
app/views/layouts/base_projects.html.erb
app/views/projects/_form.html.erb
app/views/projects/new.html.erb
app/views/projects/show.html.erb
|
2015-03-06 15:23:42 +08:00 |
|
sw
|
a009c5a023
|
Merge branch 'dev_zanle' into szzh
|
2015-03-06 14:59:33 +08:00 |
|
sw
|
a6b3ddcfcb
|
Merge branch 'szzh' into dev_zanle
|
2015-03-06 14:58:49 +08:00 |
|
sw
|
e58f5d4af5
|
#1941 问卷描述，当编辑时有输入空格行时，点击确定js不会刷新，而且不会对剪辑的格式进行存储
|
2015-03-06 14:56:27 +08:00 |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
2015-03-06 14:55:21 +08:00 |
 lizanle
|
10faab0129
|
新建的项目发布新问题报500
|
2015-03-06 11:53:16 +08:00 |
|
lizanle
|
140cb81748
|
测试版发布课程通知和讨论区发布新帖报500
|
2015-03-06 11:38:32 +08:00 |
|
sw
|
e326934027
|
调整组织首页缺少项目时的显示样式
|
2015-03-06 10:58:12 +08:00 |
|
sw
|
5692cbf202
|
#1965 公共贴吧取消软件创客入口
|
2015-03-06 09:50:17 +08:00 |
|
sw
|
3c1f1d8bad
|
修改部分浏览器下发布问卷、取消发布问卷样式显示不正确
|
2015-03-06 09:45:38 +08:00 |
|
sw
|
e3773d7a3c
|
Merge branch 'szzh' into develop
|
2015-03-06 09:28:54 +08:00 |
|
sw
|
26081c6120
|
新建项目时增加不选择所属组织
|
2015-03-06 09:27:43 +08:00 |
|
sw
|
61d2fd199c
|
Merge branch 'szzh' into develop
|
2015-03-06 09:00:09 +08:00 |
|
sw
|
1f2b5eedb8
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/views/projects/show.html.erb
db/schema.rb
|
2015-03-06 08:59:29 +08:00 |
|
sw
|
d947a914cc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-05 17:43:00 +08:00 |
|
sw
|
e2307366f6
|
实现组织的增、删、改、查功能及相关界面
|
2015-03-05 17:42:31 +08:00 |
|
z9hang
|
3334299808
|
app版本管理功能（表添加，页面部分添加）
|
2015-03-05 17:37:33 +08:00 |
|
lizanle
|
8d322edb90
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/views/projects/show.html.erb
|
2015-03-05 17:24:19 +08:00 |
|
lizanle
|
0307d9c8ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
2015-03-05 17:19:16 +08:00 |
|
sw
|
3c4b502e97
|
1、修改进入组织主页项目列表显示不正确的问题
2、admin页面增加组织列表显示
|
2015-03-05 17:03:44 +08:00 |
|
lizanle
|
0b46fd99b5
|
ok
|
2015-03-05 17:02:03 +08:00 |
|
sw
|
5f8595d874
|
admin页面增加组织列表
|
2015-03-05 15:27:22 +08:00 |
|
sw
|
45fe622f26
|
1、修改进入系统首页报错
2、增加组织的默认图片
|
2015-03-05 14:42:46 +08:00 |
|
sw
|
3b4bf8b99d
|
增加组织的index界面，以及index界面到组织首页的跳转
|
2015-03-05 14:15:07 +08:00 |
|
sw
|
dead08a0d6
|
添加、修改项目增加所属组织的选择
|
2015-03-05 11:53:28 +08:00 |
|
sw
|
d1edd86e11
|
1、修改组织首页项目获取
2、修改此组织没有项目时的样式
|
2015-03-05 10:40:10 +08:00 |
|
z9hang
|
04dea372c5
|
添加意见反馈接口
|
2015-03-05 10:09:19 +08:00 |
|
sw
|
a64671f9de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-05 09:27:26 +08:00 |
|
sw
|
bcc8abdee9
|
1、增加组织相关数据表
2、增加组织和项目的关联关系
|
2015-03-05 09:27:13 +08:00 |
|
z9hang
|
d1651f7252
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-05 09:26:33 +08:00 |
|
z9hang
|
d01aa5f15c
|
关注接口限制不能关注自己
|
2015-03-05 09:26:13 +08:00 |
|
sw
|
ef5b7c9fca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-05 08:45:53 +08:00 |
|
sw
|
7f249d29f4
|
修整页面代码
|
2015-03-05 08:45:32 +08:00 |
|
z9hang
|
199ef4ebe6
|
匿评作品详情列表补上cur_page字段
|
2015-03-04 17:14:09 +08:00 |