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.

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

compare with develop #26

Open
wants to merge 183 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
183 commits
Select commit Hold shift + click to select a range
3911fa7
[WIP] custom headers sidebars
Jul 22, 2018
252e32d
[WIP] custom header component
Jul 23, 2018
fc771a4
[WIP] fix header label width
Jul 25, 2018
c10b7f3
[WIP] DayHeader
Jul 26, 2018
bb87299
Refactor to use composion
Jul 26, 2018
15c0898
[WIP] clean up
Jul 30, 2018
7875bd1
delete unit from showPeriod
Jul 30, 2018
0f8e591
clean up
Jul 30, 2018
cdb4404
merge with develop
Jul 30, 2018
d85ad67
Can stack items by group
Aug 2, 2018
df87cdf
resolve conflict
Aug 7, 2018
a71030f
fix drag item bug
Aug 7, 2018
2bf8490
prop getters
Aug 7, 2018
f12a6dd
add customize Timeline Headers
Aug 7, 2018
0c3093e
style date header
Aug 7, 2018
4491356
add passing render prop to render interval
Aug 8, 2018
75ae4be
fix bug in headers format
Aug 15, 2018
16ccc6e
fix bug
Aug 15, 2018
4c1600a
Merge remote-tracking branch 'forked/develop' into stack
Aug 20, 2018
5cd2a48
comments
Aug 20, 2018
1e934a8
Bug fix to stop including items that cannot render on timeline
Aug 21, 2018
995e9e1
readme wip
Aug 25, 2018
092b376
complete dateHeader
Aug 26, 2018
46062d5
remove log
Aug 26, 2018
7fe2d70
typos
Aug 26, 2018
e89ed16
typos
Aug 26, 2018
0aadd6a
update
Aug 27, 2018
2905be8
pass extra props to child renderers
Ilaiwi Sep 5, 2018
d51826f
Merge remote-tracking branch 'forked/develop' into stack2
Sep 19, 2018
2ab0bf8
Changes from stack branch
Sep 19, 2018
c856149
safety check
Sep 19, 2018
875588d
ye olde safety check
Sep 19, 2018
fbcd751
manually adding stuff from stack branch
Sep 19, 2018
9ce7f74
merge develop
Ilaiwi Sep 22, 2018
f202ac9
fix tests
Ilaiwi Sep 22, 2018
b97f17b
Fixes based off requested changes
Sep 22, 2018
0d0cd53
filter children in timelineheaders
Sep 25, 2018
5eb37d8
pass props to interval renderer
Sep 26, 2018
6743ed4
Merge branch 'stack2' of https://github.com/acemac/react-calendar-tim…
Ilaiwi Oct 1, 2018
25de9a2
build
Ilaiwi Oct 1, 2018
f28a3fb
pref
Ilaiwi Oct 1, 2018
0816472
build
Ilaiwi Oct 1, 2018
49d62cc
pass tests
Ilaiwi Oct 5, 2018
0a811bc
fix test script
Ilaiwi Oct 5, 2018
a803455
add tests
Oct 14, 2018
048aff2
fix TimelineHeader tests + add error to getNextUnit helper
Oct 18, 2018
15a7a53
add error snapshot
Ilaiwi Oct 19, 2018
e4381a7
add tests senarios
Ilaiwi Oct 20, 2018
585810e
Merge branch 'custom-headers' of https://github.com/FoothillSolutions…
Oct 21, 2018
16b9d4d
Merge branch 'master' of https://github.com/namespace-ee/react-calend…
Oct 21, 2018
2847145
build
Oct 21, 2018
1d8ae84
Merge branch 'custom-headers' of https://github.com/FoothillSolutions…
Ilaiwi Oct 22, 2018
d0f9518
Merge branch 'dest-build' of https://github.com/FoothillSolutions/rea…
Ilaiwi Oct 22, 2018
72ae41a
publish
Ilaiwi Oct 22, 2018
a8d7ac6
merge with develop
Nov 4, 2018
f4c99c6
add example to add headers dynamiclly
Nov 6, 2018
62a66f7
fix variable header height bug
Ilaiwi Nov 7, 2018
b6ed841
merge develop
Ilaiwi Nov 7, 2018
189aabd
Merge pull request #20 from FoothillSolutions/custom-header-variable-…
Ilaiwi Nov 7, 2018
1be1880
format prettier
Ilaiwi Nov 7, 2018
023b52f
merge
Ilaiwi Nov 7, 2018
3fe989d
merge custom headers
Ilaiwi Nov 7, 2018
8e040b2
release 0.22.0
Ilaiwi Nov 7, 2018
fbedb20
[WIP]ItemHeader
Nov 12, 2018
8bea615
WIP
Ilaiwi Nov 12, 2018
fb86357
Merge branch 'develop' of https://github.com/namespace-ee/react-calen…
Ilaiwi Nov 12, 2018
b7bd584
Merge branch 'custom-headers' of https://github.com/FoothillSolutions…
Ilaiwi Nov 12, 2018
599a82d
Merge branch 'develop' of https://github.com/namespace-ee/react-calen…
Ilaiwi Nov 12, 2018
7bd9644
fix bug
Ilaiwi Nov 12, 2018
770206f
WIP
Ilaiwi Nov 12, 2018
13a4f2b
beta ready
Nov 13, 2018
eeb60e7
remove extra logs
Nov 13, 2018
592eeba
pass classname and styles
Nov 14, 2018
68e31b6
refactor 1: calculateItemDimensions
Nov 18, 2018
8ccb53a
resolve conflict
Nov 18, 2018
c31955c
merge stack items
Nov 18, 2018
fe7979d
snapshots
Ilaiwi Nov 18, 2018
6090e82
add tests for stackgroup and no stackgroup
Nov 19, 2018
d84449a
resolve conflict
Nov 19, 2018
72a83ae
pull
Nov 19, 2018
4be769b
refactor calculate dimensions + add tests cases for stack items
Nov 19, 2018
d570d2c
[WIP] refacor calculate dimentions
Nov 19, 2018
7765b5f
test getItemWithInteractions
Nov 20, 2018
dae4996
test getItemDimensions
Nov 20, 2018
3884107
add canvasTimeStart to state
Ilaiwi Nov 21, 2018
9bb014c
solve NaN issue in snapshot
Ilaiwi Nov 22, 2018
a4d78fe
getCanvasWidth
Ilaiwi Nov 22, 2018
6f0e116
refactor stackItems to stackTimelineItems
Ilaiwi Nov 24, 2018
1c50950
add one more item and group
Ilaiwi Nov 24, 2018
42c5136
WIP stackAll
Ilaiwi Nov 24, 2018
863d7b8
better items fixture
Ilaiwi Nov 25, 2018
0ab2a09
format
Ilaiwi Nov 25, 2018
ccab9b4
stack groups
Ilaiwi Nov 25, 2018
6fff6d2
merge
Ilaiwi Nov 27, 2018
324698e
fix bug with stackAll
Ilaiwi Nov 27, 2018
d779160
Merge branch 'stack2-refactor' of https://github.com/FoothillSolution…
Ilaiwi Nov 27, 2018
ccd635a
remove group
Ilaiwi Nov 27, 2018
2cd3bd0
add readme + final refactor
Ilaiwi Nov 27, 2018
9bd8326
merge refactor stack2
Ilaiwi Nov 27, 2018
77282f4
merge Item header
Ilaiwi Nov 27, 2018
e43da09
fix package name
Ilaiwi Nov 27, 2018
fd1c6fa
add min height for ItemHeader
Ilaiwi Nov 28, 2018
211923b
Merge branch 'custom-header-itemHeader' of https://github.com/Foothil…
Ilaiwi Nov 28, 2018
102c0d0
fix bug
Ilaiwi Nov 28, 2018
f213c0a
width-as-prop
Ilaiwi Dec 19, 2018
8993409
responsive to width changes
Ilaiwi Dec 19, 2018
387f834
responsive width prop
Ilaiwi Dec 19, 2018
6ed25c8
merge develop
Ilaiwi Dec 19, 2018
e606aae
width as prop
Ilaiwi Dec 19, 2018
3bc5eab
scroll to width if provided
Ilaiwi Dec 19, 2018
9ec8b1b
scroll
Ilaiwi Dec 19, 2018
afce566
scroll
Ilaiwi Dec 19, 2018
e9c614c
beta 2
Ilaiwi Dec 19, 2018
ad8248c
export utils
Ilaiwi Dec 22, 2018
2dc9518
export useful helpers
Ilaiwi Dec 22, 2018
073ec24
merge column change
Ilaiwi Dec 26, 2018
8a93aca
ok
Ilaiwi Dec 26, 2018
636aa5f
left
Ilaiwi Dec 26, 2018
a30eab4
7
Ilaiwi Dec 26, 2018
b9f28af
Merge branch 'custom-headers' of https://github.com/FoothillSolutions…
Ilaiwi Jan 2, 2019
53c1810
merge develop
Ilaiwi Jan 2, 2019
36170d1
Merge branch 'custom-headers' of https://github.com/FoothillSolutions…
Ilaiwi Jan 2, 2019
31b90a6
merge custom headers
Ilaiwi Jan 2, 2019
1502e4e
merge remote
Ilaiwi Jan 2, 2019
71518fb
add width to customheader
Ilaiwi Jan 2, 2019
8e1564d
custom header width
Ilaiwi Jan 2, 2019
a60f9f7
9
Ilaiwi Jan 2, 2019
d6d9cee
adding test cases for the timeline wrapper's child components api
sh-alawneh Jan 5, 2019
815f7d8
fix typos in the test cases of timeline wrapper's components api
sh-alawneh Jan 6, 2019
908b861
adding a new Test Case to The SidebarHeader test collection
sh-alawneh Jan 6, 2019
b25d9d4
9
Ilaiwi Jan 6, 2019
f7f385d
Merge branch 'custom-headers' of https://github.com/FoothillSolutions…
sh-alawneh Jan 6, 2019
b9ab291
implement tests and extract test cases to separate files
sh-alawneh Jan 6, 2019
496edb9
adding new test to the Timeline Component
sh-alawneh Jan 6, 2019
0e03bd3
implement timeline tests except the primary secondary test case
sh-alawneh Jan 6, 2019
db4af0f
implement the test for checking one secondary and one primary headers
sh-alawneh Jan 6, 2019
f09bbfb
update the test case one secondary and one primary
sh-alawneh Jan 7, 2019
572b1f4
implement the test cases in the sidebarHeader test file
sh-alawneh Jan 7, 2019
e0a560e
extend the test cases for the sidebarHeader component
sh-alawneh Jan 7, 2019
85483dc
remove unused imports
sh-alawneh Jan 7, 2019
47c80f7
do code refactoring
sh-alawneh Jan 7, 2019
08443aa
extend the test cases with some arrangments
sh-alawneh Jan 15, 2019
359449d
extend the test cases and make the descreption more descriptive
sh-alawneh Jan 16, 2019
a5c19a1
remove unused imports and variables, adding custom header test cases
sh-alawneh Jan 17, 2019
1647566
extend the custom header test cases
sh-alawneh Jan 22, 2019
b7b2cca
delete package lock
Ilaiwi Jan 22, 2019
40065f8
refactor how we calculate interval style
Ilaiwi Jan 22, 2019
c72f12d
Merge branch 'custom-headers-test' of https://github.com/FoothillSolu…
Ilaiwi Jan 22, 2019
c79f85b
fix selected controlled vs uncontrolled
Ilaiwi Jan 23, 2019
a9cacfe
select controlled vs uncontrolled
Ilaiwi Jan 23, 2019
d8f214a
beta 10
Ilaiwi Jan 23, 2019
28c94ee
check item ref before mounting interact
Ilaiwi Jan 24, 2019
c27cfd0
beta 11
Ilaiwi Jan 24, 2019
125522c
fix interacting with item that deosnt exist
Ilaiwi Jan 24, 2019
8965bb9
Merge branch '350' of https://github.com/namespace-ee/react-calendar-…
Ilaiwi Jan 24, 2019
8b37c9c
11
Ilaiwi Jan 24, 2019
0f3268f
pull
Ilaiwi Jan 27, 2019
a43f8e5
on update item
Ilaiwi Jan 27, 2019
0a8d21a
extends the test cases
sh-alawneh Jan 28, 2019
892fe56
Merge branch 'custom-headers-test' of https://github.com/FoothillSolu…
sh-alawneh Jan 28, 2019
b2d2349
docs: adding link to LICENSE.md to README.md
tobiasbueschel Feb 11, 2019
f98c738
docs: correct invalid JavaScript syntax in examples
tobiasbueschel Feb 13, 2019
cfe2794
stack
Ilaiwi Feb 19, 2019
6cf4444
merge beta
Ilaiwi Feb 19, 2019
f3a7b3f
Merge pull request #25 from FoothillSolutions/stack-items-beta
Ilaiwi Feb 19, 2019
103227d
Merge branch 'develop' of https://github.com/namespace-ee/react-calen…
Ilaiwi Feb 21, 2019
1b47281
Merge branch 'custom-headers' of https://github.com/FoothillSolutions…
Ilaiwi Feb 21, 2019
6b19330
docs: fix minor spelling mistakes + update links for react and react-…
tobiasbueschel Feb 26, 2019
d0c318f
Merge pull request #509 from tobiasbueschel/docs/readme-return
Ilaiwi Mar 6, 2019
139a0f8
Merge pull request #507 from tobiasbueschel/docs/readme
Ilaiwi Mar 6, 2019
4cb753b
merge
Ilaiwi Mar 6, 2019
730ec0d
pump
Ilaiwi Mar 8, 2019
ce23739
improve click handlers
Ilaiwi Mar 10, 2019
8550a3e
beta
Ilaiwi Mar 10, 2019
27fc1bd
Merge pull request #520 from tobiasbueschel/docs/spelling
Ilaiwi Mar 17, 2019
e88de29
fix height calculation of stacked items inconsistant
Ilaiwi Mar 18, 2019
1183f50
Merge branch '497' of https://github.com/namespace-ee/react-calendar-…
Ilaiwi Mar 18, 2019
e3e3d06
0.25.21
Ilaiwi Mar 18, 2019
289a677
change homepage and git URL
falfaddaghi Sep 19, 2019
fb8371d
Merge pull request #28 from FoothillSolutions/falfaddaghi-patch-1
falfaddaghi Sep 19, 2019
42ebee8
fix start of day in daylight saving
Abdallatif Mar 3, 2020
0c29f2a
Merge pull request #29 from FoothillSolutions/daylight-saving
falfaddaghi Mar 4, 2020
a6c3379
0.25.0-beta.22
Abdallatif Mar 4, 2020
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: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ modules
build
gh-pages
/lib

package-lock.json
# vscode stuff
.vscode

Expand Down
597 changes: 571 additions & 26 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion __fixtures__/stateAndProps.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {items} from './itemsAndGroups'
export const props = {
keys: defaultKeys,
lineHeight: 30,
stackItems: true,
stackItems: 'space',
itemHeightRatio: 0.75
}

Expand Down
199 changes: 0 additions & 199 deletions __tests__/components/Header/Header.test.js

This file was deleted.

56 changes: 0 additions & 56 deletions __tests__/components/Header/TimelineElementsHeader.test.js

This file was deleted.

Loading