Commit graph

  • 8e7d9c80f9 Create CONTRIBUTING.md Connor Turland 2014-09-03 12:02:00 -04:00
  • 3afb749510 Create MacInstallation.md Connor Turland 2014-09-03 11:41:54 -04:00
  • 986fb0e22c Update WindowsInstallation.md Connor Turland 2014-09-03 11:40:35 -04:00
  • a154cb2a45 Update UbuntuInstallation.md Connor Turland 2014-09-03 11:40:08 -04:00
  • c407341f49 Create WindowsInstallation.md Connor Turland 2014-09-03 11:38:43 -04:00
  • 78b41760e1 Update UbuntuInstallation.md Connor Turland 2014-09-03 11:31:59 -04:00
  • c38d627de3 Update and rename Ubuntu README.rdoc to UbuntuInstallation.md Connor Turland 2014-09-03 11:30:29 -04:00
  • fe77897dc5 Update and rename Metamaps AGPL License.txt to LICENSE Connor Turland 2014-09-03 11:25:18 -04:00
  • 853c9432d3 Update and rename README.rdoc to README.md Connor Turland 2014-09-03 11:20:16 -04:00
  • 1ccaccdb32 small css syntax fix Connor Turland 2014-08-26 23:01:08 -04:00
  • fdf0c28daf sprites Connor Turland 2014-08-26 22:51:50 -04:00
  • f6245df997 added 20 at a time loading for explore maps pages Connor Turland 2014-08-20 15:37:18 -04:00
  • 2d338bb785 fixed right click menu and also added change metacodes to it Connor Turland 2014-08-19 14:13:45 -04:00
  • 1557c7d4e9 config for heroku Connor Turland 2014-08-18 12:41:49 -04:00
  • 7df57cd013 feedback tab and explore maps pages styling Connor Turland 2014-08-18 12:40:51 -04:00
  • ff03fb19a1 adding a few icons Connor Turland 2014-08-18 11:17:01 -04:00
  • 45828d048e added some of the icons Connor Turland 2014-08-17 14:46:07 -04:00
  • b15da256fa Included title box size in zoom to extents and put a limits on the zooming Robert Best 2014-08-16 12:46:06 -04:00
  • d55d939971 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 Robert Best 2014-08-15 22:47:45 -04:00
  • 5cfbb82760 configured for local dev Connor Turland 2014-08-15 22:46:36 -04:00
  • 987f3c3ab5 added first pass ishans icons, removed old unnecessary icons Connor Turland 2014-08-15 18:27:40 -04:00
  • 6eca81487a started styling of map cards and topic card, removed new maps section Connor Turland 2014-08-15 18:04:22 -04:00
  • 46380a17e0 got maps wrapper working Connor Turland 2014-08-12 19:20:46 -04:00
  • 6422b54dc0 clickable map cards Connor Turland 2014-08-12 18:14:04 -04:00
  • 35835fcc80 fixed home page difference between being logged in and logged out Connor Turland 2014-08-12 13:45:29 -04:00
  • 6bdc6ec397 fix for filtering when no edge or node is returned from the topic or synapse Connor Turland 2014-08-12 13:30:56 -04:00
  • c989b321c1 switched filter box to be by who added something to the map, not who created the topic or synapse Connor Turland 2014-08-12 13:22:29 -04:00
  • 304c9f3b4b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai Shai Mor 2014-08-12 12:56:20 -04:00
  • f8e6be70e1 fixed topic card css Shai Mor 2014-08-12 12:56:13 -04:00
  • 173179d682 fixed filters, updated ruby models further for returning json Connor Turland 2014-08-12 12:01:01 -04:00
  • f0eb4da6a9 realtime for heroku Connor Turland 2014-08-12 11:10:32 -04:00
  • e1fb72c2df fixed user model and map models up Connor Turland 2014-08-12 11:09:53 -04:00
  • 9d6cf2c3c8 further improved explore maps switching Connor Turland 2014-08-11 22:47:38 -04:00
  • 5627b59d59 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-08-11 22:31:44 -04:00
  • 278b6213bb improved explore maps pages Connor Turland 2014-08-11 22:31:28 -04:00
  • 65c8cb2ea7 embed attachments Shai Mor 2014-08-11 21:59:02 -04:00
  • 3be9dcfd74 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai Shai Mor 2014-08-11 18:59:27 -04:00
  • bbc50d1305 got radial view working Connor Turland 2014-08-11 18:57:34 -04:00
  • 4541196ffe part way through add links to topic cards Shai Mor 2014-08-11 18:56:03 -04:00
  • 85bfce0237 part way through add links to topic cards Shai Mor 2014-08-11 18:55:53 -04:00
  • f4cbd9b25d added background Connor Turland 2014-08-11 12:12:46 -04:00
  • 995d49a5bd reseting the filter box when you switch dynamically between maps Connor Turland 2014-08-11 12:04:06 -04:00
  • 22e07e4ca8 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-08-11 11:03:08 -04:00
  • 8bc1e0c9ee added background file Connor Turland 2014-08-11 11:03:00 -04:00
  • fb35bbf716 Update templates.js Connor Turland 2014-08-11 09:21:58 -04:00
  • 39140a06e6 moved famous files Connor Turland 2014-08-10 19:52:39 -04:00
  • 34500b3255 little fix for Util.splitLine Connor Turland 2014-08-10 19:44:53 -04:00
  • b596228782 restructuring for famous Connor Turland 2014-08-10 19:35:18 -04:00
  • 465b95753c reorganize for functional famous operation Connor Turland 2014-08-10 19:24:39 -04:00
  • 8fdae123d2 application.css issue Connor Turland 2014-08-10 19:17:32 -04:00
  • afed3657c2 removed vendor plugins Connor Turland 2014-08-10 19:15:01 -04:00
  • 341f9b9bdd home page styling Connor Turland 2014-08-10 19:13:25 -04:00
  • 6182ba4e14 data validation Shai 2014-08-10 16:52:49 -04:00
  • a90eb90822 small fixes in backbone Connor Turland 2014-08-10 16:20:21 -04:00
  • bc593fe614 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-08-10 13:07:27 -04:00
  • 06b35e550d first draft of explore maps working Connor Turland 2014-08-10 13:06:58 -04:00
  • 01b93fa6f4 Update Ubuntu README.md Connor Turland 2014-08-10 00:08:32 -04:00
  • b896770db8 Update Ubuntu README.md Connor Turland 2014-08-10 00:01:09 -04:00
  • 2d70c1b0a6 Update and rename Ubuntu README.rdoc to Ubuntu README.md Connor Turland 2014-08-09 23:53:55 -04:00
  • bef531fb07 Update Ubuntu README.rdoc Connor Turland 2014-08-09 23:53:13 -04:00
  • 3b781edbda Update Ubuntu README.rdoc Connor Turland 2014-08-09 23:52:22 -04:00
  • a9fc2f19f4 Added zoom to selected nodes feature Robert Best 2014-08-07 08:21:13 -04:00
  • d14d505c3a pulling in Connors work on routers Merge branch 'connor' of https://github.com/Connoropolous/metamaps_gen002 into new Connor Turland 2014-08-06 10:16:53 -04:00
  • fe3536e20b remove console log Connor Turland 2014-08-06 10:16:43 -04:00
  • e9863c0192 merge with Robs changes Connor Turland 2014-08-06 10:14:17 -04:00
  • e7a445423d work in progress on explore maps pages Connor Turland 2014-08-06 10:09:01 -04:00
  • f75c2c1f8a Added Recenter map, zoom in, zoom out, Zoom to extents and buttons for each. Also, renamed selection function to just SelectWithBox() Robert Best 2014-08-06 04:22:06 -04:00
  • 910c6a8984 merge application.js Robert Best 2014-08-06 02:37:29 -04:00
  • 9cab20dc2a Merge robs changes Merge remote-tracking branch 'origin/develop' into new Tadasu85 2014-08-04 12:21:09 -04:00
  • e76d780335 Filter box coding changes, Full implementgit add . Tadasu85 2014-08-04 12:20:16 -04:00
  • c7b768d7f4 Finished selectWithBox using right click and made Ctrl and Shift work in the 'typical' way... Also, holdig alt now selects only nodes Robert Best 2014-08-03 18:34:22 -04:00
  • a939e7ef23 Merge remote-tracking branch 'origin/develop' into new Robert Best 2014-08-02 14:32:29 -04:00
  • b09eed715b specify redis gem version number Robert Best 2014-08-02 14:32:07 -04:00
  • 581ba8b78f Merge remote-tracking branch 'origin/develop' into new Tadasu85 2014-08-02 13:51:54 -04:00
  • 2b267ea0c6 filterbox progress Tadasu85 2014-08-02 13:49:51 -04:00
  • 0a29bed856 fixed topics and synapses placing on map issue Connor Turland 2014-08-02 13:48:41 -04:00
  • e08c702494 introduced the metamaps.router Connor Turland 2014-08-01 22:50:23 -04:00
  • 3476d0126c got rgraph working again Connor Turland 2014-07-30 21:10:10 -04:00
  • e702f7023f renamed application to not be ISSAD, now Metamaps Connor Turland 2014-07-30 01:24:20 -04:00
  • 9dec959aee more restructuring. reorganizing views files to make more sense, be grouped logically Connor Turland 2014-07-30 01:02:47 -04:00
  • f817ce772c changed approach to map creation. reorganized code to suit that. Connor Turland 2014-07-29 23:18:43 -04:00
  • ae8c711d27 major code refactor Connor Turland 2014-07-29 13:34:10 -04:00
  • de2c7372fd removed extra files Connor Turland 2014-07-27 15:59:02 -04:00
  • b06f5cae35 huge refactor 75% done Connor Turland 2014-07-27 15:57:35 -04:00
  • eceb1174c3 removed ccircular image processor to test Connor Turland 2014-07-08 00:21:43 -04:00
  • aa5e3d522b set proper socket for heroku Connor Turland 2014-07-07 21:08:14 -04:00
  • 96197130e1 added rmagick and ruby number for heroku Connor Turland 2014-07-07 21:02:43 -04:00
  • 3018186c3f removed other alerts Connor Turland 2014-06-25 10:26:35 -04:00
  • 24280e82fa removed alert('failure') Connor Turland 2014-06-25 10:24:24 -04:00
  • e5ba207711 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2014-06-15 14:41:11 -04:00
  • 9027cd6d2e closes #352 size of cheatsheet window, closes #351 remove topic and synapse create from cheatsheet on topic pages, closes #348 enter key creating undesirable line break Connor Turland 2014-06-15 14:39:42 -04:00
  • a0cdad2138 Update _cheatsheet.html.erb poietic 2014-06-15 10:52:38 -04:00
  • 0982916e10 hid topic view tab which was mistakenly showing Connor Turland 2014-06-14 18:25:37 -04:00
  • bffda35686 updated cheatsheet to be tabbed Connor Turland 2014-06-14 18:21:54 -04:00
  • 2bb5c7a6bd added homepage image Connor Turland 2014-06-11 22:38:48 -04:00
  • e9b25be060 blurred input when closing search so that typing in it is no longer possible Connor Turland 2014-06-11 19:29:05 -04:00
  • e67a520a24 added EsC key to cancel search Connor Turland 2014-06-11 19:18:59 -04:00
  • 60e9a85140 fixed issue where adding multiple versions of the same person to the realtime list Connor Turland 2014-06-11 18:42:39 -04:00
  • 0a3f83ade9 added realtime box Connor Turland 2014-06-11 16:47:46 -04:00
  • ceb30ee5d6 error in selectEdgeOnClickHandler fixed Connor Turland 2014-06-11 11:05:04 -04:00