Commit Graph
161 Commits
Author SHA1 Message Date
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
xushiwei e3d4a80b54 Merge pull request #31 from why404/feature/download_token
Feature/download token
2013-01-05 23:53:54 -08:00
404 61aae133cf updated Gemfile.lock 2013-01-06 15:20:50 +08:00
404 c3e2a3d44b rewrite docs 2013-01-06 14:48:35 +08:00
404 06b019008a fix encoding comments 2013-01-06 11:07:12 +08:00
404 957b5d1499 docs updated 2012-12-20 17:16:17 +08:00
404 5b0a561cc1 add Qiniu::RS.generate_download_token() 2012-12-19 17:53:26 +08:00
404 d1e60697c3 disabled wm 2012-12-18 10:57:16 +08:00
404 089b6bc7c6 Merge pull request #29 from zhouguangming/bug_fixed
refactor UP.upload_with_token
2012-12-09 17:53:22 -08:00
zhouguangming f1edde2e54 refactor UP.upload_with_token 2012-12-08 22:15:01 +08:00
404 8aca8bf33e Merge pull request #28 from zhouguangming/bug_fixed
MissingArgsError should get a key_list // very nice!
2012-12-07 00:07:43 -08:00
zhouguangming 69bb9cb913 MissingArgsError should get a key_list 2012-12-07 15:25:54 +08:00
404 cacdb4f926 Merge pull request #27 from zhouguangming/bug_fixed
感谢修正!不过由于历史遗留原因 lib/qiniu/tokens/qbox_token.rb 尚保留在sdk代码里边但并未实际使用。请求签名认证程序使用的是  
Qiniu::RS::Utils.generate_qbox_signature(url,params) , 所以不影响sdk正常使用。
v3.2.3
2012-12-06 05:41:46 -08:00
zhouguangming 557b75f33f [bug_fixed] lib/qiniu/tokens/qbox_token.rb => method generate_token => undefined method signature 2012-12-06 17:19:14 +08:00
xushiwei 2cbb175423 Merge pull request #26 from why404/release/v3.2.2
fix up 701
v3.2.2
2012-12-04 22:32:53 -08:00
404 a8a8f63887 fix up 701 2012-12-05 14:00:12 +08:00
404 64cf9b5d3f Merge pull request #24 from hayeah/master
Fixes Qiniu::RS::Exception Issue
2012-11-29 01:53:46 -08:00
Howard Yeh 1a73c39ffb Don't override to_s of Exception with inspect.
This causes infinite recursion.
2012-11-27 18:52:41 +08:00
xushiwei 864076b9ec Merge pull request #21 from why404/release/v3.2.0
Release/v3.2.0 - allow upload calback api
v3.2.1
2012-11-08 03:01:27 -08:00
404 bb6efd4e0d upload auto-rorate supported 2012-11-07 17:28:48 +08:00
404 ef1739cb2a v3.2.0 2012-11-06 23:19:14 +08:00
404 611837b137 Merge branch 'feature/allow_upload_callback_api' into develop 2012-11-06 23:17:16 +08:00
404 000eef8870 update unit tests 2012-11-06 23:16:40 +08:00
404 bacf83dd3c allow upload callback api 2012-11-06 22:09:19 +08:00