Skip to content

Commit 6828d73

Browse files
nusanamnusanam
authored
Merge pull request #117 from oslabs-beta/master
merging fork into main dev branch
2 parents c6d38ec + a095f3e commit 6828d73

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1506
-454
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ tictactoe
66
parents
77
coverage
88
src/extension/build.zip
9+
src/extension/build.crx
10+
src/extension/build/key.pem
11+
package/__tests__
12+
bower_components

‎.travis.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,3 @@ services:
22
- docker
33
script:
44
- docker-compose up --abort-on-container-exit
5-
deploy:
6-
provider: script
7-
skip_cleanup: true
8-
on:
9-
branches:
10-
only:
11-
- dev
12-
- master

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM node:10.16.2
2-
WORKDIR /usr/src/app
2+
WORKDIR /usr/src/app
33
COPY package*.json ./
44
RUN npm i

‎assets/reactime with website svg.svg‎

Lines changed: 38 additions & 0 deletions
Loading

‎assets/readme-logo-svg.svg‎

Lines changed: 38 additions & 0 deletions
Loading

‎assets/readme_logo.png‎

33.6 KB
Loading

demo2.gif renamed to demo.gif

File renamed without changes.

0 commit comments

Comments
 (0)