Commit graph

677 commits

Author SHA1 Message Date
Connor Turland d2760b8688 change in embedly 2014-09-09 18:17:39 -04:00
Connor Turland 7c6b894888 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-03 19:07:54 -04:00
Connor Turland 901c028d52 configure for heroku 2014-09-03 19:07:45 -04:00
Connor Turland eedd3736cf realtime and filter box styling 2014-09-03 19:05:25 -04:00
Connor Turland b8794a1c59 Update README.md 2014-09-03 12:11:51 -04:00
Connor Turland d8d4a0f967 Create CHANGELOG.md 2014-09-03 12:09:57 -04:00
Connor Turland 8e7d9c80f9 Create CONTRIBUTING.md 2014-09-03 12:02:00 -04:00
Connor Turland 3afb749510 Create MacInstallation.md 2014-09-03 11:41:54 -04:00
Connor Turland 986fb0e22c Update WindowsInstallation.md 2014-09-03 11:40:35 -04:00
Connor Turland a154cb2a45 Update UbuntuInstallation.md 2014-09-03 11:40:08 -04:00
Connor Turland c407341f49 Create WindowsInstallation.md 2014-09-03 11:38:43 -04:00
Connor Turland 78b41760e1 Update UbuntuInstallation.md 2014-09-03 11:31:59 -04:00
Connor Turland c38d627de3 Update and rename Ubuntu README.rdoc to UbuntuInstallation.md 2014-09-03 11:30:29 -04:00
Connor Turland fe77897dc5 Update and rename Metamaps AGPL License.txt to LICENSE 2014-09-03 11:25:18 -04:00
Connor Turland 853c9432d3 Update and rename README.rdoc to README.md 2014-09-03 11:20:16 -04:00
Connor Turland 1ccaccdb32 small css syntax fix 2014-08-26 23:01:08 -04:00
Connor Turland fdf0c28daf sprites 2014-08-26 22:51:50 -04:00
Connor Turland f6245df997 added 20 at a time loading for explore maps pages 2014-08-20 15:37:18 -04:00
Connor Turland 2d338bb785 fixed right click menu and also added change metacodes to it 2014-08-19 14:13:45 -04:00
Connor Turland 1557c7d4e9 config for heroku 2014-08-18 12:41:49 -04:00
Connor Turland 7df57cd013 feedback tab and explore maps pages styling 2014-08-18 12:40:51 -04:00
Connor Turland ff03fb19a1 adding a few icons 2014-08-18 11:17:01 -04:00
Connor Turland 45828d048e added some of the icons 2014-08-17 14:46:07 -04:00
Connor Turland 5cfbb82760 configured for local dev 2014-08-15 22:46:36 -04:00
Connor Turland 987f3c3ab5 added first pass ishans icons, removed old unnecessary icons 2014-08-15 18:27:40 -04:00
Connor Turland 6eca81487a started styling of map cards and topic card, removed new maps section 2014-08-15 18:04:22 -04:00
Connor Turland 46380a17e0 got maps wrapper working 2014-08-12 19:20:46 -04:00
Connor Turland 6422b54dc0 clickable map cards 2014-08-12 18:14:04 -04:00
Connor Turland 35835fcc80 fixed home page difference between being logged in and logged out 2014-08-12 13:45:29 -04:00
Connor Turland 6bdc6ec397 fix for filtering when no edge or node is returned from the topic or synapse 2014-08-12 13:30:56 -04:00
Connor Turland c989b321c1 switched filter box to be by who added something to the map, not who created the topic or synapse 2014-08-12 13:22:29 -04:00
Shai Mor 304c9f3b4b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai 2014-08-12 12:56:20 -04:00
Shai Mor f8e6be70e1 fixed topic card css 2014-08-12 12:56:13 -04:00
Connor Turland 173179d682 fixed filters, updated ruby models further for returning json 2014-08-12 12:01:01 -04:00
Connor Turland f0eb4da6a9 realtime for heroku 2014-08-12 11:10:32 -04:00
Connor Turland e1fb72c2df fixed user model and map models up 2014-08-12 11:09:53 -04:00
Connor Turland 9d6cf2c3c8 further improved explore maps switching 2014-08-11 22:47:38 -04:00
Connor Turland 5627b59d59 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-08-11 22:31:44 -04:00
Connor Turland 278b6213bb improved explore maps pages 2014-08-11 22:31:28 -04:00
Shai Mor 65c8cb2ea7 embed attachments 2014-08-11 21:59:02 -04:00
Shai Mor 3be9dcfd74 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai 2014-08-11 18:59:27 -04:00
Connor Turland bbc50d1305 got radial view working 2014-08-11 18:57:34 -04:00
Shai Mor 4541196ffe part way through add links to topic cards 2014-08-11 18:56:03 -04:00
Shai Mor 85bfce0237 part way through add links to topic cards 2014-08-11 18:55:53 -04:00
Connor Turland f4cbd9b25d added background 2014-08-11 12:12:46 -04:00
Connor Turland 995d49a5bd reseting the filter box when you switch dynamically between maps 2014-08-11 12:04:06 -04:00
Connor Turland 22e07e4ca8 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-08-11 11:03:08 -04:00
Connor Turland 8bc1e0c9ee added background file 2014-08-11 11:03:00 -04:00
Connor Turland fb35bbf716 Update templates.js 2014-08-11 09:21:58 -04:00
Connor Turland 39140a06e6 moved famous files 2014-08-10 19:52:39 -04:00