Merge in @OlegKi's JavaScript changes. about jsgrid HOT 12 CLOSED

What's this about ? :)

from jsgrid.

Just making sure the issue we have discussed the most as being urgent is actually tracked.

from jsgrid.

Yes, having a ticket for this makes it a lot easier to handle (compared to random mails). The JS changes are currently synched up to (but not including) this one:

free-jqgrid/jqGrid@3ab18e9

Next steps:

• manually merge free-jqgrid/jqGrid@3ab18e9 (conflicts with the search toolbar patch)
• manually merge free-jqgrid/jqGrid@aeb6192 (conflicts with the datatype autodetection)
• port CSS changes up to free-jqgrid/jqGrid@3ab18e9 to LESS (since #30 seems to have decided we keep LESS)

After, I would propose we wait for @OlegKi's documentation of his changes, because we need to keep our documentation in sync

from jsgrid.

This one :

free-jqgrid/jqGrid@3ab18e9

was a change i did, it was committed by me here :

da6a917

and here :

10b1cd7

So the Oleg's mentionned commit merge must be avoided.

Considering this one :

free-jqgrid/jqGrid@aeb6192

There is no real conflict as autodetection doesn't care about it.

from jsgrid.

I'm starting this now, and it's heavy going, practically every commit conflicts, @OlegKi please can you stop making changes to your old branch and start making them from a new fork of this project? It isn't going to be possible for us to merge any more of your changes otherwise.

from jsgrid.

OK I've done the first ten or so commits and created pull #50. But it took ages to do even that small a number.

from jsgrid.

I have done another ten now, next one will be free-jqgrid/jqGrid@1fabe17

from jsgrid.

P.S.: We still need to update the documentation for changed defaults & such

from jsgrid.

See the release notes file I created yesterday, it has the language file changes.

from jsgrid.

Yes, I saw. So we need to update the release notes and the options.md page

from jsgrid.

moving to : #50

from jsgrid.

Added #57 earlier, and now #60 so all of the JavaScript changes should now be merged.

from jsgrid.