Skip to content

Commit 844e0a6

Browse files
committed
Merge branch 'master' of github.com:remotelock/react-week-scheduler
2 parents 7080ea6 + fe93d9f commit 844e0a6

File tree

6 files changed

+216
-101
lines changed

6 files changed

+216
-101
lines changed

.releaserc.json

+13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
11
{
2+
"branches": [
3+
"+([1-9])?(.{+([1-9]),x}).x",
4+
"master",
5+
"develop",
6+
{
7+
"name": "alpha",
8+
"prerelease": true
9+
},
10+
{
11+
"name": "beta",
12+
"prerelease": true
13+
}
14+
],
215
"analyzeCommits": {
316
"preset": "angular",
417
"releaseRules": [

.travis.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ jobs:
1212
deploy:
1313
- provider: script
1414
skip_cleanup: true
15-
script: npx semantic-release
15+
script: yarn semantic-release
16+
on:
17+
branch: master
18+
- provider: script
19+
skip_cleanup: true
20+
script: yarn semantic-release
21+
on:
22+
branch: develop
1623
- provider: pages
1724
github-token: $GH_TOKEN
1825
skip-cleanup: true

README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ import { TimeGridScheduler, classes } from '@remotelock/react-week-scheduler';
2323
import '@remotelock/react-week-scheduler/index.css';
2424

2525
const rangeStrings = [
26-
['2019-03-03T22:45:00.000Z', '2019-03-04T01:15:00.000Z'],
27-
['2019-03-04T22:15:00.000Z', '2019-03-05T01:00:00.000Z'],
28-
['2019-03-05T22:00:00.000Z', '2019-03-06T01:00:00.000Z'],
29-
['2019-03-06T22:00:00.000Z', '2019-03-07T01:00:00.000Z'],
30-
['2019-03-07T05:30:00.000Z', '2019-03-07T10:00:00.000Z'],
31-
['2019-03-08T22:00:00.000Z', '2019-03-09T01:00:00.000Z'],
32-
['2019-03-09T22:00:00.000Z', '2019-03-10T01:00:00.000Z'],
26+
['2019-03-04 00:15', '2019-03-04 01:45'],
27+
['2019-03-05 09:00', '2019-03-05 10:30'],
28+
['2019-03-06 22:00', '2019-03-06 22:30'],
29+
['2019-03-07 01:30', '2019-03-07 03:00'],
30+
['2019-03-07 05:30', '2019-03-07 10:00'],
31+
['2019-03-08 12:30', '2019-03-08 01:30'],
32+
['2019-03-09 22:00', '2019-03-09 23:59'],
3333
];
3434

3535
const defaultSchedule = rangeStrings.map(range =>

demo/index.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ const classes = mapValues(
4646
);
4747

4848
const rangeStrings: [string, string][] = [
49-
['2019-03-03T22:45:00.000Z', '2019-03-04T01:15:00.000Z'],
50-
['2019-03-04T22:15:00.000Z', '2019-03-05T01:00:00.000Z'],
51-
['2019-03-05T22:00:00.000Z', '2019-03-06T01:00:00.000Z'],
52-
['2019-03-06T22:00:00.000Z', '2019-03-07T01:00:00.000Z'],
53-
['2019-03-07T05:30:00.000Z', '2019-03-07T10:00:00.000Z'],
54-
['2019-03-08T22:00:00.000Z', '2019-03-09T01:00:00.000Z'],
55-
['2019-03-09T22:00:00.000Z', '2019-03-10T01:00:00.000Z'],
49+
['2019-03-04 00:15', '2019-03-04 01:45'],
50+
['2019-03-05 09:00', '2019-03-05 10:30'],
51+
['2019-03-06 22:00', '2019-03-06 22:30'],
52+
['2019-03-07 01:30', '2019-03-07 03:00'],
53+
['2019-03-07 05:30', '2019-03-07 10:00'],
54+
['2019-03-08 12:30', '2019-03-08 01:30'],
55+
['2019-03-09 22:00', '2019-03-09 23:59'],
5656
];
5757

5858
const defaultSchedule: ScheduleType = rangeStrings.map(

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
"scroll-into-view-if-needed": "^2.2.20"
3636
},
3737
"peerDependencies": {
38+
"pepjs": "^0.5.0",
3839
"react": "^16.8.4",
3940
"react-dom": "^16.8.4",
40-
"resize-observer-polyfill": "^1.5.1",
41-
"pepjs": "^0.5.0"
41+
"resize-observer-polyfill": "^1.5.1"
4242
},
4343
"devDependencies": {
4444
"@babel/cli": "^7.2.3",
@@ -97,7 +97,7 @@
9797
"rollup-plugin-postcss": "^2.0.3",
9898
"sass": "^1.17.2",
9999
"scroll-into-view-if-needed": "^2.2.20",
100-
"semantic-release": "^15.13.3",
100+
"semantic-release": "^16.0.0-beta.22",
101101
"source-map-explorer": "^1.7.0",
102102
"stylelint": "^9.10.1",
103103
"stylelint-config-standard": "^18.2.0",

0 commit comments

Comments
 (0)