metamaps--metamaps

glenux-contrib/metamaps--metamaps

Fork 0

Commit graph

40cebf572c Merge pull request #378 from metamaps/embedly Connor Turland 2015-01-28 19:33:54 -0500
bb99583622 updated embedly library, and data-card-chrome was now causing a breaking change Connor Turland 2015-01-28 19:19:07 -0500
e22c3f33e9 first trial of linked data map response feature/json Connor Turland 2015-01-24 16:37:40 -0500
1a4a2df6c6 remove having to be authed to see metacode json Connor Turland 2015-01-24 14:50:53 -0500
3d5ed63534 expose unique metacode urls Connor Turland 2015-01-24 14:34:44 -0500
f463140931 link to download json for map placed onto map interface Connor Turland 2015-01-24 12:43:35 -0500
07e0aac7fd Update README.md Connor Turland 2015-01-22 23:02:11 -0500
36e84d61fd Update UbuntuInstallation.md Connor Turland 2015-01-22 22:59:11 -0500
bf7b25f7de Update README.md Connor Turland 2015-01-22 22:56:36 -0500
89e31d14b2 Delete codeguide.txt Connor Turland 2015-01-22 22:43:31 -0500
ebfe8257bd Delete .buildpacks Connor Turland 2015-01-22 22:43:04 -0500
f7d537ed64 Delete Procfile Connor Turland 2015-01-22 22:42:52 -0500
84e9eb385c Delete LiveSiteUpdatesNotes.txt Connor Turland 2015-01-22 22:42:29 -0500
0f526d1696 Merge pull request #376 from metamaps/bug-removeNodes Connor Turland 2015-01-22 21:52:06 -0500
f3569d17aa more commented code removed from realtime Connor Turland 2015-01-22 21:45:52 -0500
1b9dd6dc14 fix z-index for firefox Connor Turland 2015-01-22 21:42:45 -0500
595ff893f3 removed console logs Connor Turland 2015-01-22 21:42:21 -0500
bf08b562c2 removed all the extra stuff Connor Turland 2015-01-22 21:41:41 -0500
b395ecfded Merge branch 'vagrant' Connor Turland 2015-01-22 19:35:33 -0500
65e70d8b6d added npm, forever, and start and stop scripts Connor Turland 2015-01-22 19:33:57 -0500
a91c9951e3 extract mapmaker step 1 feature/extract.front.end Connor Turland 2015-01-22 18:29:17 -0500
5592c4710a Created a Vagrantfile Gord Tanner 2015-01-22 17:53:18 -0500
263eef52ce maps were crashing when topics were removed (if those topics included the 'root node'. this was caused by a setTimeout interfering with synchronicity of events Connor Turland 2015-01-11 13:30:05 -0500
b2fce96974 Update CONTRIBUTING.md poietic 2014-12-26 10:05:36 -0800
24bd0a96a8 fixed links to CLA/CAA poietic 2014-12-26 10:04:15 -0800
d069cecc9b fixed unfound merge conflict Connor Turland 2014-12-03 09:00:05 -0500
a83c3e4b85 removed any more references to mapper generation Connor Turland 2014-12-03 08:48:58 -0500
f094fd29f7 cleaned up unwanted stuff from metamapscc for tvw Connor Turland 2014-12-03 08:39:12 -0500
1b5ac1dafa merged develop into thevalueweb Connor Turland 2014-12-03 08:26:11 -0500
48cab05d7c Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop Connor Turland 2014-12-02 13:32:48 -0500
eece1446f2 added tutorial Connor Turland 2014-12-02 13:32:36 -0500
8a8123c3c2 copy changes to homepage poietic 2014-11-30 16:55:48 -0800
9b415e4e6d fixed partners & supporters poietic 2014-11-30 12:09:49 -0800
44e98e00a7 fixed metacode file name poietic 2014-11-30 11:57:06 -0800
6a08d7e86f supported by poietic 2014-11-30 11:53:41 -0800
bcf7edb880 changed other references to connoropolous/metamaps_gen002 to metamaps/metamaps_gen002 Connor Turland 2014-11-30 14:27:20 -0500
f62efa0d68 fixed terms of service link for live site Connor Turland 2014-11-30 14:06:59 -0500
7548c1953f Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop Connor Turland 2014-11-30 13:52:32 -0500
ce7bec98ed fixed wrong notify message bug. fixed firefox z-index issue. moved fork on github link and pointed to new metamaps repo Connor Turland 2014-11-30 13:47:41 -0500
2b7d70dfe8 changed metacodes poietic 2014-11-29 21:12:02 -0800
2aacd545ec solved text bolding issue on mac Bashar Jabbour 2014-11-29 17:27:33 -0500
b883d03b4e make synapse card mapper icon link to mapper profile Bashar Jabbour 2014-11-29 16:36:57 -0500
12dd2f32b4 fixed conflict Bashar Jabbour 2014-11-29 16:28:42 -0500
0e3486ddc5 make topic card mapper icon link to mapper profile Bashar Jabbour 2014-11-29 16:27:43 -0500
411efa9692 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop Connor Turland 2014-11-29 16:06:04 -0500
694d36b6a6 ctrl+click doesn't zoom awkwardly Connor Turland 2014-11-29 16:05:56 -0500
10dedaa169 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 Bashar Jabbour 2014-11-29 15:57:42 -0500
ce3ab9903a make map contributor list dropdown into links to profiles Bashar Jabbour 2014-11-29 15:56:38 -0500
8b146fccab Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 Devin Howard 2014-11-29 15:53:53 -0500
739eba71bb only one router setTimeout function at a time - make it erase old functions if new one Devin Howard 2014-11-29 15:51:31 -0500
93227f0e2f fixed synapse selection and removal of multiple topics bugs Connor Turland 2014-11-29 15:36:03 -0500
fe3d280862 remove console.log from Connor Devin Howard 2014-11-29 15:29:16 -0500
5f347bff67 remove console.logs whoops Devin Howard 2014-11-29 15:24:34 -0500
453758a9ff use lambda to store currentPage so explore/mine doesn't get rendered incorrectly in url as explore/<mapid> Devin Howard 2014-11-29 15:23:53 -0500
f938ffade3 homepage changes Connor Turland 2014-11-29 12:25:11 -0500
0f0db1662e one semicolon Connor Turland 2014-11-29 11:34:20 -0500
e3bf41b133 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop Connor Turland 2014-11-29 11:26:55 -0500
da087a4c72 css for lightbox links Connor Turland 2014-11-29 11:26:47 -0500
6ae98169e0 box shadow for lightboxes poietic 2014-11-29 08:20:17 -0800
f9d3292891 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop Connor Turland 2014-11-29 11:17:33 -0500
f02aa53637 fixed feedback tab, added support us button Connor Turland 2014-11-29 11:17:11 -0500
99b0fa0c68 links in light boxes poietic 2014-11-29 08:06:12 -0800
09d8fbacb6 disabled tutorials tab for now Connor Turland 2014-11-29 10:51:27 -0500
9f65fffe5f showed help button on logged in home page Connor Turland 2014-11-29 10:24:57 -0500
61c6c8c5c1 added empty canvas helper message Connor Turland 2014-11-29 10:18:18 -0500
cb3db06406 switched home page to active maps instead of my maps Connor Turland 2014-11-29 01:37:06 -0500
870b4e2829 hid elements from homepage Connor Turland 2014-11-27 21:45:04 -0500
da6a7aadfb fixed synapse creation. replaced homepage bg image Connor Turland 2014-11-27 21:32:04 -0500
0e3393e1b5 fixed metacode select lists to be flexible to metacodes Connor Turland 2014-11-27 18:10:17 -0500
caa80c067b links to maps go through without refresh from topic card. Connor Turland 2014-11-27 17:27:22 -0500
6408f81d08 updated feedback & partner logo images poietic 2014-11-27 12:10:24 -0800
a284889593 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 Bashar Jabbour 2014-11-27 15:02:58 -0500
78743fbba5 updated the tooltip of maps topic appears in Bashar Jabbour 2014-11-27 15:02:44 -0500
47b5e9c288 fixed search alignment & drop shadow poietic 2014-11-27 11:56:45 -0800
7cc6fb6c2d added right click keyboard shortcuts and spacer/border Connor Turland 2014-11-27 11:21:25 -0500
f6fdd72cf8 fixed sign in form to use correct size for anonymous user image Connor Turland 2014-11-26 16:49:56 -0500
2829005d4e Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop Connor Turland 2014-11-26 16:37:50 -0500
377138c483 fixed up search results some. colophon links open in new tab. updated homepage bg image. fixed topic carousel dimensions Connor Turland 2014-11-26 16:37:13 -0500
363ca365c1 added tooltip to see topics synapses Bashar Jabbour 2014-11-26 15:23:32 -0500
ab53e996d4 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop Connor Turland 2014-11-26 14:49:16 -0500
36aeead2aa homepage updates. updated the 'last updated' text. fixed map cards Connor Turland 2014-11-26 14:49:01 -0500
814a804dd8 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 Bashar Jabbour 2014-11-26 14:44:42 -0500
085bf78b0e added tooltip for maps that topic appears in Bashar Jabbour 2014-11-26 14:44:31 -0500
a003e203af big home change revisions. not 100% complete Connor Turland 2014-11-26 12:58:20 -0500
dbf4152a81 updated map delete sprite Connor Turland 2014-11-26 10:51:05 -0500
d08774d8bc changed user image settings. added mapper profile page Connor Turland 2014-11-25 15:06:30 -0500
54bb3d2c3d updated the 404 page. fixed merge conflicts. removed generation code Connor Turland 2014-11-23 22:58:30 -0500
e9114a309f fixed up map info box issues, finished up search tooltips Connor Turland 2014-11-23 22:28:29 -0500
b077dd6010 added tooltip in search results for map Bashar Jabbour 2014-11-22 23:05:31 -0500
13118d0ea9 fixed firefox synapse card styling Bashar Jabbour 2014-11-22 20:49:59 -0500
7bf87c7a4b fixed label placement on safari Bashar Jabbour 2014-11-22 20:04:23 -0500
5725007e78 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 Bashar Jabbour 2014-11-22 19:35:15 -0500
23510f2f87 added user image stack for map search results and associated tooltip Bashar Jabbour 2014-11-22 19:35:03 -0500
c1728b9ecb fixed mouse mappings Connor Turland 2014-11-22 16:47:09 -0500
2de697bcca ensured that new users can sign up with other new users invite codes Connor Turland 2014-11-21 17:24:08 -0500
a9e488d9cb NOTE: rake db:migrate required. added generation column to users Connor Turland 2014-11-21 16:50:42 -0500
0ebc3dbc37 filter and realtime button active states. zoomExtents excludes filtered topics Connor Turland 2014-11-21 15:45:44 -0500
e9a39f9838 made map contributors toggle visibility on click Connor Turland 2014-11-20 22:50:47 -0500
a20f6b760f finished up map info box in terms of dynamically switching pages to other maps. styled other tips. Connor Turland 2014-11-19 22:42:14 -0500
2fe33f0f57 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop Connor Turland 2014-11-19 13:02:02 -0500