metamaps--metamaps

glenux-contrib/metamaps--metamaps

Fork 0

Commit graph

d30417f958 fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar Connor Turland 2014-10-04 00:15:47 -0400
fae7f9996d Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-10-03 11:26:49 -0400
cad8af2c1f updated the cheatsheet Bashar Jabbour 2014-10-02 22:33:28 -0400
499298613b updated metacodes.yml and deleted metacode_backgrounds.css Bashar Jabbour 2014-10-02 17:07:09 -0400
6785a61fd0 updated 404 page Bashar Jabbour 2014-10-02 15:55:51 -0400
10e5228488 finalized cheatsheet move help button back into the corner Connor Turland 2014-10-01 23:41:39 -0400
80221f1dd4 small updates to colophone Bashar Jabbour 2014-10-01 23:25:49 -0400
b70681ea6e updated the 404 page Bashar Jabbour 2014-10-01 23:21:05 -0400
1a4330ec19 metamaps support resources links Shai Mor 2014-10-01 22:55:59 -0400
5b7f23a409 updated tracking code for google analytics Bashar Jabbour 2014-10-01 20:57:25 -0400
179cee8456 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 Bashar Jabbour 2014-10-01 20:43:23 -0400
8caabb6ce1 update the colophone page Bashar Jabbour 2014-10-01 20:43:11 -0400
9169293323 small fix for minimizing search results Connor Turland 2014-10-01 20:00:03 -0400
eb57e555e9 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-10-01 19:52:14 -0400
b6700f77f8 synapse fixes Connor Turland 2014-10-01 19:52:08 -0400
ff4a64665e Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop Shai Mor 2014-10-01 18:09:15 -0400
4ba9a26c2b style sidebar search mapper stats Shai Mor 2014-10-01 18:07:05 -0400
a1925b3573 heroku Connor Turland 2014-10-01 17:20:02 -0400
b577f4fd19 improved z-indexes Connor Turland 2014-10-01 17:15:35 -0400
999dae34ea switched add link section on topic card to be without upload file for now Connor Turland 2014-10-01 16:44:11 -0400
8ef56735bf switch metacode set styling complete Connor Turland 2014-10-01 16:23:59 -0400
427fa99a0c Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 Bashar Jabbour 2014-10-01 15:15:43 -0400
a382e0c35d account page image border radius, fixed filters not working on first click issue Connor Turland 2014-10-01 14:07:48 -0400
031f97ba42 search results styling Connor Turland 2014-10-01 13:18:24 -0400
db719abf0f merge with develop Shai Mor 2014-10-01 09:57:40 -0400
57fb6a15c4 start on search results styling, pulled in external js libraries and css Shai Mor 2014-10-01 09:54:56 -0400
eccc433627 fixed realtime bug where couldn't populate filters because it was missing a new mapper model that just added something Connor Turland 2014-09-30 18:13:49 -0400
81f31ea10e heroku Connor Turland 2014-09-30 16:59:19 -0400
86e78919b3 initial code for realtime, got new topic, new synapse, and topic drag working Connor Turland 2014-09-30 16:55:25 -0400
bf36c31e4d Merge branch 'forgetpass' of https://github.com/Connoropolous/metamaps_gen002 Bashar Jabbour 2014-09-30 15:51:28 -0400
bc59c282a7 fixed the google analytics tracking code Bashar Jabbour 2014-09-30 15:34:35 -0400
b1d27d42ff did one as example, need to do rest Connor Turland 2014-09-29 22:33:03 -0400
c1885615cd remove tilda file Connor Turland 2014-09-29 22:26:50 -0400
2138aa89f3 closes #368. ability to add in metacode colors Connor Turland 2014-09-29 22:26:12 -0400
b8155ea091 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop Devin Howard 2014-09-29 19:33:17 -0400
f14bdfac57 fixed error in _filterBox that was causing maps not to load when a synapse had a nil description. for real this time Connor Turland 2014-09-29 16:50:41 -0400
f9a24058aa fixed error in _filterBox that was causing maps not to load when a synapse had a nil description Connor Turland 2014-09-29 16:45:59 -0400
2d2f98373e fixed error in _filterBox that was causing maps not to load when a synapse had a nil description Connor Turland 2014-09-29 16:41:16 -0400
06f18215dd bug fixes for mapping experience. able to store multiple references to synapses on each edge Connor Turland 2014-09-29 16:04:36 -0400
96d883bde7 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-09-29 10:45:15 -0400
2b16123a4f fixed field type error on user edit form Connor Turland 2014-09-29 10:45:08 -0400
ca8794e61b Merge pull request #365 from Connoropolous/wip-zoomExtents Connor Turland 2014-09-29 10:38:23 -0400
e827f474a4 Merge 2de7167c2c into 01b93fa6f4 Robert Best 2014-09-28 19:39:32 +0000
2de7167c2c A bunch of fixes for selection with box, and zoom to extents Robert Best 2014-09-28 15:29:22 -0400
66ee35e364 Fixed merge conflicts with wip-zoomextents code Robert Best 2014-09-26 23:34:27 -0400
33fd21c216 removed ubuntu docs Robert Best 2014-09-26 23:06:18 -0400
0160f56238 partially finished fixes to zoomextents Robert Best 2014-09-26 22:40:31 -0400
474b577d07 Merge pull request #362 from Connoropolous/forgetpass Connor Turland 2014-09-26 22:35:41 -0400
32908c7717 style changes for account pages Connor Turland 2014-09-26 22:31:06 -0400
14eb7562b1 fixed edit user account page BasharJabbour 2014-09-26 08:42:11 -0400
9593d3dc0f Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop Devin Howard 2014-09-25 18:35:30 -0400
c46ab1a98b added hover to edit photo Connor Turland 2014-09-25 13:41:37 -0400
71247a8f04 fixes for account pages Connor Turland 2014-09-25 13:26:09 -0400
3f901074ec Merge branch 'forgetpass' of https://github.com/Connoropolous/metamaps_gen002 into accounts Connor Turland 2014-09-25 12:31:29 -0400
6f62d59b66 Sign In, Sign Up, Edit User pages have been changed. Edit User page needs lots of work still. BasharJabbour 2014-09-25 12:25:46 -0400
c817622984 for heroku Connor Turland 2014-09-24 17:15:39 -0400
265295a8a8 added color generator for each collaborator Connor Turland 2014-09-24 17:14:46 -0400
4ec9c4cb98 add zoom and pas events for multiple peers and label direction for compassCollab Shai Mor 2014-09-24 16:25:22 -0400
74b4659836 broke out functionality for positionPeerIcon from updatePeerCoords Connor Turland 2014-09-24 14:05:18 -0400
d5598819fd add arrowCompass for collab: direction indication of other users on the map Shai Mor 2014-09-24 11:00:22 -0400
b163442163 collab compass nowrap Connor Turland 2014-09-24 08:45:46 -0400
58ff70717e heroku Connor Turland 2014-09-23 10:37:08 -0400
dd6a21191a heroku Connor Turland 2014-09-22 23:56:47 -0400
c2340301fd Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-09-22 23:42:37 -0400
aaf2e4c521 right click styling Connor Turland 2014-09-22 23:42:26 -0400
1396b02952 collabCompass img&p for content and styling Shai Mor 2014-09-22 11:44:09 -0400
d115861584 collabCompass img and p for content and styling Shai Mor 2014-09-22 11:36:53 -0400
fe1f35d63e Merge pull request #361 from Connoropolous/forgotpass Connor Turland 2014-09-22 06:28:34 -0400
5e76b44b80 centered reset password box Bashar 2014-09-21 20:47:09 -0400
f0650bb16f Update MacInstallation.md Bashar Jabbour 2014-09-21 19:19:19 -0400
069548ef66 Update MacInstallation.md Bashar Jabbour 2014-09-21 19:18:32 -0400
ff6eef7807 synapse form styling and positioning Connor Turland 2014-09-21 01:02:21 -0400
90e974164d added more resources into help lightbox Connor Turland 2014-09-20 15:11:58 -0400
ac867d00ab m Connor Turland 2014-09-18 02:39:00 -0400
683b459eeb Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-09-18 02:33:44 -0400
af5560b495 updates to metacode select within topic card Connor Turland 2014-09-18 02:33:38 -0400
0bf28410e6 switch metaset view changes Shai Mor 2014-09-17 10:59:36 -0400
f62ca67d9f prevent self showing up on realtime problem Connor Turland 2014-09-15 22:04:44 -0400
b6893d8f92 fixed admin panels Connor Turland 2014-09-15 21:57:34 -0400
6fe8cf4b88 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-09-12 15:07:52 -0400
b722dc911b help qr tutorials Shai Mor 2014-09-12 11:45:53 -0400
0941b43391 fixed spacing on abuot lightbox Connor Turland 2014-09-11 08:39:56 -0400
30d82ba870 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-09-11 08:35:29 -0400
90f2477566 fixed map update controller Connor Turland 2014-09-11 08:35:16 -0400
f49f45e856 about, invite, getInvolved Shai Mor 2014-09-10 18:12:21 -0400
23385a946e Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop Shai Mor 2014-09-10 16:32:36 -0400
f91728cdb6 get involved lightbox styling Shai Mor 2014-09-10 16:32:18 -0400
4f8a8e2fde for heroku Connor Turland 2014-09-10 15:18:20 -0400
3d35d44c3f realtime improvement Connor Turland 2014-09-10 15:17:43 -0400
ac8c589a77 config for heroku Connor Turland 2014-09-10 15:07:34 -0400
28bfb8ac21 better architecture for entering and exiting maps from the home page Connor Turland 2014-09-10 15:06:39 -0400
3a7501cc7a merge shai's changes Connor Turland 2014-09-09 18:20:17 -0400
d2760b8688 change in embedly Connor Turland 2014-09-09 18:17:39 -0400
d18806bb18 merge in connors css Shai Mor 2014-09-09 15:17:49 -0400
4f85055c74 styled create map forms Shai Mor 2014-09-09 15:13:53 -0400
7c6b894888 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-09-03 19:07:54 -0400
901c028d52 configure for heroku Connor Turland 2014-09-03 19:07:45 -0400
eedd3736cf realtime and filter box styling Connor Turland 2014-09-03 19:05:25 -0400
b8794a1c59 Update README.md Connor Turland 2014-09-03 12:11:51 -0400
d8d4a0f967 Create CHANGELOG.md Connor Turland 2014-09-03 12:09:57 -0400