search

jaunesarmiento / fries

Fries helps you prototype Android apps using HTML, CSS, and JavaScript.
MIT License
1.55k stars 222 forks source link

Merge master & themes/holo-light branches and fix some minor JS errors. #93

Closed eyecatchup closed 10 years ago

eyecatchup commented 10 years ago

As discussed in #90

jaunesarmiento commented 10 years ago

Ahh this is gonna be tough. Do you mind merging on your branch?

eyecatchup commented 10 years ago

Nope, all I care for is the result. ;-)

But just for me to know: any conflicts or what do you mean by "this is gonna be tough"?

jaunesarmiento commented 10 years ago

The conflicts I mean. With 54 files changed, I think the number of conflicts would be tough to merge.

eyecatchup commented 10 years ago

Actually it's not 54 files that were changed! Most of these 54 files are the holo-light files that were not in the main repo before. Thus, they become a "change". But in fact these "changes" are just plain copies from the holo-light branch.

And finally I had no conflicts at all when I just tried to merge your wip 2.1 and my dev-2.0.4 branch locally. So, what conflicts do you get?

jaunesarmiento commented 10 years ago

Can you check if the dialogs and toast notifications work on the documentation and examples?

jaunesarmiento commented 10 years ago

I think the latest fingerblast.js may have caused the dialogs and toasts to break.