alan
|
5c1a6f7754
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-03-07 11:35:49 +08:00 |
alan
|
151fc561ac
|
修改邮件样式,增加相应的提示
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 11:30:25 +08:00 |
huang
|
e22b389971
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 11:15:30 +08:00 |
huang
|
b043d07d61
|
修改发布新贴显示问题
|
2015-03-07 11:02:12 +08:00 |
alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 10:52:20 +08:00 |
huang
|
ce792f6ce8
|
修改邮件发送界面
|
2015-03-07 09:32:27 +08:00 |
huang
|
b3cbfd39ca
|
修改一些缺陷,删掉多余的文件
|
2015-03-07 01:07:50 +08:00 |
huang
|
f898e2aa91
|
16:22
|
2015-03-06 16:22:07 +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 |
huang
|
b2b978d540
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-06 15:27:32 +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
|
e58f5d4af5
|
#1941 问卷描述,当编辑时有输入空格行时,点击确定js不会刷新,而且不会对剪辑的格式进行存储
|
2015-03-06 14:56:27 +08:00 |
huang
|
beac15475d
|
新项目及用户反馈框的修改!!
|
2015-03-06 14:55:21 +08:00 |
sw
|
e326934027
|
调整组织首页缺少项目时的显示样式
|
2015-03-06 10:58:12 +08:00 |
sw
|
3c1f1d8bad
|
修改部分浏览器下发布问卷、取消发布问卷样式显示不正确
|
2015-03-06 09:45:38 +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
|
e2307366f6
|
实现组织的增、删、改、查功能及相关界面
|
2015-03-05 17:42:31 +08:00 |
z9hang
|
3334299808
|
app版本管理功能(表添加,页面部分添加)
|
2015-03-05 17:37:33 +08:00 |
sw
|
3c4b502e97
|
1、修改进入组织主页项目列表显示不正确的问题
2、admin页面增加组织列表显示
|
2015-03-05 17:03:44 +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 |
sw
|
7f249d29f4
|
修整页面代码
|
2015-03-05 08:45:32 +08:00 |
sw
|
a2d986f70c
|
修改页面代码
|
2015-03-04 16:55:25 +08:00 |
lizanle
|
7ee58d1d44
|
项目动态重写,并去掉首页缓存
|
2015-03-04 15:32:00 +08:00 |
sw
|
032e28067d
|
#1959 项目评分是0的,就不显示了!
|
2015-03-04 11:34:01 +08:00 |
sw
|
33e9a3e326
|
#1958 关注有用户0个后边取消冒号
|
2015-03-04 10:02:40 +08:00 |
sw
|
5bba54432d
|
#1930 项目缺陷显示个数修改
|
2015-03-04 09:52:01 +08:00 |
sw
|
9233213127
|
修复未登录时进入指定学校课程列表显示却是国防科大课程列表的BUG
|
2015-03-03 17:35:46 +08:00 |
sw
|
bbeaa6e80c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-02 17:43:16 +08:00 |
sw
|
90d9e77b32
|
修复课程主页没有2015年课程
|
2015-03-02 17:31:04 +08:00 |
alan
|
22ac578ede
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
2015-03-02 14:50:10 +08:00 |
alan
|
c00deabf75
|
修改《邮件样式》
Signed-off-by: alan <547533434@qq.com>
|
2015-02-12 00:15:10 +08:00 |
alan
|
aa8f58530c
|
给黄总提供接口
Signed-off-by: alan <547533434@qq.com>
|
2015-02-11 23:34:10 +08:00 |
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能,修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
2015-02-11 20:23:50 +08:00 |
sw
|
5ef1bc1d02
|
修改本地登录后报错
修改zh.yml文件异常
|
2015-02-10 10:21:46 +08:00 |
whimlex
|
22aae1910b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/_search_project.html.erb
config/locales/en.yml
config/locales/zh.yml
|
2015-02-09 22:14:16 +08:00 |
whimlex
|
59a2c8283a
|
国际化结构调整
|
2015-02-09 22:07:21 +08:00 |
alan
|
7442cc1ca4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify
|
2015-02-06 18:19:35 +08:00 |
alan
|
6f9e2bad63
|
mail weekly
|
2015-02-06 18:15:08 +08:00 |
sw
|
0b41afa571
|
修改作业匿评界面,左侧附件名显示混乱
|
2015-02-06 10:51:29 +08:00 |
lizanle
|
d902d76ae2
|
将google统计换为了百度统计
|
2015-02-06 10:15:18 +08:00 |
sw
|
95b757ba09
|
修改问卷发布成功和取消发布成功后弹框提示样式
|
2015-02-06 09:32:32 +08:00 |
sw
|
a752ade770
|
#1922 测试版--平台上传附件功能,附件显示问题
|
2015-02-03 15:02:45 +08:00 |
sw
|
6226974f0b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-03 11:25:31 +08:00 |
huang
|
56fa330fed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-03 11:25:08 +08:00 |
huang
|
26b1f9f433
|
修改企业版中存在的一些bug
最多只显示十个项目
提示的样式
代码优化
|
2015-02-03 11:24:46 +08:00 |