Partial hour events feature addition #164
Conversation
… This allow dynamic chart generation (e.g. from an existing html list or table)
Change in core.create to allow an object as source
… versions of jQuery also: added benefit of caching the variable.
Fixed hollydays typo - thanks @weyert
To use ID in bars new field "id" in JSON is required:
{"id": "b0", "from": "/Date(1320192000000)/", "to":
"/Date(1321401600000)/", "desc": "Id: 1<br/>Name: Planning <br/>Date:
2011-11-02 to 2011-11-16", "label": " Planni...", "customClass":
"ganttRed"}
Fix to year display at hours level
… taitems-master Conflicts: index.htm js/jquery.fn.gantt.js js/jquery.fn.gantt.min.js style.css
Removed trailing ,
Fixed hours bar IDs
Add class ganttGray
Fix syntax error. missing double quate.
Update style.css
fix weeks scale
… taitems-master Conflicts: css/style.css index.html js/jquery.fn.gantt.js js/jquery.fn.gantt.min.js
Conflicts: js/jquery.fn.gantt.js
Working on the remake of.. taitems#117
Much more accurate now but need to keep testing. taitems#117
Conflicts: index.html js/jquery.fn.gantt.js
This reverts commit 4648d10.
This reverts commit a1a417b.
This reverts commit 3c53bc1.
In an attempt to get back in sync with the server
This reverts commit 6097b9b.
…of the need for multiple branches, making things alot easier!
…w lines up with the remote dev version i need to pull request to.
|
One thing to note is that I forgot the minify the main file.... |
This is so i can work on the mins/sec zoom
|
Hi @smiller393! Thanks again for the pull request, though it seems to contain a TON of unrelated commits from many sources, and as you said, it's not based off the correct branch and can't be automatically merged. It would be best if you started a new branch (based off the dev branch) and then cherry-picked or manually applied your changes from your current branch. If it's too complicated to do cleanly I'll see what I can do, though it probably won't be very soon. In any case this feature is set to be in the next release, so it may just get implemented, by you or me or someone else. :] In the meantime, I'll close this PR, if you don't mind.. Thanks again! |
|
Hi @usmonster I did pull the wrong branch the first time around, but once I realized this i pulled the develop branch and cherry picked my changes into the new branch. The merge i did from develop to my working branch can be seen in the history. I'm not too sure what the extra commits are from. |
10 participants
This is an extension from #117
This feature has is fully working as seen in the test02 file that i added. Please let me know if anyone has any questions.