Merge in @OlegKi's JavaScript changes.

[bouks]

What's this about ? :)

[meh-uk]

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

[flack]

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:

https://github.com/OlegKi/jqGrid/commit/3ab18e9476aa24362996bedab0928ea38723772b

Next steps:

• [ ] manually merge OlegKi/jqGrid@3ab18e9476aa24362996bedab0928ea38723772b (conflicts with the search toolbar patch)
• [ ] manually merge OlegKi/jqGrid@aeb619246af73faa7a50678c7458a43df82554ff (conflicts with the datatype autodetection)
• [ ] port CSS changes up to OlegKi/jqGrid@3ab18e9476aa24362996bedab0928ea38723772b 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

[bouks]

This one :

https://github.com/OlegKi/jqGrid/commit/3ab18e9476aa24362996bedab0928ea38723772b

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

https://github.com/openpsa/grid.js/commit/da6a917e8b4c4e31a49ecb0c829f957092352218

and here :

https://github.com/openpsa/grid.js/commit/10b1cd7f1c4bad2426f88accaa42f704186e5a11

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

Considering this one :

https://github.com/OlegKi/jqGrid/commit/aeb619246af73faa7a50678c7458a43df82554ff

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

[meh-uk]

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.

[meh-uk]

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.

[flack]

I have done another ten now, next one will be OlegKi/jqGrid@1fabe170059d320b0526b8666d6101b18beedfe9

[flack]

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

[meh-uk]

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

[flack]

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

[bouks]

moving to : https://github.com/openpsa/grid.js/pull/50

[meh-uk]

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