gitphp 0.2.9.1 :: disclosr.git/commitdiff

Merge branch 'master' of ssh://maxious.lambdacomplex.org/git/disclosr

Conflicts:
documents/genericScrapers.py

Former-commit-id: fd782edf0c10bd013c7246ec174f7a5696976167

247 files changed: (show all)
.gitmodules
about.php
admin/0203apsemployees.csv
admin/0304apsemployees.csv
admin/0405apsemployees.csv
admin/0506apsemployees.csv
admin/0607apsemployees.csv
admin/0708apsemployees.csv
admin/0809apsemployees.csv
admin/0910apsemployees.csv
admin/1011apsemployees.csv
admin/all-authorities.csv (new)
admin/ausbudget.csv (new)
admin/ausbudget/pg1.php
admin/ausbudget/pg10.php
admin/ausbudget/pg2.php
admin/ausbudget/pg3.php
admin/ausbudget/pg4.php
admin/ausbudget/pg5.php
admin/ausbudget/pg6.php
admin/ausbudget/pg7.php
admin/ausbudget/pg8.php
admin/ausbudget/pg9.php
admin/cacfma.csv
admin/exportAll.csv.php
admin/exportAusbudget.php (new)
admin/exportEmployees.csv.php
admin/genericAgencyFixer.php
admin/importAPSCEmployees.php
admin/importAPSCEmployees2012.php (new)
admin/importAusbudget.php
admin/importRTKbodies.php
admin/naa-agift.json
admin/refreshDesignDoc.php
admin/resolveConflicts.php
admin/validation.py
bubbletree.php (deleted)
budget.php (new)
couchdb/SetteeDatabase.class.php (deleted)
couchdb/settee (deleted)
couchdb/settee/.travis.yml (new)
couchdb/settee/LICENSE.txt (new)
couchdb/settee/README.textile (new)
couchdb/settee/examples/db.ops.php (new)
couchdb/settee/examples/doc.ops.php (new)
couchdb/settee/src/classes/SetteeDatabase.class.php (new)
couchdb/settee/src/classes/SetteeRestClient.class.php (new)
couchdb/settee/src/classes/SetteeServer.class.php (new)
couchdb/settee/src/settee.php (new)
couchdb/settee/tests/README (new)
couchdb/settee/tests/SetteeDatabaseTest.php (new)
couchdb/settee/tests/SetteeRestClientTest.php (new)
couchdb/settee/tests/SetteeServerTest.php (new)
couchdb/settee/tests/SetteeTestCase.class.php (new)
couchdb/settee/tests/phpunitConfig.xml (new)
couchdb/settee/tests/resources/couch-logo.jpg (new)
couchdb/settee/tests/resources/couch-logo.pdf (new)
couchdb/settee/tests/resources/couch-logo.png (new)
couchdb/settee/tests/resources/couch-tag.ini (new)
couchdb/settee/tests/resources/couch-tag.xml (new)
css/bootstrap-responsive.css (new)
css/bootstrap-responsive.min.css (new)
css/bootstrap.css (new)
css/bootstrap.min.css (new)
documents/.gitignore (new)
documents/404.html
documents/about.php (new)
documents/agency.php (new)
documents/charts.php
documents/crossdomain.xml
documents/datagov.py (new)
documents/date.php (new)
documents/disclogsList.php
documents/disclosr-documents.nja (new)
documents/exportAll.csv.php (new)
documents/gazette.py (new)
documents/genericScrapers.py
documents/img/feed-icon-14x14.png (new)
documents/index.php
documents/redirect.php
documents/robots.txt
documents/rss.xml.php
documents/run.bat
documents/runScrapers.sh (new)
documents/scrape.py
documents/scrapers/0049d35216493c545ef5f7f000e6b252.py (new)
documents/scrapers/00a294de663db69062ca09aede7c0487.py (new)
documents/scrapers/0324e4b1654fd6dd651307abcef67094.py (new)
documents/scrapers/0372b19123076338d483f624c433727b.txt (new)
documents/scrapers/0603dfcc930a791efaa64f31ae5fceda.py (new)
documents/scrapers/0ae822d1a748e60d90f0b79b97d5a3e5.py (new)
documents/scrapers/0ced9dd2de36100c3cabdb7fd8e843a9.py (new)
documents/scrapers/0e46f8bd1414b1fdd4f0543d54a97500.py (new)
documents/scrapers/1097fa8afdcf5db89d212d0979226667.py (new)
documents/scrapers/157cbe654bdaa0a48e6650152ae34489.py
documents/scrapers/1803322b27286950cab0c543168b5f21.py (new)
documents/scrapers/1ad74ca88932f90f0b92b69387171441.py (new)
documents/scrapers/1d404c4934f74feacd00dcb434e7c10a.py (new)
documents/scrapers/1fda9544d2a3fa4cd92aec4b206a6763.py (new)
documents/scrapers/227cb6eb7d2c9f8a6e846df7447d6caa.py
documents/scrapers/24bd71114d3975ed9a63ad29624c62c9.py (new)
documents/scrapers/269680be088f3d8e663251655f3825b4.py (new)
documents/scrapers/2cac2cd1f42687db2d04fa20b5b6a538.py (new)
documents/scrapers/31685505438d393f45a90f442b8fa27f.py (new)
documents/scrapers/31b7c75cf484747b6b120680bddd33b0.py (new)
documents/scrapers/329fccdca068b78ab7edd550e2957398.py (new)
documents/scrapers/38ca99d2790975a40dde3fae41dbdc3d.py (new)
documents/scrapers/3b54190e3f409380e109fae29e1917aa.py (new)
documents/scrapers/3cd40b1240e987cbcd3f0e67054ce259.py
documents/scrapers/3d426eb8c85c8f04b814eee597efd866.py (new)
documents/scrapers/3d5871a44abbbc81ef5b3a420070755d.py (new)
documents/scrapers/3e2f110af49d62833a835bd257771ffb.py (new)
documents/scrapers/41a166419503bb50e410c58be54c102f.py (new)
documents/scrapers/4934000fddd6a5b1094f398798341290.py (new)
documents/scrapers/4c57389dda9bd454bcb08bc1e5ed87bf.txt (new)
documents/scrapers/4d2af2dcc72f1703bbf04b13b03720a8.py (new)
documents/scrapers/50601505ef69483121a6d130bb0515e4.txt (new)
documents/scrapers/525c3953187da08cd702359b2fc2997f.py (new)
documents/scrapers/53b14397c8f27c29ff07b6319f7a0ec5.py (new)
documents/scrapers/53d2884f8afd026096a27bd5051ec50e.py (new)
documents/scrapers/54cbb3439276062b7a9f007f9f69d1f6.py (new)
documents/scrapers/55b69726fde4b4898ecf6d7217d1d1d2.py (new)
documents/scrapers/5716ce0aacfe98f7d638b7a66b7f1040.py (new)
documents/scrapers/5d05365e981d87e746b596d63e35b1dc.py (new)
documents/scrapers/601aedeef4344638d635bdd761e9fdba.py (new)
documents/scrapers/627f116dfe42c9f27ad6747be0aa44e2.py (new)
documents/scrapers/649b053f5e2884906ddc7174c2cd4b38.py (new)
documents/scrapers/655d4d67333536bda18d68265dfe7e80.py (new)
documents/scrapers/656f7bb1884f4b9d31ebe2a5f5f58064.txt (new)
documents/scrapers/65ec17101b00519e6d88c5a9f33c2c46.py (new)
documents/scrapers/69d59284ef0ccd2677394d82d3292abc.py (new)
documents/scrapers/6ac74a939f420c6194ae29224809734a.py (new)
documents/scrapers/6afdde1d4ff1ad8d8cfe1a8675ea83bd.py (new)
documents/scrapers/6cf3870aedeeecfd6394b5c0abed4c55.py (new)
documents/scrapers/6fa04af95fbe7de96daa2c7560e0aad3.py (new)
documents/scrapers/6fe3c812a99d486963133459b2768cf6.py (new)
documents/scrapers/72a295f10734d64e8185f651fd2b39ea.txt (new)
documents/scrapers/734f12db07e844b30cd11dc98500f2ce.py (new)
documents/scrapers/75d8f1c605ef9da0c2590264b7aa046b.py (new)
documents/scrapers/768bbbfb34115873af361af8519b38a9.py (new)
documents/scrapers/77f02f713e3c37bff73882fb90828379.py (new)
documents/scrapers/794ea270edc9aa4f70f2a84bbc5ecc7a.py (new)
documents/scrapers/795c33ed030293dbdb155c909ea47e37.py
documents/scrapers/795e7a8afb39a420360aa207b0cb1306.py (new)
documents/scrapers/7b39ce7f362a0af9a711eaf223943eea.py (new)
documents/scrapers/7c6adc1d41cf029bf1a0959e5156477a.py (new)
documents/scrapers/7ec28d7d97fcf493b1350acd03e3642e.py (new)
documents/scrapers/7f55a3c42ad7460254906aa043a6e324.py (new)
documents/scrapers/8317df630946937864d31a4728ad8ee8.py (new)
documents/scrapers/8796220032faf94501bd366763263685.py (new)
documents/scrapers/8aae1c28db7f3ce10f232a0137be6bb2.py (new)
documents/scrapers/8c9421f852c441910bf1d93a57b31d64.py
documents/scrapers/8e874a2fde8aa0ccdc6d14573d766540.py (new)
documents/scrapers/8ef0e5802f99800f514b3a148e013b75.py (new)
documents/scrapers/905a1c409b6afb1de0074b13a5559560.py (new)
documents/scrapers/9282306e244040c9e4ae5705f06f9548.py (new)
documents/scrapers/93ce83e46f5c2c4ca1b7f199b59b4bd2.py (new)
documents/scrapers/955dc4cb047b5439dfb65549ce2696a6.py (new)
documents/scrapers/99328d76c8efb56ff3f1da79b9d1b17f.txt (new)
documents/scrapers/9961dc45e046288ad1431941653af20c.py (new)
documents/scrapers/9f4815bfdcb918a036e4bb43a30f8d77.py (new)
documents/scrapers/9f5cd66dea3e2ec958c17e28b27e60a7.txt (new)
documents/scrapers/a1ab9c80ab473958676c62c1a25dd502.py (new)
documents/scrapers/a2d871c5d28de1dde8a3b66c4957e1a5.py (new)
documents/scrapers/a43467fe82b840a353b380c4d7462a4c.py (new)
documents/scrapers/a687a9eaab9e10e9e118d3fd7cf0e13a.py (new)
documents/scrapers/ad033512610d8e36886ab6a795f26561.py (new)
documents/scrapers/b0a3281ba66efe173c5a33d5ef90ff76.py (new)
documents/scrapers/b0fb402314e685238537105ee0e70c84.py (new)
documents/scrapers/b506b87c8ee9e3a7ea8007914078c741.py (new)
documents/scrapers/b7770c4584332cff42bb6abb3326e564.py (new)
documents/scrapers/b91f866928eb61959dbbab56313214fc.py (new)
documents/scrapers/bb96fe4065afb7e0872136dd657f9369.py (new)
documents/scrapers/bb96fe4065afb7e0872136dd657f9369.txt (deleted)
documents/scrapers/bc91b878e2317fa231cc2c512e2027f0.py (new)
documents/scrapers/bf16d4ba0d306ee03e5a1d32aaba3da1.py (new)
documents/scrapers/bf6e587f166040b63681cd2ff76fbfdf.py (new)
documents/scrapers/c1302c8d7cbbd911f0d4d8a4128f8079.txt (new)
documents/scrapers/c25f628f9f38d889485d7a4bff873b23.py (new)
documents/scrapers/c414e65ed728d05307d5b27f13e195e1.py (new)
documents/scrapers/c43ca6780764f4e61918e8836be74420.py
documents/scrapers/c57c0bf315ce5977e730905707a2f6a3.py (new)
documents/scrapers/c57c0bf315ce5977e730905707a2f6a3.txt (deleted)
documents/scrapers/cb7f40e3495b682de6eee61bf09c1cfc.py (new)
documents/scrapers/cca17a34bd490474a316fe0a1ca03c25.py (new)
documents/scrapers/cde8eb4a2e40abb18d8b28d3b85bc9b0.py (new)
documents/scrapers/ce34d1e9b55911e4272d2d388821f311.py (new)
documents/scrapers/d1296c366287f7a9faedf235c7e6df01.py (new)
documents/scrapers/d72744fb1e5d6e87af9a5ea16cc27fa5.py (new)
documents/scrapers/dae7e934f1c341ccc9547a89a8af917e.py (new)
documents/scrapers/dfd7414bb0c21a0076ab559901ae0588.py
documents/scrapers/e0614dc3a9e25d375370ffd82f7165ac.py (new)
documents/scrapers/e2a845e55bc9986e6c75c5ad2c508b8d.py
documents/scrapers/e64c71f4986f78675a252104c5a5f359.py (new)
documents/scrapers/e770921522a49dc77de208cc724ce134.py (new)
documents/scrapers/e90b1b7cbb83e3eed0b5f849c7e3af79.py (new)
documents/scrapers/ee30aad97f0bb32e74c4587404b67ce4.py (new)
documents/scrapers/f0caafbcf292c90e7b8ad18ddcf9afc3.py (new)
documents/scrapers/f189459fc43f941e0d4ecfba52c666f3.py (new)
documents/scrapers/f2ab2908d8ee56ed8d995ef4187e75e6.py
documents/scrapers/f5ce2d1651739704634eb8ca4b2b46d3.py (new)
documents/scrapers/fa9b3badd6c686398c1c6982a4b02475.py (new)
documents/scrapers/rtk.py
documents/scrapers/run.bat
documents/search.php
documents/sitemap.xml.php (new)
documents/template.inc.php
documents/view.php (new)
documents/viewDocument.php
getAgency.php
headcount.php (new)
images/misc/button-gloss.png (deleted)
images/misc/button-overlay.png (deleted)
images/misc/custom-form-sprites.png (deleted)
images/misc/input-bg.png (deleted)
images/misc/modal-gloss.png (deleted)
images/misc/table-sorter.png (deleted)
images/orbit/bullets.jpg (deleted)
images/orbit/left-arrow.png (deleted)
images/orbit/loading.gif (deleted)
images/orbit/mask-black.png (deleted)
images/orbit/pause-black.png (deleted)
images/orbit/right-arrow.png (deleted)
images/orbit/rotator-black.png (deleted)
images/orbit/timer-black.png (deleted)
img/glyphicons-halflings-white.png (new)
img/glyphicons-halflings.png (new)
include/common.inc.php
include/couchdb.inc.php
include/template.inc.php
js/foundation.js (deleted)
lib/Color.php
lib/FeedItem.php (deleted)
lib/FeedWriter.php (deleted)
lib/FeedWriter/COPYING (new)
lib/FeedWriter/FeedItem.php (new)
lib/FeedWriter/FeedTypes.php (new)
lib/FeedWriter/FeedWriter.php (new)
lib/FeedWriter/README (new)
lib/FeedWriter/examples/example_atom.php (new)
lib/FeedWriter/examples/example_minimum.php (new)
lib/FeedWriter/examples/example_rss1.php (new)
lib/FeedWriter/examples/example_rss2.php (new)
nbproject/project.properties
stylesheets/app.css (deleted)
stylesheets/foundation.css (deleted)
stylesheets/ie.css (deleted)

file:a/.gitmodules -> file:b/.gitmodules

[submodule "couchdb/couchdb-lucene"]	[submodule "couchdb/couchdb-lucene"]
path = couchdb/couchdb-lucene	path = couchdb/couchdb-lucene
url = https://github.com/rnewson/couchdb-lucene.git	url = https://github.com/rnewson/couchdb-lucene.git
[s