summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6 from themouette/fix-issue-139HEADorigin/masterorigin/HEADmasterJohn Rayes2015-08-251-4/+3
|\ | | | | Fix: issue #139
| * Fix: issue #139kphoen2012-05-201-4/+3
| |
* | Merge pull request #5 from TuiKiken/masterJohn Rayes2015-08-251-0/+30
|\ \ | | | | | | Drag ignores freeBusy fix
| * | Drag ignores freeBusy fixValentin Shevko2012-07-201-0/+30
| | | | | | | | | | | | Fixed ignoring of freeBusy areas when dragging and resizing events. Fixed bug with userId in some cases.
* | | Fix multi day event rendering ↵John Rayes2015-08-251-0/+1
| | | | | | | | | | | | https://github.com/themouette/jquery-week-calendar/pull/153
* | | Merge pull request #4 from bksunday/patch-1John Rayes2015-08-251-0/+8
|\ \ \ | | | | | | | | account for EST/EDT in _updateDayColumnHeader
| * | | account for EST/EDT in _updateDayColumnHeaderAnthony2012-10-161-0/+8
| | | | | | | | | | | | in _updateDayColumnHeader, if one day started as EST and ended as EDT, one endDate in $weekDayColumns would not have the correct timezone.
* | | | Merge pull request #3 from rnicoll/masterJohn Rayes2015-08-251-2/+2
|\ \ \ \ | | | | | | | | | | Replaced use of jQuery.browser with feature detection, for compatibil…
| * | | | Replaced use of jQuery.browser with feature detection, for compatibility ↵unknown2013-02-081-2/+2
| |/ / / | | | | | | | | | | | | with jQuery 1.9 and above
* | | | Merge pull request #1 from IgorDePaula/masterJohn Rayes2015-08-251-1/+1
|\ \ \ \ | |/ / / |/| | | Removed unnecessary pixel
| * | | Removed unnecessary pixelIgor C. de Paula2015-07-031-1/+1
|/ / /
* | | Merge pull request #131 from pablogd/header-disableKévin Gomez2012-07-231-0/+2
|\ \ \ | |/ / |/| | Added showHeader option to completely disable header (including buttons)
| * | Added showHeader option to completely disable header (including buttons)Pablo Gomez Duro2012-04-161-0/+2
| | |
* | | Fix: the element argument for the eventDrag() callback was undefinedKévin Gomez Pinto2012-06-151-18/+19
| | |
* | | Merge pull request #147 from kuahyeow/patch-1Kévin Gomez2012-06-061-1/+1
|\ \ \ | |_|/ |/| | Setting options that re-render kills all current events
| * | Fix bug where "this" should refer to the element in iteration Thong Kuah2012-06-041-1/+1
|/ / | | | | | | | | Instead of using $.map where this refers to the window, we use $(elements).map, which will map this to the element that we want
* | Chg: render the hourLine after eventsKévin Gomez Pinto2012-05-021-11/+12
| |
* | Fix: the hourline did not consider the start and end business hourskphoen2012-04-302-3/+10
| |
* | Add: current time indicator (closes #57)kphoen2012-04-283-89/+130
| |
* | Cleaned a bit the demos codeKévin Gomez Pinto2012-04-277-823/+803
| |
* | Fix: an incorrect check for the number of rendered events prevented the ↵Kévin Gomez Pinto2012-04-271-83/+84
| | | | | | | | noEvents option to be called in some cases
* | Fix: _cleanDate was not able to parse numerical values in strings objects ↵kphoen2012-04-262-33/+34
| | | | | | | | (fixes #103)
* | Merge pull request #133 from crevillo/_title-is-not-defined-errorKévin Gomez2012-04-211-4/+4
|\ \ | | | | | | Fixed _title is not defined error
| * | Fixed _title is not defined errorCarlos Revillo2012-04-211-4/+4
|/ /
* | Fix: an incorrect check prevented to use a function to define a calendar's titleKévin Gomez Pinto2012-04-201-16/+21
| |
* | Fix: some performance improvements for event delegationKévin Gomez Pinto2012-04-161-17/+19
|/
* Merge branch 'fix-issue-130'Kévin Gomez Pinto2012-04-061-19/+32
|\
| * Revert "Ghost event when dropping"Kévin Gomez Pinto2012-04-051-1/+1
| | | | | | | | This reverts commit 6d0ee9cfb4c9de1ae6dc2e901adfea9a9c8ba1cb.
| * Fix: Regression: Undefined calEvent Error on Drag and Drop (closes #130)kphoen2012-04-041-18/+31
|/
* Merge pull request #110 from jdarwood007/masterKévin Gomez2012-04-041-0/+7
|\ | | | | Mouseover events did not always trigger
| * Mouseover events did not always triggerJeremy D2011-12-151-1/+8
| |
* | Merge pull request #128 from sucotronic/masterKévin Gomez2012-03-301-3/+3
|\ \ | | | | | | fixes issues #124 and #125
| * | Ghost event when droppingFelix Genicio Calvo2012-03-301-1/+1
| | |
| * | eventResize call reorderFelix Genicio Calvo2012-03-301-2/+2
|/ /
* | Fix: bug when trying to update a freebusy which was not represented in the ↵Kévin Gomez Pinto2012-02-101-1/+1
|/ | | | calendar (no visible placeholder)
* Merge pull request #80 from shakerlxxv/masterJulien MUETTON2011-12-083-2/+56
|\ | | | | Add event delete feature
| * update demo to show use of event delete optionsBrian Shaver2011-09-171-0/+29
| |
| * add feature to allow events to be deletedBrian Shaver2011-09-172-2/+27
| |
* | Merge pull request #99 from nnarhinen/patch-1Julien MUETTON2011-12-081-2/+7
|\ \ | | | | | | Allow preventing event creation in beforeEventNew
| * | Allow preventing event creation in beforeEventNewNiklas Närhinen2011-11-091-2/+7
|/ /
* | Merge pull request #94 from dittodhole/masterJulien MUETTON2011-10-311-3/+1
|\ \ | | | | | | minor code optimization & fixed wrong adaption of endDate of multiday-events
| * | fixed wrong adaption of endDate of multiday-eventsdittodhole2011-10-191-1/+1
| | |
| * | minor code optimizationdittodhole2011-10-191-2/+0
| | |
* | | Merge pull request #91 from robotdan/masterJulien MUETTON2011-10-281-91/+91
|\ \ \ | |/ / |/| | Enable 4 tests in 'Default Options' test, and convert tests to use deepCopy over same.
| * | same is depricated. Update to deepCopy.unknown2011-10-241-90/+91
| | |
| * | Fix four failing test cases that had been commented out.unknown2011-10-241-6/+5
|/ /
* | Merge pull request #82 from adammeghji/masterJulien MUETTON2011-09-221-2/+4
|\ \ | | | | | | Bugfix when multiday events span Sunday at midnight
| * | Bugfix when multiday events spanned Sunday at midnight, since JS getDay() ↵Adam Meghji2011-09-151-2/+4
| |/ | | | | | | wraps from 6 -> 0
* | Fix: another fix for #55Kévin Gomez Pinto2011-09-191-1/+1
|/
* fix #55Julien MUETTON2011-08-271-1/+4
| | | | modified: jquery.weekcalendar.js
* Add: a "beforeEventNew" eventKévin Gomez Pinto2011-07-121-1/+14
| | | | modified: jquery.weekcalendar.js
* Merge pull request #71 from jlew/masterJulien MUETTON2011-06-231-0/+7
|\ | | | | Fix bug with buttons = false option
| * Fixed bug with buttons = false option.jlew2011-06-191-0/+7
| | | | | | | | | | | | | | | | Elsewhere in the code was expecting the title header that was built by the button render function which got disabled with buttons = false. Added an else clause to put just the header back to make the system happy.
* | Merge pull request #67 from xnopre/masterJulien MUETTON2011-06-232-2/+138
|\ \ | |/ |/| New option "totalEventsWidthPercentInOneColumn"
| * Add new option to specify total overlapped events width in percent to allow ↵Xavier2011-05-252-2/+138
|/ | | | | | | | | to allow small space on the right to create new event - Add new option "totalEventsWidthPercentInOneColumn" with default value = 100 (100%) for compatibility - Setting this option to 95 (for example) with allowCalEventOverlap=true will let small space on the right of overlapped events (5% width) - This small space allow user to create new event during overlapped events - Demo file weekcalendar_demo_4.html added to show this new feature
* Typo fixludovic2011-05-022-20/+19
|
* Merge branches 'Issue-63' and 'master'ludovic2011-05-020-0/+0
|
* fixed #63ludovic2011-05-022-4/+4
|
* test for #49ludovic2011-05-021-0/+1
|
* updated test message for date parsingJulien MUETTON2011-05-021-12/+12
|
* Merge pull request #62 from powermick/patch-1.Julien MUETTON2011-05-021-2/+2
|\ | | | | fix call of private func to public
| * fix time format for added event windowpowermick2011-05-011-2/+2
|/
* Fixed new Date() to a static Dateludovic2011-04-271-9/+9
|
* Merge branches 'Issue-49' and 'master'ludovic2011-04-220-0/+0
|
* test for #49ludovic2011-04-221-0/+137
|
* fixed #49 + typo fixludovic2011-04-221-4/+6
|
* added date format testsJulien MUETTON2011-04-221-4/+42
|
* Merge branches 'gh-pages' and 'master'ludovic2011-04-220-0/+0
|\
| * Merge branches 'master' and 'gh-pages' into gh-pagesJulien MUETTON2011-04-211-2/+10
| |\
| * \ Merge branches 'master' and 'gh-pages' into gh-pagesJulien MUETTON2011-04-2129-458/+3997
| |\ \
| * \ \ Merge branch 'master' into gh-pagesJulien MUETTON2011-02-1814-499/+947
| |\ \ \
| * \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2011-02-175-24/+43
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2011-02-171-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2011-02-172-55/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2011-02-172-1653/+1737
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: jquery.weekcalendar.js
| * \ \ \ \ \ \ \ Merge branch 'gh-pages' of git@github.com:themouette/jquery-week-calendar ↵Julien MUETTON2010-12-031-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gh-pages
| | * \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-09-094-13/+29
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-09-081-3/+6
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-08-311-3/+5
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-08-021-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-08-021-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-07-291-4/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-07-281-20/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-07-281-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-07-221-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-07-191-7/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-06-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-06-249-30/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-06-235-41/+50
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-06-219-115/+271
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-06-181-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-06-181-6/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-06-161-2/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-06-151-5/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-06-152-185/+183
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-06-151-262/+132
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-06-021-9/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-06-021-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-06-021-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into gh-pagesJulien MUETTON2010-06-021-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-05-10 16:57:33 +0000