glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/realtime.video

Browse source
This commit is contained in:
Devin Howard 2016-02-05 11:38:19 +08:00
commit 3e28831595
6 changed files with 97 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
README.md
View file

@ -2,6 +2,7 @@ Metamaps
======= =======
[![Join the chat at https://gitter.im/metamaps/metamaps_gen002](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/metamaps/metamaps_gen002?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Join the chat at https://gitter.im/metamaps/metamaps_gen002](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/metamaps/metamaps_gen002?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
![Build Status](https://jenkins.devinhoward.ca/job/metamaps_gen002.develop/badge/icon)
Welcome to the Metamaps GitHub repo. Welcome to the Metamaps GitHub repo.
@ -72,7 +73,7 @@ Copyright (c) 2015 Connor Turland
[site-blog]: http://blog.metamaps.cc [site-blog]: http://blog.metamaps.cc
[site-beta]: http://metamaps.cc [site-beta]: http://metamaps.cc
[community]: https://plus.google.com/u/0/communities/115060009262157699234 [community]: https://plus.google.com/u/0/communities/115060009262157699234
[license]: https://github.com/metamaps/metamaps_gen002/blob/master/LICENSE [license]: https://github.com/metamaps/metamaps_gen002/blob/develop/LICENSE
[contributing]: https://github.com/metamaps/metamaps_gen002/blob/master/doc/CONTRIBUTING.md [contributing]: https://github.com/metamaps/metamaps_gen002/blob/develop/doc/CONTRIBUTING.md
[contributing-issues]: https://github.com/metamaps/metamaps_gen002/blob/master/doc/CONTRIBUTING.md#reporting-bugs-and-other-issues [contributing-issues]: https://github.com/metamaps/metamaps_gen002/blob/develop/doc/CONTRIBUTING.md#reporting-bugs-and-other-issues
[windows-installation]: https://github.com/metamaps/metamaps_gen002/blob/master/doc/WindowsInstallation.md [windows-installation]: https://github.com/metamaps/metamaps_gen002/blob/develop/doc/WindowsInstallation.md

BIN
app/assets/images/.DS_Store vendored
View file

Binary file not shown.

6
app/views/layouts/_lightboxes.html.erb
View file

@ -18,7 +18,7 @@
<div id="rightAboutParms"> <div id="rightAboutParms">
<p>PRIVATE BETA</p> <p>PRIVATE BETA</p>
<p>2.6</p> <p>2.8</p>
<p>Nov 29, 2014</p> <p>Nov 29, 2014</p>
</div> </div>
<div class="clearfloat"> <div class="clearfloat">
@ -142,7 +142,7 @@
<ul><li>Google Analytics</li></ul> <ul><li>Google Analytics</li></ul>
<br> <br>
<h4 id="colophonSection">Support</h4> <h4 id="colophonSection">Support</h4>
<ul><li>Uservoice <a href="http://support.metamaps.cc/" target="_blank">*</a></li></ul> <ul><li>Uservoice <a href="http://metamapscc.uservoice.com/" target="_blank">*</a></li></ul>
</div> </div>
<div class="clearfloat"></div> <div class="clearfloat"></div>
@ -155,7 +155,7 @@
<a id="fireFoxIcon" href="https://www.mozilla.org/en-US/firefox/new/" target="_blank">Firefox</a> <a id="fireFoxIcon" href="https://www.mozilla.org/en-US/firefox/new/" target="_blank">Firefox</a>
<a id="safariIcon" href="http://support.apple.com/downloads/#safari" target="_blank">Safari</a> <a id="safariIcon" href="http://support.apple.com/downloads/#safari" target="_blank">Safari</a>
<% # TODO https for blog.metamaps.cc %> <% # TODO https for blog.metamaps.cc %>
<p id="noIEbody">While it's downloading, explore our <a href="http://blog.metamaps.cc/">blog</a>,<br> watch the <a href="http://vimeo.com/88334167">tutorials</a>, or visit our <a href="http://support.metamaps.cc/">knowledge base</a>! <p id="noIEbody">While it's downloading, explore our <a href="http://blog.metamaps.cc/">blog</a>,<br> watch the <a href="http://vimeo.com/88334167">tutorials</a>, or visit our <a href="http://metamapscc.uservoice.com/">knowledge base</a>!
</div> </div>

34
app/views/shared/_cheatsheet.html.erb
View file

@ -38,7 +38,7 @@
<div class="csItem indented"><span class="csTitle">Esc:</span> Hides auto-suggestion results</div> <div class="csItem indented"><span class="csTitle">Esc:</span> Hides auto-suggestion results</div>
<div class="csItem indented"><span class="csTitle">Enter:</span> create a new topic</div> <div class="csItem indented"><span class="csTitle">Enter:</span> create a new topic</div>
<div class="csItem indented"><span class="csTitle">Gear Icon:</span> open up metacode settings</div> <div class="csItem indented"><span class="csTitle">Gear Icon:</span> open up metacode settings</div>
<div class="csItem"><br><a href="http://support.metamaps.cc/knowledgebase/articles/425787-creating-and-editing-topics" target= "_blank">Learn More</a></div> <div class="csItem"><br><a href="http://metamapscc.uservoice.com/knowledgebase/articles/425787-creating-and-editing-topics" target= "_blank">Learn More</a></div>
</div> </div>
<div id="csEditingTopics"> <div id="csEditingTopics">
@ -70,7 +70,7 @@
<span class="csTitle">Open 'Context Menu':</span> Right-click/alt+click on topic icon or synapse <span class="csTitle">Open 'Context Menu':</span> Right-click/alt+click on topic icon or synapse
</div> </div>
<div class="csItem indented">*Hide/Remove/Delete topic within context menu</div> <div class="csItem indented">*Hide/Remove/Delete topic within context menu</div>
<div class="csItem"><br><a href="http://support.metamaps.cc/knowledgebase/articles/425787-creating-and-editing-topics" target= "_blank">Learn More</a></div> <div class="csItem"><br><a href="http://metamapscc.uservoice.com/knowledgebase/articles/425787-creating-and-editing-topics" target= "_blank">Learn More</a></div>
</div> </div>
@ -81,7 +81,7 @@
<div class="csItem"><span class="csTitle">Create new Topic with Synapse:</span> Right-click + drag from topic to open canvas</div> <div class="csItem"><span class="csTitle">Create new Topic with Synapse:</span> Right-click + drag from topic to open canvas</div>
<div class="csItem indented"><span class="csTitle">Enter:</span> Create topic</div> <div class="csItem indented"><span class="csTitle">Enter:</span> Create topic</div>
<div class="csItem indented"><span class="csTitle">Enter:</span> Create synapse</div> <div class="csItem indented"><span class="csTitle">Enter:</span> Create synapse</div>
<div class="csItem"><br><a href="http://support.metamaps.cc/knowledgebase/articles/425790-creating-and-editing-synapses" target= "_blank">Learn More</a></div> <div class="csItem"><br><a href="http://metamapscc.uservoice.com/knowledgebase/articles/425790-creating-and-editing-synapses" target= "_blank">Learn More</a></div>
</div> </div>
@ -94,7 +94,7 @@
<div class="csItem indented"><span class="csTitle">Browse synapses / change visible synapse</span> click on arrow icon and select desired synapse</div> <div class="csItem indented"><span class="csTitle">Browse synapses / change visible synapse</span> click on arrow icon and select desired synapse</div>
<div class="csItem"><span class="csTitle">Open 'Context Menu':</span> Right-click/alt-click on Synapse</div> <div class="csItem"><span class="csTitle">Open 'Context Menu':</span> Right-click/alt-click on Synapse</div>
<div class="csItem indented">*Hide/Remove/Delete synapse within context menu</div> <div class="csItem indented">*Hide/Remove/Delete synapse within context menu</div>
<div class="csItem"><br><a href="http://support.metamaps.cc/knowledgebase/articles/425790-creating-and-editing-synapses" target= "_blank">Learn More</a></div> <div class="csItem"><br><a href="http://metamapscc.uservoice.com/knowledgebase/articles/425790-creating-and-editing-synapses" target= "_blank">Learn More</a></div>
</div> </div>
@ -102,7 +102,7 @@
<div class="csItem"><span class="csTitle">Move around Canvas:</span> Click and drag</div> <div class="csItem"><span class="csTitle">Move around Canvas:</span> Click and drag</div>
<div class="csItem"><span class="csTitle">Zoom in/out:</span> Scroll OR click on <div id="zoomIn"> </div> & <div id="zoomOut"> </div></div> <div class="csItem"><span class="csTitle">Zoom in/out:</span> Scroll OR click on <div id="zoomIn"> </div> & <div id="zoomOut"> </div></div>
<div class="csItem"><span class="csTitle">Zoom to see all:</span> Click <div id="centerMap"></div> OR Ctrl + E</div> <div class="csItem"><span class="csTitle">Zoom to see all:</span> Click <div id="centerMap"></div> OR Ctrl + E</div>
<div class="csItem"><br><a href="http://support.metamaps.cc/knowledgebase/articles/425784-viewing-existing-maps" target= "_blank">Learn More</a></div> <div class="csItem"><br><a href="http://metamapscc.uservoice.com/knowledgebase/articles/425784-viewing-existing-maps" target= "_blank">Learn More</a></div>
</div> </div>
@ -151,42 +151,42 @@
<div id="moreResources"> <div id="moreResources">
<p>For more information about Metamaps.cc, visit our Knowledge Base or skip directly to a section by clicking on one of the categories below.</p> <p>For more information about Metamaps.cc, visit our Knowledge Base or skip directly to a section by clicking on one of the categories below.</p>
<div class="resourcesColumnOne resourcesColumn"> <div class="resourcesColumnOne resourcesColumn">
<a href="http://support.metamaps.cc/forums/262715-general" target="_blank" data-bypass="true" class="button">Feedback Forums</a> <a href="http://metamapscc.uservoice.com/forums/262715-general" target="_blank" data-bypass="true" class="button">Feedback Forums</a>
<ul> <ul>
<li> <li>
<a href="http://support.metamaps.cc/knowledgebase/topics/61031-getting-started" target="_blank" data-bypass="true">Getting Started</a> <a href="http://metamapscc.uservoice.com/knowledgebase/topics/61031-getting-started" target="_blank" data-bypass="true">Getting Started</a>
</li> </li>
<li> <li>
<a href="http://support.metamaps.cc/knowledgebase/topics/63372-key-fundamentals" target="_blank" data-bypass="true">Key Fundamentals</a> <a href="http://metamapscc.uservoice.com/knowledgebase/topics/63372-key-fundamentals" target="_blank" data-bypass="true">Key Fundamentals</a>
</li> </li>
<li> <li>
<a href="http://support.metamaps.cc/knowledgebase/topics/61033-best-practices" target="_blank" data-bypass="true">Best Practices</a> <a href="http://metamapscc.uservoice.com/knowledgebase/topics/61033-best-practices" target="_blank" data-bypass="true">Best Practices</a>
</li> </li>
<li> <li>
<a href="http://support.metamaps.cc/knowledgebase/topics/63377-general-troubleshooting" target="_blank" data-bypass="true">General Troubleshooting</a> <a href="http://metamapscc.uservoice.com/knowledgebase/topics/63377-general-troubleshooting" target="_blank" data-bypass="true">General Troubleshooting</a>
</li> </li>
<li> <li>
<a href="http://support.metamaps.cc/knowledgebase/topics/63443-applications-use-cases" target="_blank" data-bypass="true">Applications & Use Cases</a> <a href="http://metamapscc.uservoice.com/knowledgebase/topics/63443-applications-use-cases" target="_blank" data-bypass="true">Applications & Use Cases</a>
</li> </li>
</ul> </ul>
</div> </div>
<div class="resourcesColumnTwo resourcesColumn"> <div class="resourcesColumnTwo resourcesColumn">
<a href="http://support.metamaps.cc/knowledgebase" target="_blank" data-bypass="true" class="button">KNOWLEDGE BASE</a> <a href="http://metamapscc.uservoice.com/knowledgebase" target="_blank" data-bypass="true" class="button">KNOWLEDGE BASE</a>
<ul> <ul>
<li> <li>
<a href="http://support.metamaps.cc/knowledgebase/topics/63440-general-questions" target="_blank" data-bypass="true">General Questions</a> <a href="http://metamapscc.uservoice.com/knowledgebase/topics/63440-general-questions" target="_blank" data-bypass="true">General Questions</a>
</li> </li>
<li> <li>
<a href="http://support.metamaps.cc/knowledgebase/topics/63375-getting-involved" target="_blank" data-bypass="true">Getting Involved</a> <a href="http://metamapscc.uservoice.com/knowledgebase/topics/63375-getting-involved" target="_blank" data-bypass="true">Getting Involved</a>
</li> </li>
<li> <li>
<a href="http://support.metamaps.cc/knowledgebase/topics/63376-project-organization-governance" target="_blank" data-bypass="true">Organization & Governance</a> <a href="http://metamapscc.uservoice.com/knowledgebase/topics/63376-project-organization-governance" target="_blank" data-bypass="true">Organization & Governance</a>
</li> </li>
<li> <li>
<a href="http://support.metamaps.cc/knowledgebase/topics/63378-technical-infrastructure" target="_blank" data-bypass="true">Technical Infrastructure</a> <a href="http://metamapscc.uservoice.com/knowledgebase/topics/63378-technical-infrastructure" target="_blank" data-bypass="true">Technical Infrastructure</a>
</li> </li>
<li> <li>
<a href="http://support.metamaps.cc/knowledgebase/topics/63587-theory-references" target="_blank" data-bypass="true">References & Key Theory</a> <a href="http://metamapscc.uservoice.com/knowledgebase/topics/63587-theory-references" target="_blank" data-bypass="true">References & Key Theory</a>
</li> </li>
</ul> </ul>
</div> </div>

21
bin/jenkins-test.sh Executable file
View file

@ -0,0 +1,21 @@
#!/bin/bash -l
#prerequisites
#sudo aptitude -q -y install libpq-dev
source "$HOME/.rvm/scripts/rvm"
rvm install $(cat .ruby-version)
rvm gemset use $(cat .ruby-gemset)
gem install bundler
set -x
#configure environment
export RAILS_ENV=test
cp .example-env .env
sed -i -e "s/DB_USERNAME='.*'/DB_USERNAME='jenkins'/" .env
#test
bundle install
rake db:create db:test:prepare
bundle exec rspec

99
doc/CONTRIBUTING.md
View file

@ -1,84 +1,87 @@
# Contributing to Metamaps # Contributing to Metamaps
Active involvement from the community is essential to help make Metamaps as beneficial for communities as it can be. You can help by reporting bugs, fixing bugs, adding features, contributing new modules and by providing feedback. Active involvement from the community is essential to help make Metamaps as
beneficial for communities as it can be. You can help by reporting bugs, fixing
bugs, adding features, contributing new modules and by providing feedback.
## Reporting bugs and other issues ## Reporting bugs and other issues
If you think you've encountered a bug, do the following: If you think you've encountered a bug, do the following:
1. Make sure you are working with the latest version of the Metamaps `master` branch. 1. Make sure you are working with the latest version of the Metamaps `develop`
2. Browse through the [issues][metamaps-issues] to check if branch.
anyone else has already reported. If someone has, feel free to add more 2. Browse through the [issues][metamaps-issues] to check if anyone else has
information to that issue to help us solve it. already reported. If someone has, feel free to add more information to that
3. If no one has yet submitted the issue you are encountering, add it in! Please be sure issue to help us solve it.
to include as much information as possible, include errors, warnings, 3. If no one has yet submitted the issue you are encountering, add it in! Please
be sure to include as much information as possible, include errors, warnings,
screenshots, links to a video showing the problem or code that can reproduce screenshots, links to a video showing the problem or code that can reproduce
the issue. the issue.
## Contributing code ## Contributing code
Metamaps is made possible by open source Metamaps is made possible by open source contributors like you. We're very
contributors like you. We're very interested in getting help from the greater interested in getting help from the greater community, but before you start it's
community, but before you start it's important that you become acquainted with important that you become acquainted with our workflow. Following these
our workflow. Following these guidelines below will make collaboration much guidelines below will make collaboration much smoother and increase the chances
smoother and increase the chances that we will accept your pull request without that we will accept your pull request without hiccups.
hiccups.
### Development Process ### Development Process
Our development process is very similar to the approach Our development process is very similar to the approach described in the
described in the well-known article [A Successful Git Branching Model by Vincent well-known article [A Successful Git Branching Model by Vincent Driessen
Driessen][git-branching-model]. Here's an overview: ][git-branching-model]. Here's an overview:
* Our `master` branch is the branch upon which * The `master` branch is the current base for our deployed instances. This
Metamaps developers should be basing their work on. The `master` branch is not guaranteed to be stable. branch *must* remain stable and always work.
* All commits intended for `master` should take place on your own personal * The `develop` branch is the current state of development. Metamaps
fork, and be submitted via pull request when ready. developers base their work on this branch. It is not guaranteed to be
* Only maintainers can accept pull requests from forks into the core Metamaps.cc stable.
repository. * All code must be reviewed before being committed to develop or master. This
* Please squash your commits into a single commit before making a pull request. means all commits should take place on your own personal branch, and
submitted via a Github pull request when ready.
* Only maintainers can accept pull requests from forks into the core
Metamaps.cc repository.
### Getting started ### Getting started
1. Make sure you have a [GitHub account](https://github.com/signup/free) 1. Make sure you have a [GitHub account](https://github.com/signup/free)
2. [Fork metamaps][fork-metamaps] 2. [Fork metamaps][fork-metamaps]
3. Keep your fork up to date. Metamaps is a fast moving project, and things are 3. Keep your fork up to date. Metamaps is a fast moving project, and things
changing all the time. It's important that any changes you make are based on are changing all the time. It's important that any changes you make are
the most recent version of metamaps, since it's possible that something may based on the most recent version of metamaps, since it's possible that
have changed that breaks your pull request or invalidates its need. something may have changed that breaks your pull request or invalidates it.
4. Make sure you have a [Contributor License Agreement](http://caa.metamaps.cc) on file. 4. Make sure you have a [Contributor License Agreement](http://caa.metamaps.cc
) on file.
5. Read on ... 5. Read on ...
### Contributor License Agreement ### Contributor License Agreement
Before we can accept any contributions to Metamaps, we first require that all Before we can accept any contributions to Metamaps, we first require that all
individuals or companies agree to our Contributor License Agreement (CLA). The e-mail individuals or companies agree to our Contributor License Agreement (CLA). The
address used in the pull request will be used to check if a CLA has already been e-mail address used in the pull request will be used to check if a CLA has
filed, so be sure to list all email addresses that you might use to submit your already been filed, so be sure to list all email addresses that you might use to
pull requests when filling it out. Our CLA can be found [here](http://caa.metamaps.cc). submit your pull requests when filling it out. [Our CLA can be found here](
http://caa.metamaps.cc).
### Testing and Linting ### Testing and Linting
TODO Please run `rspec` in the Metamaps root directory before submitting your pull
request.
### Branch grouping tokens ### Branch grouping tokens
All pull requests submitted to Metamaps.cc should occur on a new branch. For these All pull requests submitted to Metamaps.cc should occur on a new branch. For
branches, we at metamaps use a short token indicating the nature of the branch in these branches, please use a short token indicating the nature of the branch in
question followed by a solidus (`/`) and a kebab-cased string describing the question followed by a `/` and then a very concise string describing the branch.
branch. We are using the following tokens: This isn't a very important part of the workflow, but we are currently using the
**NOTE: Not sure the above is right, but also not sure what to change it to ** following branch prefixes:
bug // bug fixes fix // bug fixes
wip // work in progress wip // work in progress (not suitable for a pull request)
feat // feature instance // (internal) Tracks customizations made to metamaps instances
feature // All other new features
Bug fixes follow a [slightly different format](#bug-fixes).
### Bug fixes ### Bug fixes
@ -87,7 +90,7 @@ If you'd like to contribute a fix for a bug you've encountered, first read up on
aware of the issue. By filing the issue first, we may be able to provide you aware of the issue. By filing the issue first, we may be able to provide you
with some insight that guides you in the right direction. with some insight that guides you in the right direction.
[metamaps-issues]: https://github.com/metamaps/metamaps_gen002/issues [metamaps-issues]: https://github.com/metamaps/metamaps_gen002/labels/bug
[git-branching-model]: http://nvie.com/posts/a-successful-git-branching-model/ [git-branching-model]: http://nvie.com/posts/a-successful-git-branching-model/
[fork-metamaps]: https://github.com/metamaps/metamaps_gen002/fork [fork-metamaps]: https://github.com/metamaps/metamaps_gen002/fork
[cla]: http://metamaps.cc/cla [cla]: http://metamaps.cc/cla