Commit graph

946 commits

Author SHA1 Message Date
Connor Turland
b1d27d42ff did one as example, need to do rest 2014-09-29 22:33:03 -04:00
Connor Turland
c1885615cd remove tilda file 2014-09-29 22:26:50 -04:00
Connor Turland
2138aa89f3 closes #368. ability to add in metacode colors 2014-09-29 22:26:12 -04:00
Devin Howard
b8155ea091 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-09-29 19:33:17 -04:00
Connor Turland
f14bdfac57 fixed error in _filterBox that was causing maps not to load when a synapse had a nil description. for real this time 2014-09-29 16:50:41 -04:00
Connor Turland
f9a24058aa fixed error in _filterBox that was causing maps not to load when a synapse had a nil description 2014-09-29 16:45:59 -04:00
Connor Turland
2d2f98373e fixed error in _filterBox that was causing maps not to load when a synapse had a nil description 2014-09-29 16:41:16 -04:00
Connor Turland
06f18215dd bug fixes for mapping experience. able to store multiple references to synapses on each edge 2014-09-29 16:04:36 -04:00
Connor Turland
96d883bde7 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-29 10:45:15 -04:00
Connor Turland
2b16123a4f fixed field type error on user edit form 2014-09-29 10:45:08 -04:00
Connor Turland
ca8794e61b Merge pull request #365 from Connoropolous/wip-zoomExtents
Various changes, but mostly to Selection with box and zoom to extents
2014-09-29 10:38:23 -04:00
Robert Best
2de7167c2c A bunch of fixes for selection with box, and zoom to extents 2014-09-28 15:29:22 -04:00
Robert Best
66ee35e364 Fixed merge conflicts with wip-zoomextents code 2014-09-26 23:34:27 -04:00
Robert Best
33fd21c216 removed ubuntu docs 2014-09-26 23:06:18 -04:00
Robert Best
0160f56238 partially finished fixes to zoomextents 2014-09-26 22:40:31 -04:00
Connor Turland
474b577d07 Merge pull request #362 from Connoropolous/forgetpass
Forgetpass
2014-09-26 22:35:41 -04:00
Connor Turland
32908c7717 style changes for account pages 2014-09-26 22:31:06 -04:00
BasharJabbour
14eb7562b1 fixed edit user account page 2014-09-26 08:42:11 -04:00
Devin Howard
9593d3dc0f Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
Conflicts:
	Ubuntu README.md
	Ubuntu README.rdoc
	UbuntuInstallation.md
2014-09-25 18:35:30 -04:00
Connor Turland
c46ab1a98b added hover to edit photo 2014-09-25 13:41:37 -04:00
Connor Turland
71247a8f04 fixes for account pages 2014-09-25 13:26:09 -04:00
Connor Turland
3f901074ec Merge branch 'forgetpass' of https://github.com/Connoropolous/metamaps_gen002 into accounts 2014-09-25 12:31:29 -04:00
BasharJabbour
6f62d59b66 Sign In, Sign Up, Edit User pages have been changed. Edit User page needs lots of work still. 2014-09-25 12:25:46 -04:00
Connor Turland
c817622984 for heroku 2014-09-24 17:15:39 -04:00
Connor Turland
265295a8a8 added color generator for each collaborator 2014-09-24 17:14:46 -04:00
Shai Mor
4ec9c4cb98 add zoom and pas events for multiple peers and label direction for compassCollab 2014-09-24 16:25:22 -04:00
Connor Turland
74b4659836 broke out functionality for positionPeerIcon from updatePeerCoords 2014-09-24 14:05:18 -04:00
Shai Mor
d5598819fd add arrowCompass for collab: direction indication of other users on the map 2014-09-24 11:00:22 -04:00
Connor Turland
b163442163 collab compass nowrap 2014-09-24 08:45:46 -04:00
Connor Turland
58ff70717e heroku 2014-09-23 10:37:08 -04:00
Connor Turland
dd6a21191a heroku 2014-09-22 23:56:47 -04:00
Connor Turland
c2340301fd Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-22 23:42:37 -04:00
Connor Turland
aaf2e4c521 right click styling 2014-09-22 23:42:26 -04:00
Shai Mor
1396b02952 collabCompass img&p for content and styling 2014-09-22 11:44:09 -04:00
Shai Mor
d115861584 collabCompass img and p for content and styling 2014-09-22 11:36:53 -04:00
Connor Turland
fe1f35d63e Merge pull request #361 from Connoropolous/forgotpass
centered reset password box
2014-09-22 06:28:34 -04:00
Bashar
5e76b44b80 centered reset password box 2014-09-21 20:47:09 -04:00
Bashar Jabbour
f0650bb16f Update MacInstallation.md 2014-09-21 19:19:19 -04:00
Bashar Jabbour
069548ef66 Update MacInstallation.md 2014-09-21 19:18:32 -04:00
Connor Turland
ff6eef7807 synapse form styling and positioning 2014-09-21 01:02:21 -04:00
Connor Turland
90e974164d added more resources into help lightbox 2014-09-20 15:11:58 -04:00
Connor Turland
ac867d00ab m 2014-09-18 02:39:00 -04:00
Connor Turland
683b459eeb Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-18 02:33:44 -04:00
Connor Turland
af5560b495 updates to metacode select within topic card 2014-09-18 02:33:38 -04:00
Shai Mor
0bf28410e6 switch metaset view changes 2014-09-17 10:59:36 -04:00
Connor Turland
f62ca67d9f prevent self showing up on realtime problem 2014-09-15 22:04:44 -04:00
Connor Turland
b6893d8f92 fixed admin panels 2014-09-15 21:57:34 -04:00
Connor Turland
6fe8cf4b88 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-12 15:07:52 -04:00
Shai Mor
b722dc911b help qr tutorials 2014-09-12 11:45:53 -04:00
Connor Turland
0941b43391 fixed spacing on abuot lightbox 2014-09-11 08:39:56 -04:00