search

keplerproject / orbit

Orbit is an MVC web framework for Lua.
http://keplerproject.github.io/orbit/
118 stars 35 forks source link

Proposal for a new Orbit 2.2.1 release ... #23

Closed kognix closed 10 years ago

kognix commented 10 years ago

This pull request contains many small fixes to Orbit, documentation and samples such that it works with the latest versions of WSAPI (1.6) and other dependency modules that no longer use the Lua 5.1 package model.

Its goal is to allow installation of Orbit from Luarocks for users running Lua 5.1 with all samples running and clean, updated documentation. I have tested all* samples with 5.1.5 and wsapi-xavante. Will test fastcgi loader with nginx later but have no concerns at this time.

Prerequisites: Cosmo patch #6 WSAPI patch #30

Any feedback welcome!

kognix commented 10 years ago

P.S. I've updated all of the English documentation, but not the Portuguese... I'm not qualified there... adjudar! ;-)

hishamhm commented 10 years ago

Yay, thanks!

There seems to be a merging conflict though. Could you take a look at that? (I'm along the original keplerproject committers but I'm not really the Orbit or WSAPI maintainer, I know next to nothing about those projects.)

The Portuguese docs are very out-of-date, and I don't think no one has the time/disposition to bring them up to date -- they only existed before because it was a requirement due to Kepler being government-funded back in the day, but since no one is working on these modules for hire anymore, I don't think there's motivation to maintain these translations... we should probably retire them.

kognix commented 10 years ago

My pleasure :-)

I can't see the merging conflict since I'm only a contributor to Orbit master, and not a member of the core keplerproject team... just getting back into it after a few years' absence. But thanks so much for your commitment in pulling some important updates of late!

As an English-born Scotsman now living in Sweden with an Italian partner, I think it's sad to drop a translation ... but I take your point ... let's retire the /br docs.

How can I review the merge conflict?

petsagouris commented 10 years ago

@kognix make sure you have pulled the latest from the master branch and try to rebase the changes in this pull request. A conflict should pop up, there is no other way to test (I haven't tested it myself).

mascarenhas commented 10 years ago

Merged manually. I also fixed a few remaining uses of require without an assignment inside src. There are still places in the docs and samples where it is assumed that require changes the global environment, though.