Log Paging - Githubissues

linwiz / Raspberry-Pi-Web-GPIO

PHP script to control Raspberry PI GPIO pins from the web

GNU General Public License v3.0

4 stars 1 forks source link

Log Paging #21

Closed Paku- closed 9 years ago

Paku- commented 9 years ago

This is first step of the Log Paging functionality. I'm creating this pull request as it seems to me you are going to move ajax folder, I expect some merge problems (hope there will be no problems ...) If you can pls merge this before merging your Ajax branch (so moving folders).

If you can't just reject this pull.

Changes:

two config directives added:

//UI configuration $logPaging=10; //lines per screen $debugMode=1; //enable UI debug output
little code moving and cleaning.

Paku- commented 9 years ago

I can see you added most of changes and assume Ajax branch is the one I should work on now ???

linwiz commented 9 years ago

That is correct.

Paku- commented 9 years ago

The problem started here, it should be merged into new ajax branch. Could be it was my fault as I should choose other branch as destination. Anyway for now our temp master is ajax but both of us should use other branches for work any just merge when some part is done. You may create the new "login" branch so at any time both of us will be able to merge something new to ajax.There is alway kind of master you start from and merge the work results back.

linwiz commented 9 years ago

So is it safe to merge my login branch into the ajax branch?