 guange
|
e007920cb6
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
Gemfile
app/views/attachments/_form.html.erb
|
2015-03-19 17:41:45 +08:00 |
|
guange
|
6c87cd40c1
|
加入git回调接口
|
2015-03-17 20:52:12 +08:00 |
 lizanle
|
0c86ba210d
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
2015-03-17 09:38:24 +08:00 |
|
lizanle
|
48b08a20ee
|
增加gem包
|
2015-03-16 15:26:24 +08:00 |
|
guange
|
39f1fb879f
|
对Gemfile作了一些优化
1. 源可以从taobao源安装
2. 所有放在lib下的gem删除，从网上下载
|
2015-03-15 23:09:44 +08:00 |
|
guange
|
bcb162c600
|
#1968 解决IE8不能上传的问题， 只是解决，体验还是没有chrome,firefox的好
|
2015-03-14 12:01:08 +08:00 |
|
guange
|
5d1a5a0b11
|
#1738 修复图片下载次数不正确问题
|
2015-03-10 11:50:27 +08:00 |
 alan
|
f50ea0f780
|
Signed-off-by: alan <547533434@qq.com>
|
2015-03-06 16:36:12 +08:00 |
|
alan
|
f374bfd7e2
|
修复《窗口跳转问题》
Signed-off-by: alan <547533434@qq.com>
|
2015-03-02 14:47:50 +08:00 |
|
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能，修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
2015-02-11 20:23:50 +08:00 |
|
alan
|
6e72e07028
|
Merge branch 'szzh' into email_verify
Conflicts:
Gemfile
Gemfile.lock
|
2015-02-06 18:16:20 +08:00 |
|
alan
|
6f9e2bad63
|
mail weekly
|
2015-02-06 18:15:08 +08:00 |
|
alan
|
48cb0e0450
|
email verify
|
2015-01-31 15:04:48 +08:00 |
|
alan
|
2f168dd4d7
|
修改《课程动态》样式
Signed-off-by: alan <547533434@qq.com>
|
2015-01-30 17:47:57 +08:00 |
|
lizanle
|
3637d1906d
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
config/routes.rb
|
2015-01-28 12:38:32 +08:00 |
 zhuhao
|
2acca17e27
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
2015-01-27 15:48:25 +08:00 |
|
zhuhao
|
d32c4c8e86
|
预制件gem
|
2015-01-27 15:32:12 +08:00 |
|
lizanle
|
d3f975434c
|
增加了new Relic gem 包
|
2015-01-27 14:22:25 +08:00 |
 z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
2015-01-23 16:51:40 +08:00 |
|
alan
|
fdba8ca986
|
修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-23 11:46:55 +08:00 |
|
lizanle
|
240678673d
|
最新GemFile
|
2015-01-23 10:53:51 +08:00 |
|
lizanle
|
9b96d99d6f
|
无改动
|
2015-01-23 10:05:36 +08:00 |
|
alan
|
40d6c3b19c
|
添加《邮箱地址验证是否存在及国际化的编写》功能
Signed-off-by: alan <547533434@qq.com>
|
2015-01-20 16:33:59 +08:00 |
|
z9hang
|
0f9915fc2a
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
Gemfile.lock
app/controllers/bids_controller.rb
app/controllers/users_controller.rb
db/schema.rb
|
2015-01-13 15:12:05 +08:00 |
|
alan
|
9f807438d6
|
教师数目显示：-1 ，同时动态大量不显示。是不是只显示近期3个月的？
Signed-off-by: alan <547533434@qq.com>
|
2015-01-12 14:58:11 +08:00 |
|
alan
|
74af44a826
|
修改《修改个人资料页面》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 18:01:41 +08:00 |
|
alan
|
a0d6bf4603
|
gemfile恢复
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 16:30:56 +08:00 |
|
z9hang
|
320c01994b
|
去除部分gem
|
2015-01-10 15:50:52 +08:00 |
|
alanlong9278
|
9e2bff7778
|
托管平台中创建某项目后进入该项目主页，点击tab的配置---信息，form表单没对齐
|
2015-01-07 14:59:41 +08:00 |
|
lizanle
|
10cde37582
|
cache using version
|
2015-01-07 09:27:44 +08:00 |
|
z9hang
|
ad156079c6
|
修改加错的gem包
|
2014-12-31 11:03:26 +08:00 |
|
z9hang
|
2171198ba1
|
恢复被删除的gem包
|
2014-12-31 10:59:33 +08:00 |
|
alan
|
23140307aa
|
实现<去存储过程功能，并修改打分的表更新>
Signed-off-by: alan <547533434@qq.com>
|
2014-12-31 08:48:14 +08:00 |
|
z9hang
|
899ac6f654
|
添加作品列表导出excel功能
|
2014-12-30 14:29:30 +08:00 |
|
guange
|
e7060b7e00
|
开启assets
|
2014-12-11 11:11:30 +08:00 |
|
guange
|
5eba06ddf9
|
加入api在线文档
|
2014-12-10 15:11:10 +08:00 |
|
guange
|
ee3d998873
|
课程列表接口加入老师字段
|
2014-12-08 16:51:21 +08:00 |
|
guange
|
c7c25edf17
|
加上pry支持
|
2014-12-08 15:27:18 +08:00 |
www
|
53ecf8718f
|
[api]用户认证完成
|
2014-11-27 19:43:04 +08:00 |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
2014-10-23 11:30:34 +08:00 |
|
alan
|
43e940eb1d
|
修复竞赛作品附件删除报错的bug
Signed-off-by: alan <547533434@qq.com>
|
2014-09-28 17:14:09 +08:00 |
|
hhuai
|
a8a6d69318
|
改为了山东理工大学的源，比taobao源快，稳定
|
2014-08-18 09:07:09 +08:00 |
 nwb
|
aebae800dd
|
竞赛首页修改
|
2014-07-22 08:37:07 +08:00 |
 yanxd
|
fb138d1593
|
remove user_activities path, 3path bug.
|
2014-07-21 16:41:11 +08:00 |
|
yanxd
|
472b61fefe
|
删除了不能通过的测试，修改user_activities。所有原路由测试可以通过。
|
2014-07-21 15:49:23 +08:00 |
|
yanxd
|
2554e9fc5b
|
code review function test: 106 tests, 89 assertions, 0 failures, 36 errors
|
2014-07-17 15:17:37 +08:00 |
|
z9hang
|
3cda9294fd
|
注释未能安装的gem
|
2014-07-16 09:40:18 +08:00 |
|
nwb
|
ba3d1755d4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-14 16:51:34 +08:00 |
|
nwb
|
e6b80de3b5
|
rmagick调整为仅test需要安装
|
2014-07-14 16:51:18 +08:00 |
|
yanxd
|
14f1ad63d2
|
自动化测试环境
|
2014-07-14 16:11:38 +08:00 |