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.

Sign up for GitHub

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

Jump to bottom

Feature/iii 1012: changes for places as actor #22

Merged
merged 20 commits into from
Jun 21, 2016
Merged

Feature/iii 1012: changes for places as actor #22

merged 20 commits into from
Jun 21, 2016

Conversation

nleroy
Copy link
Contributor

@nleroy nleroy commented Jun 14, 2016

No description provided.

bramcordie and others added 18 commits May 24, 2016 10:50
@bramcordie
III-1012: Add cdbid to location label when creating an event from a p…
5a082b9 
…lace actor
@bramcordie
III-1012: Fix code styling
d6b4986
@bramcordie
Merge branch '2.2' into feature/III-1012
bd080e5
@bertramakers
III-1012: Use a default location label if none found.
f626eeb
@nleroy
Merge remote-tracking branch 'origin/2.2' into feature/III-1012
f49d830
@nleroy
III-1012: Change position of keywords to respect alphabetic order
eae7983
@nleroy
III-1012: Fix appending calendar summary to an actor cdbxml
7ba8cb0
@nleroy
III-1029: Add setAsset function to set the asset attribute
f46d0dd
@nleroy
III-1029: Update composer.lock
aa2f08f
@nleroy
III-1029: MAke sure to add the asset attribute on an actor
61fc06e
@nleroy
III-1029: An event doesn't have tha asset attribute
83aa927
@nleroy
III-1029: Add ActorFactory with tests
5ec3f5b
@nleroy
III-1029: Fix asset attribute
7113d88
@nleroy
III-1029: Make sure actortype Locatie is always present on an actor
a7ce258
@nleroy
III-1029: Add locationaddress to contactinfo if no contactinfo is ava…
1dabc9d 
…ilable
@nleroy
III-1029: Fix coding standards
5ce5f27
@bertramakers
III-1012: Make sure calendar is permanent before we try to get the we…
b10998b 
…ekScheme from it.
@bertramakers
Merge branch 'feature/III-1012' of https://github.com/cultuurnet/Cdb …
f6a25e6 
…into feature/III-1012

* 'feature/III-1012' of https://github.com/cultuurnet/Cdb:
  III-1029: Fix coding standards
@coveralls
Copy link

coveralls commented Jun 14, 2016 •
edited
Loading

Coverage Status

Coverage increased (+1.03%) to 63.598% when pulling 5ce5f27 on feature/III-1012 into 1ae139a on 2.2.

@coveralls
Copy link

coveralls commented Jun 14, 2016 •
edited
Loading

Coverage Status

Coverage increased (+1.06%) to 63.623% when pulling f6a25e6 on feature/III-1012 into 1ae139a on 2.2.

@bertramakers
III-1012: Fix 5.4 compatibility.
6071dfa
@bertramakers
Merge branch 'feature/III-1012' of https://github.com/cultuurnet/Cdb …
e98ee97 
…into feature/III-1012

* 'feature/III-1012' of https://github.com/cultuurnet/Cdb:
  III-1012: Make sure calendar is permanent before we try to get the weekScheme from it.
@coveralls
Copy link

coveralls commented Jun 14, 2016 •
edited
Loading

Coverage Status

Coverage increased (+1.07%) to 63.636% when pulling e98ee97 on feature/III-1012 into 1ae139a on 2.2.

@bertramakers bertramakers merged commit 17b2bb9 into 2.2 Jun 21, 2016
@bertramakers bertramakers deleted the feature/III-1012 branch June 21, 2016 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nleroy @coveralls @bertramakers @bramcordie