Skip to content
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

Jump to bottom

Resize Month Events and Resize Week/Day Events on Both Ends #578

Merged
merged 50 commits into from
Jan 12, 2018
Merged

Resize Month Events and Resize Week/Day Events on Both Ends #578

Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
d498d63
Fix incorrect destructuring of eventComponent in DayColumn#renderEvents
jnmandal May 20, 2017
06e8eb4
Pass through an event component with a resize anchor
jnmandal May 20, 2017
dbeb301
Make resize anchor draggable
jnmandal May 20, 2017
0d2208a
Make resize anchor droppable
jnmandal May 20, 2017
587cd1c
Use isOver prop to resize
jnmandal May 20, 2017
ec059ae
Rename and refactor
jnmandal May 20, 2017
b0c2c74
Correct alignment of entire anchor and not just icon
jnmandal May 21, 2017
e44034b
Differentiate between drag and drop callback fires
jnmandal May 21, 2017
c84f2a4
Add example code for using the resizable event feature
jnmandal May 21, 2017
7d3c6df
Rename ResizableEventComponent -> ResizableEvent
jnmandal May 21, 2017
7d8f922
Update Examples and Fix Errors
arecvlohe Oct 3, 2017
be1be19
Pass Down Resizable Prop to Event Cell
arecvlohe Oct 3, 2017
f2b8241
ResizableEventLR Component
arecvlohe Oct 3, 2017
9bad493
Update Resize Function and Rename Component
arecvlohe Oct 4, 2017
e985954
Update Styles
arecvlohe Oct 4, 2017
b37ecd1
Refactor Components
arecvlohe Oct 4, 2017
aae9bc5
Add Top Drag and Refactor Component
arecvlohe Oct 4, 2017
d16f5d9
Refactor If/Else Statement
arecvlohe Oct 4, 2017
81b3e50
Merge Upstream/Master in Local
arecvlohe Oct 4, 2017
bf9a0e6
Add Back Changes from Master
arecvlohe Oct 4, 2017
c8687ce
Remove Unused Code
arecvlohe Oct 5, 2017
ef8bbdd
feat: pass down event components from top-level
arecvlohe Nov 11, 2017
81512a4
refactor: clean up naming
arecvlohe Nov 11, 2017
6ae8760
refactor: remove unnecessary things
arecvlohe Nov 11, 2017
ccd0d4e
fix: example dnd resizeEvent func
arecvlohe Nov 11, 2017
7a730ca
fix: requested fixes
arecvlohe Nov 19, 2017
78fdcd0
fix: more fixes
arecvlohe Dec 10, 2017
df1e88a
fix: update example
arecvlohe Dec 10, 2017
cfcdbbf
Merge branch 'master' into feature/events-resize
arecvlohe Dec 10, 2017
5703af5
Merge branch 'master' into feature/events-resize
arecvlohe Dec 10, 2017
19afd21
fix: error
arecvlohe Dec 10, 2017
9960e07
fix: build errors
arecvlohe Dec 10, 2017
bf7ab90
fix: build errors
arecvlohe Dec 10, 2017
ee4c2f6
fix: all day event right/left drag
arecvlohe Dec 11, 2017
2d314fe
fix: build error
arecvlohe Dec 11, 2017
57a5ff6
Pass 'isAllDay' prop to header event components
alxmiron Jan 5, 2018
de34a59
Merge pull request #5 from AlexMarvelo/bugfix/all-day-header-events
arecvlohe Jan 6, 2018
66b18b6
Merge upstream master with local branch
arecvlohe Jan 6, 2018
167f504
Misc changes
arecvlohe Jan 6, 2018
32dadd4
Update example bundle
arecvlohe Jan 6, 2018
c78f2ea
Add create-react-class as dep
arecvlohe Jan 6, 2018
4f6a228
Update yarn.lock file
arecvlohe Jan 6, 2018
a841bc6
Fix App imports
arecvlohe Jan 6, 2018
673610e
Merge master with local branch
arecvlohe Jan 8, 2018
26b094b
Fix yarn.lock
arecvlohe Jan 8, 2018
f6de046
Merge master with local branch
arecvlohe Jan 10, 2018
fc3373e
Update yarn.lock file
arecvlohe Jan 10, 2018
3c3e79c
Merge https://github.com/intljusticemission/react-big-calendar into f…
arecvlohe Jan 11, 2018
9d78b00
fix: week/day resize events
arecvlohe Jan 12, 2018
90843a5
docs: update docs with resizable prop
arecvlohe Jan 12, 2018
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
3 changes: 2 additions & 1 deletion examples/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ localizer(globalize);
import 'react-big-calendar/lib/less/styles.less';
import './styles.less';
import './prism.less';

import Basic from './demos/basic';
import Selectable from './demos/selectable';
import Cultures from './demos/cultures';
Expand Down Expand Up @@ -101,7 +102,7 @@ const Example = React.createClass({
<strong><i className='fa fa-code'/>{' View example source code'}</strong>
</a>
</div>
<Current className='demo' />
<Current className='demo' />
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like a space was removed.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we fix it?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean put the space back in?

</div>
</div>
<div className='docs'>
Expand Down
Loading