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

feat(datepicker): add i18n support for bar buttons in popup #925

Closed
wants to merge 1 commit into from

Conversation

bekos
Copy link
Contributor

@bekos bekos commented Aug 31, 2013

No description provided.

@bekos
Copy link
Contributor Author

bekos commented Sep 3, 2013

Rebased over current master & added tests.

@bekos
Copy link
Contributor Author

bekos commented Sep 8, 2013

@pkozlowski-opensource Is there something bothering you about this one?

@pkozlowski-opensource
Copy link
Member

@bekos oh, I've just missed this one :-(

If anything bothers me at the moment is the fact that we start to work on 2 branches in parallel :-)

@bekos
Copy link
Contributor Author

bekos commented Sep 8, 2013

After 0.6 settles we can have just one branch :-)
Anyway, bootsrap3 branch has mostly template changes, I believe there will be no big problem merging.

@pkozlowski-opensource
Copy link
Member

Yeh, I'm happy that 0.6.0 is out of the doors, I wanted to get $modal to the world, plus we've got number of bug fixes ready.

As for merges, in fact there is also quite a number of changes in JS and previous rebases were a bit painful so we need to find a better way. I'm going to create a new issue for this so we can discuss. But I guess we should just make a new branch for BS2.3 maintanance and switch efforts to BS3 (I mean, work on BS3 off the master). But yeh, let's discuss it together.

@bekos
Copy link
Contributor Author

bekos commented Sep 21, 2013

@pkozlowski-opensource Sorry for the noise. Can you review this one? Is the problem the merge with bs3 branch?

@pkozlowski-opensource
Copy link
Member

@bekos sorry for the delay, I'm traveling right now, will be fully operational in 2 weeks time... But I've got access to the internet from time to time so will try to review your 2 PRs in a day or two.

@bekos
Copy link
Contributor Author

bekos commented Sep 21, 2013

@pkozlowski-opensource OK, thx, I understand. I can do the merging if you want.

@pkozlowski-opensource
Copy link
Member

@bekos sure, go ahead

@bekos
Copy link
Contributor Author

bekos commented Sep 21, 2013

Landed as c6ba8d7.

@bekos bekos closed this Sep 21, 2013
@bekos
Copy link
Contributor Author

bekos commented Sep 21, 2013

@pkozlowski-opensource Merged as it was a pretty straight-forward change. #924 I will wait for your critique :-)

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