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

Demo 1 #87

Merged
merged 40 commits into from
Feb 6, 2019
Merged

Demo 1 #87

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
9da39e8
Merge pull request #26 from Assis10t/i23
oktay-sen Jan 23, 2019
36949d3
Merge branch 'master' into beta
oktay-sen Jan 23, 2019
2ca6579
Added android project
oktay-sen Jan 23, 2019
526102b
Merge pull request #27 from Assis10t/i23
oktay-sen Jan 23, 2019
2b95677
Added travis config file
oktay-sen Jan 26, 2019
aad5da9
travis now tests the server at the correct directory
oktay-sen Jan 26, 2019
1779c7e
Added build status image to main README.md
oktay-sen Jan 26, 2019
6666c98
I34 (#40)
oktay-sen Jan 26, 2019
30863d5
Fixed server tests in travis
oktay-sen Jan 26, 2019
5455c69
Merge i34
oktay-sen Jan 26, 2019
38c2a12
Added beta branch build status to README.md
oktay-sen Jan 26, 2019
0f77cc5
I32 (#36)
oktay-sen Jan 28, 2019
54d6603
I35 (#42)
cd6 Jan 28, 2019
87e7516
Merge branch 'beta' into i34
oktay-sen Jan 28, 2019
4fbb533
I37 (#48)
freddiejbawden Jan 31, 2019
47ed633
Removed the server directory
oktay-sen Jan 31, 2019
363be79
Removed the server directory (#50)
oktay-sen Jan 31, 2019
90d5cdb
Added jest testing to firebase functions.
oktay-sen Jan 31, 2019
e8be1d9
Jest temporarily passes without tests.
oktay-sen Jan 31, 2019
8900705
Resolved merge conflict
oktay-sen Jan 31, 2019
60de47c
I51 (#52)
oktay-sen Jan 31, 2019
2a264e8
Fixed travis deployment not working
oktay-sen Jan 31, 2019
40b3ba0
Merge branch 'beta' into i51
oktay-sen Jan 31, 2019
80c121f
I51 (#53)
oktay-sen Jan 31, 2019
51e6334
Potential fix for firebase deployment
oktay-sen Jan 31, 2019
7980213
Merge branch 'beta' into i51
oktay-sen Jan 31, 2019
327e238
Fixed firebase functions deployment on Travis
oktay-sen Jan 31, 2019
406889b
Added master firebase project to travis deploy
oktay-sen Jan 31, 2019
922dee7
I55 (#58)
oktay-sen Feb 3, 2019
5146459
I56 (#67)
APRader Feb 4, 2019
5adde83
I58 (#69)
freddiejbawden Feb 4, 2019
df6b612
I66 (#70)
APRader Feb 4, 2019
ee5fa77
I71 (#72)
cd6 Feb 4, 2019
bdc863e
I60 Connected Android to server (#74)
oktay-sen Feb 4, 2019
1339882
I76 (#79)
cd6 Feb 5, 2019
4f2229d
I78 Basic authentication (#83)
oktay-sen Feb 5, 2019
15b4b2b
I81 Bypass zeroconf (#84)
oktay-sen Feb 5, 2019
a5aeb2e
addOrder now starts moving the robot (#85)
oktay-sen Feb 5, 2019
84513ed
I58 (#86)
freddiejbawden Feb 6, 2019
1413f50
Fixed merge issues and other bugs
oktay-sen Feb 6, 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
Prev Previous commit
Next Next commit
I34 (#40) 
* Added travis config file

* travis now tests the server at the correct directory

* Added build status image to main README.md
  • Loading branch information
@oktay-sen
oktay-sen committed Jan 26, 2019
commit 6666c98acc45a05d0ebf6f62c61a310391109b79
6 changes: 6 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
matrix:
include:
- language: node_js
node_js: "node"
before_script:
- cd server
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[![Build Status](https://travis-ci.org/Assis10t/assis10t.svg?branch=master)](https://travis-ci.org/Assis10t/assis10t)
# assis10t
Main repository for SDP Group 10