Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
Commits on Feb 02, 2012
@kaleworsley kaleworsley Adding vagrant, bundler, and foreman. 3a5a261
Commits on Feb 13, 2012
@kaleworsley kaleworsley Merge remote branch 'origin/vagrant_config' c34b7c0
@kaleworsley kaleworsley Merge branch 'upstream' e65a5b2
@kaleworsley kaleworsley Merge branch 'upstream' eba19a4
Commits on Feb 14, 2012
@patrickdavey patrickdavey gender added to user model. 8764f22
@patrickdavey patrickdavey Merge pull request #1 from nzbrn/add_gender_to_user_model
Add gender to user model
b88fef9
@kaleworsley kaleworsley Configure default map positions. 01d1748
@kaleworsley kaleworsley Merge pull request #2 from nzbrn/map_config
Configure default map positions.
6468a72
@patrickdavey patrickdavey adding birth year to user model 5269246
@patrickdavey patrickdavey adding the spec test for year of birth 211c23e
@patrickdavey patrickdavey adding the migration file omitted in original c146752
@kaleworsley kaleworsley Merge pull request #3 from nzbrn/add_year_to_user
Add year to user
fbb582c
@kaleworsley kaleworsley Configure priority time zones. 8c0e69b
@patrickdavey patrickdavey Merge pull request #4 from nzbrn/timezone_config
Timezone config
2a65226
@kaleworsley kaleworsley Moving ActiveSupport::TimeZone to the bottom of environment.rb. 94491a1
@patrickdavey patrickdavey adding firstname and lastname fields, test spec 66deb82
@kaleworsley kaleworsley Merge pull request #6 from nzbrn/first_and_last_names
First and last names
08c1cf8
@kaleworsley kaleworsley Adding address to users. b36e025
@patrickdavey patrickdavey Merge pull request #8 from nzbrn/add_address_to_user
Add address to user
93f07a2
Commits on Feb 15, 2012
@patrickdavey patrickdavey adding the phone number model 7a09c36
@kaleworsley kaleworsley Merge pull request #9 from nzbrn/add_telephone_numbers
Add telephone numbers
710800c
Commits on Feb 16, 2012
@patrickdavey patrickdavey ability for admins to toggle a user as deceased. Done through the cur…
…ate page
e83bf87
@kaleworsley kaleworsley Merge pull request #10 from nzbrn/add_deceased_to_user
Add deceased to user
829a5b6
@patrickdavey patrickdavey user preferences added. Displaying fields 0404456
@kaleworsley kaleworsley Merge pull request #11 from nzbrn/add_user_preferences
Add user preferences (Fixes #7)
fa6b431
@patrickdavey patrickdavey adding pro status to user and model method check 42a2200
@kaleworsley kaleworsley Merge pull request #13 from nzbrn/pro_user_role
Pro user role
320a8fc
Commits on Feb 20, 2012
@patrickdavey patrickdavey adding boolean types to pro fieldset 838ccbf
@patrickdavey patrickdavey Merge pull request #14 from nzbrn/add_boolean_datatype_to_observation…
…_fields

Add boolean datatypes to observation fields
6a98565
@kaleworsley kaleworsley Merge branch 'upstream' 70c99ad
@patrickdavey patrickdavey adding the observation method field to pro fieldse c29adb8
@patrickdavey patrickdavey Merge pull request #15 from nzbrn/observation_method
Observation method
b27da86
@patrickdavey patrickdavey adding substrate fields to pro fieldset c4e8233
@patrickdavey patrickdavey Merge pull request #16 from nzbrn/substrate_fields
Substrate fields
c848719
Commits on Feb 21, 2012
@kaleworsley kaleworsley Fxing helptip javascript bug. 499add3
@kaleworsley kaleworsley Adding user expertise self-assesment. e90eff0
@patrickdavey patrickdavey Merge pull request #17 from nzbrn/expertise_self_assessment
Self Assessment = Genius ;)
7dbf78a
Commits on Feb 22, 2012
@patrickdavey patrickdavey adding the home region field 87f18eb
@patrickdavey patrickdavey Merge pull request #18 from nzbrn/add_home_region_to_users
Add home region to users
f77eb30
Commits on Feb 23, 2012
@kaleworsley kaleworsley Adding NZBRN logos. 7428ff0
@kaleworsley kaleworsley Merge pull request #20 from nzbrn/nzbrn_branding
NZBRN branding
c842197
Commits on Feb 26, 2012
@kaleworsley kaleworsley Removing unused gems and hoptoad. 15f09ac
@patrickdavey patrickdavey Merge pull request #21 from nzbrn/remove_old_gems
Remove old gems
fda2922
@kaleworsley kaleworsley Merge branch 'upstream' d95f0f3
Commits on Feb 28, 2012
@kaleworsley kaleworsley Merge branch 'upstream' 25b33ad
@kaleworsley kaleworsley Commenting out db_setup in the puppet manifest. 6c78a82
Commits on Feb 29, 2012
@kaleworsley kaleworsley Merge branch 'upstream' 3654072
Commits on Mar 05, 2012
@patrickdavey patrickdavey removing columns which aren't needed any more dcbce2e
@kaleworsley kaleworsley Merge pull request #22 from nzbrn/removing_fields
Removing fields
04b748c
@kaleworsley kaleworsley Updating schema. 41b36e5
Commits on Mar 06, 2012
@patrickdavey patrickdavey adding the time to the string f936335
@patrickdavey patrickdavey Merge pull request #23 from nzbrn/make_time_for_time
Make time for time
e674952
Commits on Mar 07, 2012
@patrickdavey patrickdavey adding number_observed to observations 3482ec7
@kaleworsley kaleworsley Merge pull request #24 from nzbrn/add_number_to_observations
Add number to observations
cc3869a
@patrickdavey patrickdavey adding sex to observations 4996fd1
@kaleworsley kaleworsley Merge pull request #25 from nzbrn/add_sex_to_observations
Add sex to observations
dd68868
@patrickdavey patrickdavey adding sought but not found as a boolean bdec9ad
@kaleworsley kaleworsley Merge pull request #26 from nzbrn/add_sought_not_found_to_observation
Add sought not found to observation
94515d9
@patrickdavey patrickdavey adding cultivated to the observations 9307d2c
@kaleworsley kaleworsley Merge pull request #27 from nzbrn/add_cultivated_to_observation
Add cultivated to observation
8d16f05
Commits on Mar 08, 2012
@patrickdavey patrickdavey basic stage information added, javascript filtering needed bfdc8b0
Commits on Mar 09, 2012
@patrickdavey patrickdavey commenting out the filtering until Javascript is working
adding the  validation of stage into observation.  Might need to work with
the virtual attributes also
dbcc9a8
@kaleworsley kaleworsley Merge pull request #28 from nzbrn/add_stage_to_observation
Add stage to observation
a5de338
@patrickdavey patrickdavey adding the users experience to the observation bbaefcd
Commits on Mar 12, 2012
@kaleworsley kaleworsley Merge pull request #29 from nzbrn/save_experience_to_observation
Save experience to observation
62cffb6
Commits on Mar 13, 2012
@patrickdavey patrickdavey small tidy ups - text size and phone numbers 329f5b2
@kaleworsley kaleworsley Merge pull request #30 from nzbrn/small_tidy_up
Small tidy up
85d7919
Commits on Apr 11, 2012
@kaleworsley kaleworsley Add legacy field to user. b2dba85
@kaleworsley kaleworsley Merge. 9952dc0
Commits on Apr 12, 2012
@patrickdavey patrickdavey adding the Gemfile.lock 23f4bdb
@patrickdavey patrickdavey removing sqlite bf5e352
@patrickdavey patrickdavey using sendmail as default 66c4d0c
@patrickdavey patrickdavey Rakefile updated for latest rake, removing koala 6d99bf7
@patrickdavey patrickdavey removing the group for dev and test c5eb75c
@patrickdavey patrickdavey rewriting the Capfile. Deploy working now. Needs thinking sphinx and …
…delayed_job
1b3f2bf
@patrickdavey patrickdavey adding the delayed job tasks. Seems to start 3accf8e
Commits on Apr 15, 2012
@patrickdavey patrickdavey removing the symlink of cached files 50208e4
Commits on Apr 16, 2012
@patrickdavey patrickdavey adding sphinx back in again d58644d
Commits on Apr 18, 2012
@kaleworsley kaleworsley Javascript error. 93fed30
@kaleworsley kaleworsley Add legacy to observation. 74d8225
@kaleworsley kaleworsley Add nzor source. 8d7701c
@kaleworsley kaleworsley Serialize legacy. 46d9e9b
Commits on Apr 24, 2012
@patrickdavey patrickdavey adding the elsif for the taxon guess 5129d23
Commits on May 03, 2012
@patrickdavey patrickdavey removing the api key from teh static map b3506b2
Kale Worsley Adding Exception notifications. ed55ad0
Kale Worsley Set production log level to debug. f31f54b
@patrickdavey patrickdavey adding the gemfile 92096dd
Commits on May 15, 2012
@kaleworsley kaleworsley Adding s3_host config setting. 1d664b3
@kaleworsley kaleworsley Hide mobile app links. b4311dd
Commits on Jun 12, 2012
@kaleworsley kaleworsley Rejigger deploy. 0019457
Commits on Jun 13, 2012
@kaleworsley kaleworsley Fix git repo. 010b7fc
@kaleworsley kaleworsley Add NZBRN sources. 27a0e9d
@kaleworsley kaleworsley Merging in upstream. 9e9d728
@kaleworsley kaleworsley Remove mail_view and hoptoad. efa8746
@kaleworsley kaleworsley Tweak caching for staging. 006baf2
Commits on Aug 22, 2012
@patrickdavey patrickdavey splitting name providers into their own directory d18b4a9
@patrickdavey patrickdavey basic checkin of the nzor - clone of catalogue of life for the moment a8c92c7
@patrickdavey patrickdavey first find test passing - bad functionality though d285e7b
@patrickdavey patrickdavey removing space to get rid of warning 5b7cc51
Commits on Aug 23, 2012
@patrickdavey patrickdavey part way through nzor adaptor cf121ee
@patrickdavey patrickdavey merging all of jons changes. Possible issue with flicker tag a1cf31f
@kaleworsley kaleworsley Merge pull request #37 from nzbrn/merging_jons_changes
merging all of jons changes.  Possible issue with flicker tag
b2cd217
Commits on Aug 24, 2012
@patrickdavey patrickdavey adding the nzturewatch iconic taxa images 6f1d178
@patrickdavey patrickdavey interim commit before Kale starting work 5abea69
@patrickdavey patrickdavey add TaxonNameAdapter tests passing. d901158
@patrickdavey patrickdavey backing out the catalogue_of_life mistake 24d9c76
Commits on Aug 26, 2012
@patrickdavey patrickdavey changing to Partial name for the taxon name 1925047
@patrickdavey patrickdavey footer changes from Jon b6a6023
@patrickdavey patrickdavey removing Ubio code which shouldn't be in here bdeacfd
Commits on Aug 27, 2012
@patrickdavey patrickdavey get lineage and get phylum basically working 47f4332
Commits on Aug 28, 2012
@patrickdavey patrickdavey updating tests for lineage 1558fb3
@patrickdavey patrickdavey going from common to specific names 9ba8167
@patrickdavey patrickdavey removing trailing whitespace 971e89a
Commits on Aug 29, 2012
@patrickdavey patrickdavey fixing error with duplicate taxa being saved for grafted taxa 23a6316
@patrickdavey patrickdavey adding the subgenus - genus mapping 149ba56
Commits on Aug 30, 2012
@kaleworsley kaleworsley Find existing taxa in NZORTaxonAdapter, validate unique source identi…
…fiers.
7ac2f17
@patrickdavey patrickdavey Merge pull request #38 from nzbrn/nzor
NZOR integration
c4dd298
Commits on Sep 10, 2012
@patrickdavey patrickdavey allowing nil for the source_identifier (needed for manually imported …
…taxa) also better handling of existing taxa names
cc137ad
Commits on Sep 11, 2012
@kueda kueda cherry picking 18abe99
Taxa and TaxonNames should be valid without sources and source identifiers.

Conflicts:

	app/models/taxon.rb
	app/models/taxon_name.rb
660aee5
@kueda kueda Made sure Ratatosk uses more generic name providers by default. 67f4fbd
@kueda kueda Moved name provider specs into their own files. a128984
Commits on Sep 12, 2012
@kueda kueda Bugfix: restored CoL accepted name parsing, added API repsonse fixtures. 44d6645
@kueda kueda cherry picking 0dc7c02
Made name providers configurable.

Conflicts:

	config/config.yml.example
a03ec4c
@patrickdavey patrickdavey adding subgenus, removing naming provider magic for the moment 623cdd9
Commits on Sep 17, 2012
@patrickdavey patrickdavey adding CoL and uBio back in to name providers c090bec
Commits on Sep 19, 2012
@patrickdavey patrickdavey quick change for colours d37fe9f
@patrickdavey patrickdavey changing text color to colour ca92898
Commits on Sep 20, 2012
@patrickdavey patrickdavey swapping out logo fca15b9
Commits on Sep 23, 2012
@patrickdavey patrickdavey two changes of hard links to naturewatch 7bc2d13
Commits on Sep 24, 2012
@patrickdavey patrickdavey transparent background images from Jon 8c74816
Commits on Oct 10, 2012
@patrickdavey patrickdavey updating the endpoint for COL 520a214