Commit Graph
184 Commits
Author SHA1 Message Date
Liang Tao ede5f2400a 恢复到最初的Travis配置。 2014-03-10 18:12:04 +08:00
Liang Tao 5a5adc79f9 修正密钥加密方法(#2)。 2014-03-10 17:51:08 +08:00
Liang Tao fdfee5c2bb 修正加密密钥方法。 2014-03-10 16:41:44 +08:00
Liang Tao 3bb30f1b4f 加密七牛密钥。 2014-03-10 14:41:57 +08:00
Liang Tao 672b8d18cc 删除rbx测试项目,添加2.0.0和2.1.1测试项目。 2014-03-10 13:39:14 +08:00
Liang Tao c506e410b6 删除过期的Auth函数和相关测试用例。 2014-03-10 11:35:34 +08:00
Liang Tao a7dbcbcee8 修正授权凭证生成算法,并调整测试用例。 2014-03-10 11:09:12 +08:00
Liang Tao 4d7dc24c60 修正版本信息。 2014-03-06 15:36:44 +08:00
Liang Tao ff86b2ac50 添加版本更新信息,修正部分文档链接。 2014-03-06 15:06:32 +08:00
404 f1461c338e Merge pull request #66 from qiniu/v3
rm staus icon
2013-09-27 14:02:29 -07:00
why404 67280b714e rm status icons 2013-09-28 04:51:21 +08:00
404 8f86e6903a Merge pull request #65 from why404/hotfix/v3.4.6
Hotfix/v3.4.6
2013-09-27 12:46:15 -07:00
why404 47cf54069d Gemfile 2013-09-28 03:44:32 +08:00
why404 0bb4edcade fix :pattern requried 2013-09-28 03:42:00 +08:00
404 b1e6235b2e Merge pull request #57 from why404/hotfix/v3.4.5
Gemfile.lock ver fix
v3.4.5
2013-07-24 18:24:51 -07:00
why404 e5d2367a27 ver fix 2013-07-25 09:22:56 +08:00
404 3186ba40df Merge pull request #56 from why404/release/v3.4.4
release v3.4.4
v3.4.4
2013-07-23 11:12:30 -07:00
why404 c5708424b9 release v3.4.4 2013-07-24 02:09:19 +08:00
404 f85ee1159b Merge pull request #54 from qiniu/release/v3.4.3
callbackBody + returnUrl supported
v3.4.3
2013-07-23 10:52:29 -07:00
why404 804c7609ef returnUrl 2013-07-24 01:47:50 +08:00
404 49ab640493 Merge pull request #53 from GaiaMagic/master
Support callback_body option
2013-07-23 10:37:48 -07:00
HungYuHei 85f8e68399 Support callback_body option 2013-07-22 23:18:54 +08:00
LI Daobing 7dbec75553 Merge pull request #50 from qiniu/develop
merge develop to master
2013-07-19 02:26:59 -07:00
LI Daobing 3299d2bd02 Merge remote-tracking branch 'origin/master' into develop
Conflicts:
	docs/README.md
2013-07-19 15:59:42 +08:00
LI Daobing ec8c50383b disable ruby-head on travis 2013-07-19 15:54:30 +08:00
LI Daobing 9cc157c21d Merge pull request #51 from longshanksmo/fix/test_account
use new account & correct test code
2013-07-18 22:33:25 -07:00
longshanksmo 3d40d4e967 use new account & correct test code 2013-07-19 13:23:45 +08:00
hantuo fa85e838fc Merge pull request #49 from longshanksmo/fix/lost_link
Fix/lost link
2013-07-17 22:02:33 -07:00
longshanksmo 38970b66e3 Update README.md 2013-07-17 20:33:46 +08:00
longshanksmo 63ccf3f2dc Update README.md
correct the title
2013-07-17 20:32:32 +08:00
longshanksmo 5c011aa816 fix links 2013-07-17 20:29:56 +08:00
xushiwei 7b507f15c6 Merge pull request #41 from why404/release/v3.4.2
Release/v3.4.2 - uploadToken[:return_body]
v3.4.2
2013-02-05 03:45:03 -08:00
404 aab7277b50 update README.md 2013-02-05 14:59:26 +08:00
404 eaed72eeaa release v3.4.2 for uploadToken[:return_body] #40 . 2013-02-04 15:38:11 +08:00
404 60cc7274b1 Merge pull request #38 from why404/feature/fix_env_appkey
rm encrypted appkey
2013-01-24 18:38:37 -08:00
xushiwei 466a4ba07e Merge pull request #39 from why404/feature/return_body
add :return_body option for Qiniu::RS.generate_upload_token()
2013-01-23 06:23:49 -08:00
404 444956f161 add :return_body option for Qiniu::RS.generate_upload_token() 2013-01-23 21:30:15 +08:00
404 0e4b5d00bc used before_script instead of env vars in .travis.yml 2013-01-23 16:55:41 +08:00
404 5d2745d148 fix travis env syntax 2013-01-23 16:49:15 +08:00
404 3026a40d99 rm encrypted appkey 2013-01-23 16:38:42 +08:00
xushiwei 84f7cc6205 Merge pull request #36 from why404/feature/encrypt_appkey
mv appkey outside and encrypted
2013-01-22 23:58:50 -08:00
404 5562df4b28 mv appkey outside and encrypted 2013-01-23 15:37:13 +08:00
qiniu 70c4664e0d Merge pull request #35 from qiniu/master
v3.4.1 - add :async_options for uploadToken
2013-01-14 17:58:45 -08:00
404 2096bff7a7 Merge pull request #34 from why404/feature/upload_async_options
v3.4.1 - add :async_options for uploadToken
2013-01-14 09:20:44 -08:00
404 b0af3c1814 v3.4.1 - add :async_options for uploadToken 2013-01-15 00:10:19 +08:00
404 9bda6845a0 Merge pull request #33 from why404/feature/add_cp_and_mv_support
v3.4.0 - added copy and move methods
2013-01-08 09:59:13 -08:00
404 d9422cbcf4 added copy and move methods 2013-01-09 01:56:05 +08:00
404 38c054f24c Merge pull request #32 from why404/feature/uniq_bucket_for_multi_test_concurrency
using unique bucket for multi concurrency testing
2013-01-06 07:48:34 -08:00
404 f85c4fab41 updated CHANGELOG.md for v3.3.1 2013-01-06 23:39:28 +08:00
404 f9bbcfeec6 using unique bucket for multi concurrency testing 2013-01-06 23:29:23 +08:00