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

Fix: demo on Firefox stable #8

Merged
merged 11 commits into from
Jul 4, 2019
Merged

Fix: demo on Firefox stable #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4677204
Fix: Test a fix for #7
forabi Jun 29, 2019
be76640
Fix: Allow develop branch to deploy
forabi Jun 29, 2019
f2184c3
Fix: update release config
forabi Jun 29, 2019
b38bfc2
Fix: update SR
forabi Jun 29, 2019
6debe85
Breaking: develop
forabi Jun 29, 2019
2996f26
Fix: imports
forabi Jun 29, 2019
d5fad0d
Fix: missing type
forabi Jun 29, 2019
93275e8
Fix: demo on Firefox
forabi Jun 29, 2019
91b3f36
Revert "Fix: Test a fix for #7"
forabi Jul 4, 2019
a4a6b34
Revert "Fix: imports"
forabi Jul 4, 2019
86d393c
Fix: type
forabi Jul 4, 2019
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
13 changes: 13 additions & 0 deletions .releaserc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
{
"branches": [
"+([1-9])?(.{+([1-9]),x}).x",
"master",
"develop",
{
"name": "alpha",
"prerelease": true
},
{
"name": "beta",
"prerelease": true
}
],
"analyzeCommits": {
"preset": "angular",
"releaseRules": [
Expand Down
9 changes: 8 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ jobs:
deploy:
- provider: script
skip_cleanup: true
script: npx semantic-release
script: yarn semantic-release
on:
branch: master
- provider: script
skip_cleanup: true
script: yarn semantic-release
on:
branch: develop
- provider: pages
github-token: $GH_TOKEN
skip-cleanup: true
Expand Down
14 changes: 7 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import { TimeGridScheduler, classes } from '@remotelock/react-week-scheduler';
import '@remotelock/react-week-scheduler/index.css';

const rangeStrings = [
['2019-03-03T22:45:00.000Z', '2019-03-04T01:15:00.000Z'],
['2019-03-04T22:15:00.000Z', '2019-03-05T01:00:00.000Z'],
['2019-03-05T22:00:00.000Z', '2019-03-06T01:00:00.000Z'],
['2019-03-06T22:00:00.000Z', '2019-03-07T01:00:00.000Z'],
['2019-03-07T05:30:00.000Z', '2019-03-07T10:00:00.000Z'],
['2019-03-08T22:00:00.000Z', '2019-03-09T01:00:00.000Z'],
['2019-03-09T22:00:00.000Z', '2019-03-10T01:00:00.000Z'],
['2019-03-04 00:15', '2019-03-04 01:45'],
['2019-03-05 09:00', '2019-03-05 10:30'],
['2019-03-06 22:00', '2019-03-06 22:30'],
['2019-03-07 01:30', '2019-03-07 03:00'],
['2019-03-07 05:30', '2019-03-07 10:00'],
['2019-03-08 12:30', '2019-03-08 01:30'],
['2019-03-09 22:00', '2019-03-09 23:59'],
];

const defaultSchedule = rangeStrings.map(range =>
Expand Down
14 changes: 7 additions & 7 deletions demo/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ const classes = mapValues(
);

const rangeStrings: [string, string][] = [
['2019-03-03T22:45:00.000Z', '2019-03-04T01:15:00.000Z'],
['2019-03-04T22:15:00.000Z', '2019-03-05T01:00:00.000Z'],
['2019-03-05T22:00:00.000Z', '2019-03-06T01:00:00.000Z'],
['2019-03-06T22:00:00.000Z', '2019-03-07T01:00:00.000Z'],
['2019-03-07T05:30:00.000Z', '2019-03-07T10:00:00.000Z'],
['2019-03-08T22:00:00.000Z', '2019-03-09T01:00:00.000Z'],
['2019-03-09T22:00:00.000Z', '2019-03-10T01:00:00.000Z'],
['2019-03-04 00:15', '2019-03-04 01:45'],
['2019-03-05 09:00', '2019-03-05 10:30'],
['2019-03-06 22:00', '2019-03-06 22:30'],
['2019-03-07 01:30', '2019-03-07 03:00'],
['2019-03-07 05:30', '2019-03-07 10:00'],
['2019-03-08 12:30', '2019-03-08 01:30'],
['2019-03-09 22:00', '2019-03-09 23:59'],
];

const defaultSchedule: ScheduleType = rangeStrings.map(
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
"scroll-into-view-if-needed": "^2.2.20"
},
"peerDependencies": {
"pepjs": "^0.5.0",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"resize-observer-polyfill": "^1.5.1",
"pepjs": "^0.5.0"
"resize-observer-polyfill": "^1.5.1"
},
"devDependencies": {
"@babel/cli": "^7.2.3",
Expand Down Expand Up @@ -97,7 +97,7 @@
"rollup-plugin-postcss": "^2.0.3",
"sass": "^1.17.2",
"scroll-into-view-if-needed": "^2.2.20",
"semantic-release": "^15.13.3",
"semantic-release": "^16.0.0-beta.22",
"source-map-explorer": "^1.7.0",
"stylelint": "^9.10.1",
"stylelint-config-standard": "^18.2.0",
Expand Down
Loading