Skip to content

Master #13

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

Merged
markpete merged 36 commits into from
Mar 12, 2015
Merged

Master #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5eed003
update gulp to create zip file
tacri Mar 11, 2015
90f3573
merged index.js conflict
tacri Mar 11, 2015
233bcca
Update gulpfile to include ExternalLib in the 'build' command and add…
caromu Mar 11, 2015
299102b
Merge pull request #5 from markpete/CGB
caromu Mar 11, 2015
bc3f666
Change 'app.js' to 'main.js' in gulp 'zip' task
caromu Mar 11, 2015
01c8a26
Merge pull request #6 from markpete/CGB
caromu Mar 11, 2015
5d9d037
Basic App UI
injyzarif Mar 11, 2015
898b22b
Add parse.com library to our bower components
caromu Mar 11, 2015
4cd9abf
Merge pull request #7 from markpete/CGB
caromu Mar 11, 2015
498f9ab
Remove bootstrap from the bower components, since we can get it from …
caromu Mar 11, 2015
f9a62e0
Merge pull request #8 from markpete/CGB
caromu Mar 11, 2015
a6a480d
Remove main.js from the index view
caromu Mar 11, 2015
60e9734
Merge branch 'CGB' of https://github.com/markpete/vinecache
caromu Mar 11, 2015
1d6b049
Include bootstrap, parse, and require in index.ejs, loading the prima…
caromu Mar 11, 2015
31f3e66
Merge branch 'CGB' of https://github.com/markpete/vinecache
caromu Mar 11, 2015
a0d2aa6
Remove requirejs, since we will be using the commonjs module pattern …
caromu Mar 11, 2015
e726255
Merge branch 'CGB' of https://github.com/markpete/vinecache
caromu Mar 11, 2015
d9f8fad
Include jQuery because it is required by bootstrap
caromu Mar 12, 2015
7304aac
Playing and Recording Video and GPS Location Tracking
hokieturtle Mar 12, 2015
4fbc544
Merge pull request #9 from markpete/CGB
caromu Mar 12, 2015
67635a9
Merge pull request #10 from markpete/hokieturtle
hokieturtle Mar 12, 2015
22b7ee9
Build cleanup work
caromu Mar 12, 2015
73c6198
Merge pull request #11 from markpete/CGB
caromu Mar 12, 2015
3371292
Initial checkin of event list w/ dummy list data
caromu Mar 12, 2015
a22c6c7
Prettify Event list UI
caromu Mar 12, 2015
d79507f
Standardize whitespace (spaces, not tabs)
caromu Mar 12, 2015
f976eb8
1st draft of Parse.com integration for iOS
markpete Mar 12, 2015
6877fd2
Cleaned up iOS libraries
markpete Mar 12, 2015
44db6bb
UploadVideo
injyzarif Mar 12, 2015
d559bcd
Hookup event list to real data from parse.com
caromu Mar 12, 2015
b732ad3
Merge branch 'master' of https://github.com/markpete/vinecache into CGB
caromu Mar 12, 2015
50a83f1
Merge branch 'master' into Injyyyy
injyzarif Mar 12, 2015
bf910a4
try again
injyzarif Mar 12, 2015
7149c9d
Merge pull request #12 from markpete/Injyyyy
injyzarif Mar 12, 2015
00167c6
Add selection logic to event list
caromu Mar 12, 2015
34771c0
Merge branch 'master' of https://github.com/markpete/vinecache
caromu Mar 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions Web/.bowerrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "public/vendor"
}
4 changes: 3 additions & 1 deletion Web/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
#exclude node_modules from git
/node_modules
/node_modules
/deployment
/public/javascripts
0 Web/main.js → Web/app.js
View file
Open in desktop
File renamed without changes.
5 changes: 1 addition & 4 deletions Web/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"requirejs": "~2.1.16",
"bootstrap": "~3.3.2",
"knockout": "~3.3.0",
"jquery": "~2.1.3",
"socket.io": "~1.3.5"
"parse": "~1.3.5"
}
}
48 changes: 0 additions & 48 deletions Web/bower_components/bootstrap/.bower.json
View file
Open in desktop

This file was deleted.

Loading