Closed SimonGoring closed 11 years ago
Thanks Simon. I pulled these changes but had to resolve some conflicts. All pushed now (let me know if anything is off).
On Tuesday, June 11, 2013 at 8:28 PM, Simon wrote:
I figured out how to use roxygen properly now, and I updated the help files. You can merge this Pull Request by running git pull https://github.com/SimonGoring/neotoma master Or view, comment on, or merge it at: https://github.com/ropensci/neotoma/pull/11 Commit Summary Changed function names, functions to indiv. files. Changed get_download to return a better data object. Removed "collate" in description Minor fixes & updated help files
File Changes A .Rhistory (https://github.com/ropensci/neotoma/pull/11/files#diff-0) (291) M .Rproj.user/51D02258/pcs/source-pane.pper (https://github.com/ropensci/neotoma/pull/11/files#diff-1) (2) A .Rproj.user/51D02258/sdb/prop/1C14F0BF (https://github.com/ropensci/neotoma/pull/11/files#diff-2) (3) A .Rproj.user/51D02258/sdb/prop/2EAA19E8 (https://github.com/ropensci/neotoma/pull/11/files#diff-3) (3) A .Rproj.user/51D02258/sdb/prop/4A8E471A (https://github.com/ropensci/neotoma/pull/11/files#diff-4) (3) A .Rproj.user/51D02258/sdb/prop/57B2BE0 (https://github.com/ropensci/neotoma/pull/11/files#diff-5) (3) A .Rproj.user/51D02258/sdb/prop/58F03E7F (https://github.com/ropensci/neotoma/pull/11/files#diff-6) (3) A .Rproj.user/51D02258/sdb/prop/663E1CFC (https://github.com/ropensci/neotoma/pull/11/files#diff-7) (2) A .Rproj.user/51D02258/sdb/prop/739DC2FC (https://github.com/ropensci/neotoma/pull/11/files#diff-8) (3) A .Rproj.user/51D02258/sdb/prop/EDE4DE32 (https://github.com/ropensci/neotoma/pull/11/files#diff-9) (3) M .Rproj.user/51D02258/sdb/prop/INDEX (https://github.com/ropensci/neotoma/pull/11/files#diff-10) (8) D .Rproj.user/51D02258/sdb/s-3BEC534/55C46D14 (https://github.com/ropensci/neotoma/pull/11/files#diff-11) (15) A .Rproj.user/51D02258/sdb/s-EAD215B1/AC71BB42 (https://github.com/ropensci/neotoma/pull/11/files#diff-12) (15) R .Rproj.user/51D02258/sdb/s-EAD215B1/lock_file (https://github.com/ropensci/neotoma/pull/11/files#diff-13) (0) A .Rproj.user/92E4FBEE/build_options (https://github.com/ropensci/neotoma/pull/11/files#diff-14) (4) A .Rproj.user/92E4FBEE/pcs/files-pane.pper (https://github.com/ropensci/neotoma/pull/11/files#diff-15) (9) A .Rproj.user/92E4FBEE/pcs/packages-pane.pper (https://github.com/ropensci/neotoma/pull/11/files#diff-16) (7) A .Rproj.user/92E4FBEE/pcs/source-pane.pper (https://github.com/ropensci/neotoma/pull/11/files#diff-17) (3) A .Rproj.user/92E4FBEE/pcs/windowlayoutstate.pper (https://github.com/ropensci/neotoma/pull/11/files#diff-18) (14) A .Rproj.user/92E4FBEE/pcs/workbench-pane.pper (https://github.com/ropensci/neotoma/pull/11/files#diff-19) (4) A .Rproj.user/92E4FBEE/persistent-state (https://github.com/ropensci/neotoma/pull/11/files#diff-20) (9) A .Rproj.user/92E4FBEE/sdb/prop/2E0DB044 (https://github.com/ropensci/neotoma/pull/11/files#diff-21) (2) A .Rproj.user/92E4FBEE/sdb/prop/2F9202A0 (https://github.com/ropensci/neotoma/pull/11/files#diff-22) (2) A .Rproj.user/92E4FBEE/sdb/prop/4A07114E (https://github.com/ropensci/neotoma/pull/11/files#diff-23) (2) A .Rproj.user/92E4FBEE/sdb/prop/6B6810B9 (https://github.com/ropensci/neotoma/pull/11/files#diff-24) (2) A .Rproj.user/92E4FBEE/sdb/prop/753B6E08 (https://github.com/ropensci/neotoma/pull/11/files#diff-25) (2) A .Rproj.user/92E4FBEE/sdb/prop/A189E20C (https://github.com/ropensci/neotoma/pull/11/files#diff-26) (2) A .Rproj.user/92E4FBEE/sdb/prop/AE5605CF (https://github.com/ropensci/neotoma/pull/11/files#diff-27) (2) A .Rproj.user/92E4FBEE/sdb/prop/B29E9856 (https://github.com/ropensci/neotoma/pull/11/files#diff-28) (2) A .Rproj.user/92E4FBEE/sdb/prop/BD96E0B9 (https://github.com/ropensci/neotoma/pull/11/files#diff-29) (2) A .Rproj.user/92E4FBEE/sdb/prop/C02B23B7 (https://github.com/ropensci/neotoma/pull/11/files#diff-30) (2) A .Rproj.user/92E4FBEE/sdb/prop/C0399486 (https://github.com/ropensci/neotoma/pull/11/files#diff-31) (2) A .Rproj.user/92E4FBEE/sdb/prop/F7BD6E09 (https://github.com/ropensci/neotoma/pull/11/files#diff-32) (2) A .Rproj.user/92E4FBEE/sdb/prop/INDEX (https://github.com/ropensci/neotoma/pull/11/files#diff-33) (12) A .Rproj.user/92E4FBEE/sdb/s-CD84E1A5/B782D3CC (https://github.com/ropensci/neotoma/pull/11/files#diff-34) (15) A .Rproj.user/92E4FBEE/sdb/s-CD84E1A5/D5F210EF (https://github.com/ropensci/neotoma/pull/11/files#diff-35) (15) M DESCRIPTION (https://github.com/ropensci/neotoma/pull/11/files#diff-36) (8) M NAMESPACE (https://github.com/ropensci/neotoma/pull/11/files#diff-37) (16) D R/base.functions.R (https://github.com/ropensci/neotoma/pull/11/files#diff-38) (806) A R/get_contacts.R (https://github.com/ropensci/neotoma/pull/11/files#diff-39) (113) A R/get_datasets.R (https://github.com/ropensci/neotoma/pull/11/files#diff-40) (190) A R/get_download.R (https://github.com/ropensci/neotoma/pull/11/files#diff-41) (116) A R/get_publications.R (https://github.com/ropensci/neotoma/pull/11/files#diff-42) (111) A R/get_sites.R (https://github.com/ropensci/neotoma/pull/11/files#diff-43) (125) A R/get_table.R (https://github.com/ropensci/neotoma/pull/11/files#diff-44) (90) A R/get_taxa.R (https://github.com/ropensci/neotoma/pull/11/files#diff-45) (106) M RNeotoma.Rproj (https://github.com/ropensci/neotoma/pull/11/files#diff-46) (1) D man/get.download.Rd (https://github.com/ropensci/neotoma/pull/11/files#diff-47) (67) R man/get_contacts.Rd (https://github.com/ropensci/neotoma/pull/11/files#diff-48) (56) R man/get_datasets.Rd (https://github.com/ropensci/neotoma/pull/11/files#diff-49) (10) A man/get_download.Rd (https://github.com/ropensci/neotoma/pull/11/files#diff-50) (76) R man/get_publication.Rd (https://github.com/ropensci/neotoma/pull/11/files#diff-51) (12) R man/get_sites.Rd (https://github.com/ropensci/neotoma/pull/11/files#diff-52) (10) R man/get_table.Rd (https://github.com/ropensci/neotoma/pull/11/files#diff-53) (8) R man/get_taxa.Rd (https://github.com/ropensci/neotoma/pull/11/files#diff-54) (10) A s-CD84E1A5/lock_file b/.Rproj.user/92E4FBEE/sdb/s-CD84E1A5/lock_file (https://github.com/ropensci/neotoma/pull/11/files#diff-55) (0)
Patch Links: https://github.com/ropensci/neotoma/pull/11.patch https://github.com/ropensci/neotoma/pull/11.diff
I figured out how to use roxygen properly now, and I updated the help files.