Skip to content
This repository was archived by the owner on May 10, 2018. It is now read-only.

Moving controls to templateCache#304

Open
raphaelluchini wants to merge 5 commits into
revolunet:masterfrom
raphaelluchini:master
Open

Moving controls to templateCache#304
raphaelluchini wants to merge 5 commits into
revolunet:masterfrom
raphaelluchini:master

Conversation

@raphaelluchini
Copy link
Copy Markdown
Contributor

Moving controls inline html to $templateCache to be possible overwrite them

@revolunet
Copy link
Copy Markdown
Owner

Hey, nice addition thanks, but looks like you didnt work on the last master version ?
can you rebase please ?

…into revolunet-master

Conflicts:
	dist/angular-carousel.js
	dist/angular-carousel.min.js
@raphaelluchini
Copy link
Copy Markdown
Contributor Author

It's ok now?

@revolunet
Copy link
Copy Markdown
Owner

looks like some code is missing.

from your branch you should :

git remote add upstream https://github.com/revolunet/angular-carousel.git
git fetch upstream
git rebase upstream/master
git push

Julien Bouquillon and others added 3 commits April 21, 2015 11:48
Adds rn-carousel-default-index attribute
…rousel

Conflicts:
	dist/angular-carousel.js
	dist/angular-carousel.min.js
@raphaelluchini
Copy link
Copy Markdown
Contributor Author

Hello @revolunet, can you merge now? ;) Thanks

@revolunet
Copy link
Copy Markdown
Owner

looks like there is additional code, apart from the templateCache stuff ?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants