Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project collections #17

Closed
wants to merge 62 commits into from
Closed

Project collections #17

wants to merge 62 commits into from

Conversation

jamirali
Copy link
Contributor

@jamirali jamirali commented Feb 4, 2015

Use ala-web-theme v1.1.0 and ala-auth-plugin v1.0.0

chrisala and others added 30 commits November 25, 2014 08:36
Fixed an indexing issue, now both active and completed status are indexe...
Homepage carousel functionality
Added custom mapping to ES.
…gAustralia/ecodata into project_collections

Conflicts:
	models/habitatHectaresLandscapeContext/dataModel.json
	models/programs-model.json
chrisala and others added 29 commits February 10, 2015 10:46
Conflicts:
	grails-app/conf/BuildConfig.groovy
	grails-app/domain/au/org/ala/ecodata/Project.groovy
	grails-app/services/au/org/ala/ecodata/ElasticSearchService.groovy
	models/activities-model.json
	models/activityAttachments/dataModel.json
	models/gaDesktopAuditChecklist/dataModel.json
	models/gaMonthlyReportData/dataModel.json
	models/gaParticipantDetails/dataModel.json
	models/habitatHectaresLandscapeContext/dataModel.json
	models/programs-model.json
	models/smallGrantAquittal/dataModel.json
	models/smallGrantOutputs/dataModel.json
	models/vicHabHaV2-nativeSpecies/dataModel.json
…collections

Conflicts:
	grails-app/conf/BuildConfig.groovy
	models/habitatHectaresLandscapeContext/dataModel.json
	models/programs-model.json
Added some models & scripts.
Removed the auth call that returns the full user list.
Syncing fieldcapture-dev models with git.
Updated the ehcache plugin to allow a cache name to be specified.
Conflicts:
	models/tasvegSiteCondition/dataModel.json
Organisation reporting bulk download and upload functionality
Project search and service provider changes.
@chrisala chrisala closed this Mar 16, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants