c79f20993c5840b5f0df51108cc210adf05f2b77 3359f88ad76119faf228fcf6650287219cc3a4ad Jason Davies jason@jdd.local http://github.com/jasondavies/couchdb/commit/f645b36f66c096696cafad11b49a475759b41d90 f645b36f66c096696cafad11b49a475759b41d90 2009-07-11T11:24:22-07:00 2009-07-11T11:24:22-07:00 Merge branch 'master' into cookie-auth fcd2b440cf3df9ae298df2fbc44a6aa6562db7e7 Jason Davies jason@jdd.local b7b942a78273f2175a3555cc22c156e2ff1b633b a3b98c33b6ddb440c812ea82e2049fb518db7a09 Jason Davies jason@jdd.local http://github.com/jasondavies/couchdb/commit/c79f20993c5840b5f0df51108cc210adf05f2b77 c79f20993c5840b5f0df51108cc210adf05f2b77 2009-07-11T11:24:11-07:00 2009-07-11T11:24:11-07:00 Merge branch 'jd-cookie-auth' of git://github.com/benoitc/couchdb into cookie-auth 9a668cd8d82f316e09a367b5c25845dbd1b00058 Jason Davies jason@jdd.local 8903a326d5d455472762a7938f940903b2e5bb40 Benoit Chesneau bchesneau@gmail.com http://github.com/jasondavies/couchdb/commit/a3b98c33b6ddb440c812ea82e2049fb518db7a09 a3b98c33b6ddb440c812ea82e2049fb518db7a09 2009-07-11T10:30:26-07:00 2009-07-11T10:30:26-07:00 allow configuration of Timeout b63ef82d379623b5234faa3b46ad93c6ce639986 Benoit Chesneau bchesneau@gmail.com 9b24413a9cf7d128f988e1acd3ff695adb1b4d55 jan jan@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/jasondavies/couchdb/commit/3359f88ad76119faf228fcf6650287219cc3a4ad 3359f88ad76119faf228fcf6650287219cc3a4ad 2009-07-11T10:00:42-07:00 2009-07-11T10:00:42-07:00 send Location header for new or updated attachments git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@793205 13f79535-47bb-0310-9956-ffa450edef68 59b08d374742b69dcea88d42884b90090fb0bfc6 jan jan@13f79535-47bb-0310-9956-ffa450edef68 fda842e2bf1e898881af6aba40cc153d98000858 jan jan@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/jasondavies/couchdb/commit/9b24413a9cf7d128f988e1acd3ff695adb1b4d55 9b24413a9cf7d128f988e1acd3ff695adb1b4d55 2009-07-11T09:43:30-07:00 2009-07-11T09:43:30-07:00 tabs -> spaces, other whitespace git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@793199 13f79535-47bb-0310-9956-ffa450edef68 7adcad0312e3b31c1edbfa106a3c9891103161ef jan jan@13f79535-47bb-0310-9956-ffa450edef68 f45849f3e01aa4359b3891e8136ff29d35de27cb 8903a326d5d455472762a7938f940903b2e5bb40 Jason Davies jason@jdd.local http://github.com/jasondavies/couchdb/commit/b7b942a78273f2175a3555cc22c156e2ff1b633b b7b942a78273f2175a3555cc22c156e2ff1b633b 2009-07-10T11:39:49-07:00 2009-07-10T11:39:49-07:00 Merge branch 'jd-cookie-auth' of git://github.com/jchris/couchdb into cookie-auth Conflicts: share/www/script/test/security_validation.js src/couchdb/couch_httpd.erl src/couchdb/couch_httpd_misc_handlers.erl src/couchdb/couch_httpd_show.erl 804726fa3d314af7ec7c61ba7fbfdf7adb32f368 Jason Davies jason@jdd.local f924b7a92f378003c669354c6a88b67c07e03caa 14cae6402ed152fbf4c31142dea0aa47941e6f89 Chris Anderson jchris@grabb.it http://github.com/jasondavies/couchdb/commit/8903a326d5d455472762a7938f940903b2e5bb40 8903a326d5d455472762a7938f940903b2e5bb40 2009-07-10T11:34:23-07:00 2009-07-10T11:34:23-07:00 merge trunk into cookie-auth 61cef2fd6e1bb690a0495d183d53ee70abdf2d80 Chris Anderson jchris@grabb.it 4da7b94eb21e0a72e89c83a12a3ce8cbb2a844d2 jan jan@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/jasondavies/couchdb/commit/fda842e2bf1e898881af6aba40cc153d98000858 fda842e2bf1e898881af6aba40cc153d98000858 2009-07-10T07:17:54-07:00 2009-07-10T07:17:54-07:00 fix whitespace git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@792959 13f79535-47bb-0310-9956-ffa450edef68 f585bdb8db4c06bc7ef4ee8192a502e24227c460 jan jan@13f79535-47bb-0310-9956-ffa450edef68 231b7396243c84656c9080adfde22313682dd7ac jan jan@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/jasondavies/couchdb/commit/4da7b94eb21e0a72e89c83a12a3ce8cbb2a844d2 4da7b94eb21e0a72e89c83a12a3ce8cbb2a844d2 2009-07-10T05:48:41-07:00 2009-07-10T05:48:41-07:00 remove log statement git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@792931 13f79535-47bb-0310-9956-ffa450edef68 111c1cb1df63f727785c6d3a48f769dee40c8092 jan jan@13f79535-47bb-0310-9956-ffa450edef68 7b7aba5d8d1a74698d885cfc06260cdc47fd9be6 f924b7a92f378003c669354c6a88b67c07e03caa Jason Davies jason@jdd.local http://github.com/jasondavies/couchdb/commit/f45849f3e01aa4359b3891e8136ff29d35de27cb f45849f3e01aa4359b3891e8136ff29d35de27cb 2009-07-10T02:09:02-07:00 2009-07-10T02:09:02-07:00 Merge branch 'jd-cookie-auth' of git://github.com/jchris/couchdb into cookie-auth Conflicts: share/www/script/test/security_validation.js src/couchdb/couch_httpd_misc_handlers.erl e19b9449e45ec640830c9ca424a54c5c4b5d7ac9 Jason Davies jason@jdd.local cd7596790f7a963df5a88b718670e1a189d334b1 231b7396243c84656c9080adfde22313682dd7ac Jason Davies jason@jdd.local http://github.com/jasondavies/couchdb/commit/7b7aba5d8d1a74698d885cfc06260cdc47fd9be6 7b7aba5d8d1a74698d885cfc06260cdc47fd9be6 2009-07-10T01:59:01-07:00 2009-07-10T01:59:01-07:00 Merge branch 'master' into cookie-auth Conflicts: src/couchdb/couch_httpd_show.erl 7baf0088f579b126300f6551adaf1b48bd1a98cd Jason Davies jason@jdd.local f3b0cf6f38e4797816596054f4794add790cccc8 Chris Anderson jchris@grabb.it http://github.com/jasondavies/couchdb/commit/f924b7a92f378003c669354c6a88b67c07e03caa f924b7a92f378003c669354c6a88b67c07e03caa 2009-07-09T23:01:30-07:00 2009-07-09T23:01:30-07:00 create ddoc in erlang land 86f2ff4a439b4f3bc2a8bc1db0b9cf137eed7c14 Chris Anderson jchris@grabb.it c492d7b08c5b4bfb67613ef0e603db985ea11edc Chris Anderson jchris@grabb.it http://github.com/jasondavies/couchdb/commit/f3b0cf6f38e4797816596054f4794add790cccc8 f3b0cf6f38e4797816596054f4794add790cccc8 2009-07-09T22:40:11-07:00 2009-07-09T22:40:11-07:00 create design doc on users db 6ba0603f1afd437e51cb59213ecee4d918cf8740 Chris Anderson jchris@grabb.it 9bdc3de8c8669c7ba1b01d42878dd8d3758a2dcd Chris Anderson jchris@grabb.it http://github.com/jasondavies/couchdb/commit/c492d7b08c5b4bfb67613ef0e603db985ea11edc c492d7b08c5b4bfb67613ef0e603db985ea11edc 2009-07-09T20:03:51-07:00 2009-07-09T20:03:51-07:00 got cookie auth working with _session handler 1441ea85119d8499d7ed059083f88e23a697cc0d Chris Anderson jchris@grabb.it 1e902851ba28bffc084588c625513be23b37c484 Chris Anderson jchris@grabb.it http://github.com/jasondavies/couchdb/commit/9bdc3de8c8669c7ba1b01d42878dd8d3758a2dcd 9bdc3de8c8669c7ba1b01d42878dd8d3758a2dcd 2009-07-09T19:35:37-07:00 2009-07-09T19:35:37-07:00 handle session req bb0134516147b55744ce0d4c00a15243f8633fcb Chris Anderson jchris@grabb.it c3b964accf803e3fe48b45cea39a5c7d5ed2ad95 jchris jchris@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/jasondavies/couchdb/commit/231b7396243c84656c9080adfde22313682dd7ac 231b7396243c84656c9080adfde22313682dd7ac 2009-07-09T18:17:15-07:00 2009-07-09T18:17:15-07:00 fix attachment etags, thanks Mark Hammond for the test case. closes COUCHDB-386 git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@792774 13f79535-47bb-0310-9956-ffa450edef68 b0f9422b6da1476a0662840608418dbe92a08872 jchris jchris@13f79535-47bb-0310-9956-ffa450edef68 14cae6402ed152fbf4c31142dea0aa47941e6f89 jchris jchris@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/jasondavies/couchdb/commit/c3b964accf803e3fe48b45cea39a5c7d5ed2ad95 c3b964accf803e3fe48b45cea39a5c7d5ed2ad95 2009-07-09T17:59:36-07:00 2009-07-09T17:59:36-07:00 Apply patch from Benoit Chesneau's COUCHDB-404 Restores 0.8-style /db/_view view urls and adds an option to render views and documents as other formats like: /db/docid?show=blog/post /db/_view/blog/posts?list=index We're retaining the longer _design/appname paths as well because that resource is valuable for reverse proxies and rewriters. git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@792771 13f79535-47bb-0310-9956-ffa450edef68 9a0f6ac06d91d6bd70aee5d6f921665423139653 jchris jchris@13f79535-47bb-0310-9956-ffa450edef68 fa1bc845771597808e0105272574ae686df475c7 Chris Anderson jchris@grabb.it http://github.com/jasondavies/couchdb/commit/1e902851ba28bffc084588c625513be23b37c484 1e902851ba28bffc084588c625513be23b37c484 2009-07-09T17:16:31-07:00 2009-07-09T17:16:31-07:00 ensure user view exists ff41e84b1932518fbdee31737b8af18012312d71 Chris Anderson jchris@grabb.it 37a4fa0f1a045aa0da997261cc19f356056b7c1f 14cae6402ed152fbf4c31142dea0aa47941e6f89 Jason Davies jason@jdd.local http://github.com/jasondavies/couchdb/commit/cd7596790f7a963df5a88b718670e1a189d334b1 cd7596790f7a963df5a88b718670e1a189d334b1 2009-07-09T11:05:59-07:00 2009-07-09T11:05:59-07:00 Merge branch 'master' into cookie-auth 1705491c77ffd416f60bd0628a977711bc7e3e33 Jason Davies jason@jdd.local ab39014317d929bc257692eca558e96622fc7010 kocolosk kocolosk@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/jasondavies/couchdb/commit/14cae6402ed152fbf4c31142dea0aa47941e6f89 14cae6402ed152fbf4c31142dea0aa47941e6f89 2009-07-09T10:51:54-07:00 2009-07-09T10:51:54-07:00 fix and test for scrambling of large inline attachments git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@792618 13f79535-47bb-0310-9956-ffa450edef68 811682eae57fb9168c0dffb80b50b2bfc115594a kocolosk kocolosk@13f79535-47bb-0310-9956-ffa450edef68 44286a28dde68a6169ceeb89d1ab00125cd713d8 Chris Anderson jchris@grabb.it http://github.com/jasondavies/couchdb/commit/fa1bc845771597808e0105272574ae686df475c7 fa1bc845771597808e0105272574ae686df475c7 2009-07-09T10:27:45-07:00 2009-07-09T10:27:45-07:00 users db 87933fad83dd66a0cbd9db94617d732d7af68c55 Chris Anderson jchris@grabb.it 39423338a36af3365e6e98b39cce9c36fbf58018 ab39014317d929bc257692eca558e96622fc7010 Jason Davies jason@jdd.local http://github.com/jasondavies/couchdb/commit/37a4fa0f1a045aa0da997261cc19f356056b7c1f 37a4fa0f1a045aa0da997261cc19f356056b7c1f 2009-07-07T22:57:46-07:00 2009-07-07T22:57:46-07:00 Merge branch 'master' into cookie-auth 1263361416042a7f8323ae95da93b15a8e590e43 Jason Davies jason@jdd.local f1cdf9234a3793def6e2f68d1d141ae16584c310 9e1ad8e92219e051de161b154a6dc266a64d1732 Jason Davies jason@jdd.local http://github.com/jasondavies/couchdb/commit/39423338a36af3365e6e98b39cce9c36fbf58018 39423338a36af3365e6e98b39cce9c36fbf58018 2009-07-07T22:52:51-07:00 2009-07-07T22:52:51-07:00 Merge branch 'jd-cookie-auth' into cookie-auth Conflicts: CHANGES 913f7f06e70bd085bb587d233ebb8051696a0379 Jason Davies jason@jdd.local 681299f3cc026feb5afc742e9cea4324b3a3ea7c davisp davisp@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/jasondavies/couchdb/commit/ab39014317d929bc257692eca558e96622fc7010 ab39014317d929bc257692eca558e96622fc7010 2009-07-07T18:33:00-07:00 2009-07-07T18:33:00-07:00 Fixes COUCHDB-389 Provide an offset calculation for all view responses. Thanks Brad Anderson. git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@792013 13f79535-47bb-0310-9956-ffa450edef68 952b52231a0266bbe9db53a3043fd2adcc68e0da davisp davisp@13f79535-47bb-0310-9956-ffa450edef68 8bc662b8af43b5ba6f22a2ffd21a7b7c0b437a33 davisp davisp@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/jasondavies/couchdb/commit/681299f3cc026feb5afc742e9cea4324b3a3ea7c 681299f3cc026feb5afc742e9cea4324b3a3ea7c 2009-07-07T18:26:04-07:00 2009-07-07T18:26:04-07:00 Fixes COUCHDB-402 Thanks Mark Hammond git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@792010 13f79535-47bb-0310-9956-ffa450edef68 52cffc6f00d2edd8b189e4e045cbff32630cd3af davisp davisp@13f79535-47bb-0310-9956-ffa450edef68 b26c2dfed49791538a46890ef4ac91e9e1db5465 kocolosk kocolosk@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/jasondavies/couchdb/commit/8bc662b8af43b5ba6f22a2ffd21a7b7c0b437a33 8bc662b8af43b5ba6f22a2ffd21a7b7c0b437a33 2009-07-06T19:59:26-07:00 2009-07-06T19:59:26-07:00 fix deleted_conflicts qs parameter git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@791684 13f79535-47bb-0310-9956-ffa450edef68 573cd6d9679b2c5902b851b989772be6c6148351 kocolosk kocolosk@13f79535-47bb-0310-9956-ffa450edef68 350138823fe93d76d5f2a3f61765a77c8c6a4427 b26c2dfed49791538a46890ef4ac91e9e1db5465 Jason Davies jason@jdd.local http://github.com/jasondavies/couchdb/commit/9e1ad8e92219e051de161b154a6dc266a64d1732 9e1ad8e92219e051de161b154a6dc266a64d1732 2009-07-06T05:04:21-07:00 2009-07-06T05:04:21-07:00 Merge branch 'master' into jd-cookie-auth Conflicts: src/couchdb/couch_httpd.erl src/couchdb/couch_httpd_show.erl 355d41ae77832a2ae48f2cc95555491e4f9e9c9d Jason Davies jason@jdd.local 0441a8e734f764e55a2826277cb075f8a5fb8fb2 nslater nslater@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/jasondavies/couchdb/commit/b26c2dfed49791538a46890ef4ac91e9e1db5465 b26c2dfed49791538a46890ef4ac91e9e1db5465 2009-07-05T17:33:50-07:00 2009-07-05T17:33:50-07:00 trimmed trailing whitespace git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@791350 13f79535-47bb-0310-9956-ffa450edef68 fb48e605ceb8079d0195d3b1ec0eca7110fa7ef2 nslater nslater@13f79535-47bb-0310-9956-ffa450edef68 c81445dcb92f2301465b8761738a808d7a9dd840 nslater nslater@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/jasondavies/couchdb/commit/0441a8e734f764e55a2826277cb075f8a5fb8fb2 0441a8e734f764e55a2826277cb075f8a5fb8fb2 2009-07-05T09:49:38-07:00 2009-07-05T09:49:38-07:00 removed unused variable git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@791270 13f79535-47bb-0310-9956-ffa450edef68 0fbee1d8a19c40b94b31064fda5bb6a8aa5daba5 nslater nslater@13f79535-47bb-0310-9956-ffa450edef68 bf4b77ac6822f6f38fedaeb258824c4d8a43ba33 nslater nslater@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/jasondavies/couchdb/commit/c81445dcb92f2301465b8761738a808d7a9dd840 c81445dcb92f2301465b8761738a808d7a9dd840 2009-07-05T09:44:35-07:00 2009-07-05T09:44:35-07:00 create run dir on install git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@791269 13f79535-47bb-0310-9956-ffa450edef68 38500d199e732a0bba8c05fe196751ccaf897acc nslater nslater@13f79535-47bb-0310-9956-ffa450edef68