Skip to content

Partial hour events feature addition #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 55 commits into from
Closed

Partial hour events feature addition #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
ebe7478
The change in core.create function allow to load an object as source.…
eneasgesing Jan 9, 2012
bf4038d
Merge pull request #16 from eneasgesing/patch-1
mbielanczuk Jan 9, 2012
02eb131
Fixed Bug #10. Psuedoselectors were failing on more recent versions o…
Feb 8, 2012
a30a251
Merge pull request #19 from dkatten/master
mbielanczuk Feb 22, 2012
b054621
Fix for #21
mbielanczuk Feb 22, 2012
f054288
Fix for #21
mbielanczuk Feb 23, 2012
6535863
Fixed the typo hollydays -> holidays in the code
Apr 20, 2012
90d9e57
Reverted back to the Polish
Apr 20, 2012
72d119f
Fixed the typo in the `style.css` file
Apr 20, 2012
ce3c1c1
Merge pull request #23 from weyert/master
mbielanczuk May 21, 2012
4cb77db
Added ID to bars
mbielanczuk May 26, 2012
6a6b880
Added dependences #2
mbielanczuk Aug 30, 2012
2f99fa9
Fix to year display at hours level
Dec 7, 2012
cbf15de
Merge pull request #26 from colmprunty/master
mbielanczuk Jan 31, 2013
1857efb
Merge branch 'master' of https://github.com/taitems/jQuery.Gantt into…
mbielanczuk Jan 31, 2013
b6547a7
Dependecies are temporary disabled.
mbielanczuk Jan 31, 2013
6edaaab
Old style.css was remowed.
mbielanczuk Jan 31, 2013
86c18a5
fix for jquery 1.9
Mar 2, 2013
54b24e4
Prevent the plugin to init if there's no data and add callback.
mcavallo Mar 27, 2013
4f7ceff
Added triple comparison and typeof comparison against a string.
mcavallo Mar 28, 2013
9b80584
Fix syntax error. missing double quate.
ryoco Apr 3, 2013
2eae216
Merge branch 'master' of git://github.com/mcavallo/jQuery.Gantt
Korri Apr 25, 2013
ec5c5ad
Recompiled minified version
Korri Apr 25, 2013
623b69f
Merge branch 'master' of git://github.com/karambol/jQuery.Gantt
Korri Apr 25, 2013
d4e4166
Removed useless width: 100% was messing with the padding
Korri Apr 25, 2013
892102d
Added condition to ensure a minimum width
Korri Apr 25, 2013
f730978
Added condition to ensure a minimum width
Korri Apr 25, 2013
ef07523
Removed left margin was causing a bug with day and hour scale
Korri Apr 25, 2013
b49d803
Round time to hour for hour display
Korri Apr 25, 2013
40771f3
Update jquery.fn.gantt.js
easterism Aug 29, 2013
8d15d8d
fix weeks scale
kichawa Dec 18, 2013
052aaa4
Update style.css
alessandrocalu Aug 28, 2014
a184ea3
Update index.html
alessandrocalu Aug 28, 2014
5b7b8cc
Merge pull request #29 from ryoco/fixHtmlSyntax
mbielanczuk Sep 6, 2014
65f8f3c
Merge pull request #34 from Korri/master
mbielanczuk Sep 6, 2014
9c30f38
Merge pull request #44 from alessandrocalu/patch-1
mbielanczuk Sep 6, 2014
8af2b82
Merge pull request #42 from kichawa/master
mbielanczuk Sep 6, 2014
9d53dfb
Merge branch 'master' of https://github.com/taitems/jQuery.Gantt into…
mbielanczuk Sep 6, 2014
c8395f6
Merge branch 'taitems-master'
mbielanczuk Sep 6, 2014
bb8b70b
Merge branch 'patch-1' of https://github.com/easterism/jQuery.Gantt
mbielanczuk Sep 6, 2014
0911469
Have event accuracy change mostly working in Test02
smiller393 Dec 8, 2014
20dcd0d
Further work on the event divs, and comments added
smiller393 Dec 9, 2014
5802cc2
minor fixes
smiller393 Dec 12, 2014
4648d10
Tests added to Test02.html
smiller393 Dec 12, 2014
715c393
Merge remote-tracking branch 'taitemsDev/develop'
smiller393 Dec 12, 2014
a1a417b
Revert "Tests added to Test02.html"
smiller393 Dec 12, 2014
0d8d638
Revert "Revert "Tests added to Test02.html""
smiller393 Dec 12, 2014
0919f13
Revert "Merge remote-tracking branch 'taitemsDev/develop'"
smiller393 Dec 15, 2014
3c53bc1
Merge branch 'master' of C:\GitHub\jQuery.Gantt with conflicts.
smiller393 Feb 3, 2015
59be09d
Revert "Merge branch 'master' of C:\GitHub\jQuery.Gantt with conflicts."
smiller393 Feb 3, 2015
6097b9b
changing back this last commit
smiller393 Feb 3, 2015
9a03b72
Revert "changing back this last commit"
smiller393 Feb 3, 2015
529fc88
Added a dev version of the main gantt.js script, this should get rid …
smiller393 Feb 3, 2015
0fd9b0d
Have new version of Gantt.js file that is working/tested, and also no…
smiller393 Feb 3, 2015
1534d33
Adding jqueryGanttDEV file as a copy of the orig.
smiller393 Feb 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
.DS_Store
.idea/
*.iml
17 changes: 17 additions & 0 deletions .project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>jQuery.Gantt</name>
<comment>jQuery gantt chart</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
3 changes: 3 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
eclipse.preferences.version=1
encoding//js/jquery.fn.gantt.js=UTF-8
encoding//js/jquery.fn.gantt.min.js=UTF-8
36 changes: 32 additions & 4 deletions css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@
line-height: 24px;
margin-left: -1px;
}
.fn-gantt .row.header {
margin-left: 0;
}

.fn-gantt .leftPanel .fn-label {
display: inline-block;
Expand Down Expand Up @@ -110,6 +107,7 @@
background-position: 24px 24px;
position: relative;
}

.fn-gantt .day, .fn-gantt .date {
overflow: visible;
width: 24px;
Expand Down Expand Up @@ -224,20 +222,50 @@
color: #778461 !important;
}

.fn-gantt .ganttGray {
background-color: #CCCCCC;
}
.fn-gantt .ganttGray .fn-label {
color: #626184 !important;
}

.fn-gantt .ganttOrange {
background-color: #FCD29A;
}
.fn-gantt .ganttOrange .fn-label {
color: #714715 !important;
}

.fn-gantt .depLine {
background-color: transparent;
position: absolute;
z-index: 9999;
}

.fn-gantt .depLineSh {
margin-top: 2px;
margin-left: 2px;
opacity: 0.3;
}

.fn-gantt .depStart, .fn-gantt .depEnd {
position: absolute;
width: 5px;
height: 5px;
-webkit-border-radius: 50%;
-moz-border-radius: 50%;
border-radius: 50%;
border: 2px solid #fff;
-webkit-box-shadow: 1px 1px 1px 0px #444;
box-shadow: 1px 1px 1px 0px #444;
z-index: 10001;
}

/* === BOTTOM NAVIGATION === */

.fn-gantt .bottom {
clear: both;
background-color: #f6f6f6;
width: 100%;
}
.fn-gantt .navigate {
border-top: 1px solid #DDD;
Expand Down
Loading