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

Fixing merge problem #188

Merged
merged 21 commits into from
Apr 4, 2019
Merged

Fixing merge problem #188

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
39455da
Possibly ready to merge
cd6 Feb 14, 2019
110df63
Half speed for back wheels
cd6 Mar 25, 2019
7d3f4aa
Code for moving motors on pi but not working
cd6 Mar 27, 2019
af49bc4
Added lifting to rasp pi scripts
Mar 28, 2019
bd366bd
Updated Fake_DB with new shelves
Mar 28, 2019
52a0bcf
Lifting added to path finding and rasp pi script
Mar 28, 2019
c6ae349
Changes to EV3 and Pi once onboard
Mar 28, 2019
c3458ae
Merge i167
Mar 28, 2019
e78aca6
Change Ev3 to have single FollowLine object
Mar 29, 2019
f210a68
Updated Schema
Mar 29, 2019
dea5b27
Updated Fake DB
Mar 29, 2019
36702c5
Updated Pathfinding
Mar 29, 2019
d9d3fd4
Added "size" to Item in Android.
oktay-sen Mar 29, 2019
65b1eba
Further Changes
Mar 29, 2019
d656df4
Bug Fixing and clearing log statements
Mar 29, 2019
6059f48
Add and edit size of item.
webandbg Apr 2, 2019
6eec090
Localise MDI
webandbg Apr 2, 2019
9c34236
User testing fixes
webandbg Apr 4, 2019
a3559be
Merge commit '90f7c41b786ce50877aea41f65bb07a27c584821' into fixing_m…
oktay-sen Apr 4, 2019
33ca841
Merge remote-tracking branch 'origin/beta' into fixing_merge_problem
oktay-sen Apr 4, 2019
3301f23
Removed file that was supposed to not exist.
oktay-sen Apr 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
Prev Previous commit
Next Next commit
Localise MDI
  • Loading branch information
@webandbg
webandbg committed Apr 2, 2019
commit 6eec09037247d0415257a599dab4b7993e3c04f7
7 changes: 4 additions & 3 deletions website/nuxt.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ module.exports = {
],
link: [
{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
{ rel: 'stylesheet', type: 'text/css', href: '//cdn.materialdesignicons.com/2.0.46/css/materialdesignicons.min.css' },
{ rel: 'stylesheet', type: 'text/css', href: 'https://fonts.googleapis.com/css?family=Raleway&Open+Sans' }
// { rel: 'stylesheet', type: 'text/css', href: '//cdn.materialdesignicons.com/2.0.46/css/materialdesignicons.min.css' },
// { rel: 'stylesheet', type: 'text/css', href: 'https://fonts.googleapis.com/css?family=Raleway&Open+Sans' }
]
},

Expand All @@ -34,7 +34,8 @@ module.exports = {
** Global CSS
*/
css: [
'@/assets/sass/style.sass'
'@/assets/sass/style.sass',
'@/node_modules/@mdi/font/css/materialdesignicons.min.css',
],

/*
Expand Down
18 changes: 18 additions & 0 deletions website/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"test": "jest"
},
"dependencies": {
"@mdi/font": "^3.5.95",
"@nuxtjs/axios": "^5.3.6",
"@nuxtjs/bulma": "^1.2.1",
"axios": "^0.18.0",
Expand All @@ -20,6 +21,7 @@
"firebase": "^5.8.2",
"node-sass": "^4.11.0",
"nuxt": "^2.3.4",
"nuxt-material-design-icons": "^1.0.4",
"sass-loader": "^7.1.0",
"vue-cookies": "^1.5.12",
"vue-headroom": "^0.9.0",
Expand Down