Commit graph

218 commits

Author SHA1 Message Date
poietic
ebf90e3da5 updated commons map tip. 2014-10-29 12:26:55 -04:00
Connor Turland
21ebc41a02 merge develop typekit changes 2014-10-27 17:47:57 -04:00
Connor Turland
c35174a99e removed extraneous typekit codes 2014-10-27 17:34:15 -04:00
Connor Turland
8e55d32146 Merge branch 'develop' into tvw 2014-10-24 12:11:24 -04:00
Connor Turland
cbf71ca2da four little styling bugs 2014-10-24 12:10:56 -04:00
Connor Turland
75c286ecc6 merged develop fixes 2014-10-24 11:31:39 -04:00
Connor Turland
1aaecd0a8f improved sign up error display, fixed styling for firefox, fixed page stuck on loading spinner bug 2014-10-24 11:30:26 -04:00
Connor Turland
ed7844d195 fixed merge from develop 2014-10-23 20:19:40 -04:00
Connor Turland
2d0793c083 fixed broken lightbox content 2014-10-23 20:16:04 -04:00
Connor Turland
486ebb0d41 Merge branch 'thevalueweb' of github.com:Connoropolous/metamaps_gen002 into tvw 2014-10-23 19:54:48 -04:00
Connor Turland
189f04780c rejig urls, switch support image, add default map image 2014-10-23 19:54:39 -04:00
poietic
167f75a573 removed intro video reference 2014-10-23 13:00:48 -04:00
poietic
5c3b46ed0d "about" content and "colophon" content for TVW. 2014-10-23 12:59:41 -04:00
Connor Turland
c6195956ca fixed topright sprite and fixed typekits for develop 2014-10-22 21:32:38 -04:00
Connor Turland
e61a32ebaa removed typekit for mooo.com, fixed topright_sprite 2014-10-22 21:26:37 -04:00
Connor Turland
fdfa720849 fixed ga code, and updated topright_sprite image with one that doesn't have littl glitches 2014-10-22 21:04:28 -04:00
poietic
89b6305be8 updated bitcoin widget with correct wallet info 2014-10-22 17:07:41 -04:00
Connor Turland
3d973dc7f3 styled homepage, made sure password forgot, and password reset pages were accessible when logged out, updated metacode images 2014-10-22 13:41:06 -04:00
Connor Turland
37455abfe9 removed lightboxes, password protected 2014-10-18 19:26:34 -04:00
Raymon Johnstone
6840d69747 lightboxes and stylesheet changes 2014-10-18 13:56:45 -04:00
Connor Turland
1f7df00d3c setup google analytics and production urls 2014-10-18 12:46:45 -04:00
Connor Turland
fbfe695998 adding topics to map from search results happens in a spiral 2014-10-16 23:54:26 -04:00
Raymon Johnstone
a9414c29d2 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop 2014-10-14 23:20:20 -04:00
Raymon Johnstone
3c7db77395 backing up bitcoin 2014-10-14 23:19:58 -04:00
Connor Turland
0ebb02bc0b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom 2014-10-14 16:34:26 -04:00
Connor Turland
f9f147304f styling for map info box mostly complete 2014-10-14 16:34:09 -04:00
Raymon Johnstone
0e5e814065 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop 2014-10-13 23:21:53 -04:00
Raymon Johnstone
b1ae75a896 updates to all walkthroughs about the fact that we now use rails 2.1.2 as well as a couple changes to the get involved lightbox 2014-10-13 23:18:25 -04:00
Connor Turland
51221ee3f7 improvements to map info card, as well as small changes to the permission changers in the topic and synapse cards 2014-10-13 19:27:30 -04:00
Connor Turland
fcdc6d57b2 setup for automatic config for urls 2014-10-10 21:24:31 -04:00
Connor Turland
cde771e007 got map screenshot working decent 2014-10-08 00:07:54 -04:00
Connor Turland
db3a4b66ad fixed issue that others might end up having with sso_key 2014-10-07 19:14:25 -04:00
Connor Turland
d4c481aac0 internet explorer get browser links open in new tabs 2014-10-07 17:57:12 -04:00
Connor Turland
e756b29baa Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-10-07 17:46:34 -04:00
Connor Turland
629a6a4172 fixed sign in redirects 2014-10-07 17:46:09 -04:00
Bashar Jabbour
c8bda1bdf1 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-10-07 16:14:14 -04:00
Bashar Jabbour
8a70d209d1 fixed the links in noIE lightbox 2014-10-07 16:14:00 -04:00
Connor Turland
9ba6daec90 further fixed uservoice to identify user 2014-10-07 15:39:11 -04:00
Connor Turland
6eec187eee Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-10-07 15:19:30 -04:00
Connor Turland
b5068b6bc4 finalized uservoice config 2014-10-07 15:19:10 -04:00
Bashar Jabbour
e3c677fa5b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-10-07 14:47:18 -04:00
Bashar Jabbour
e405cc5a5d updated the noIE lightbox 2014-10-07 14:47:06 -04:00
Raymon Johnstone
3cb5c4ce3a index on develop: d30417f fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar 2014-10-07 12:39:14 -04:00
Bashar Jabbour
80221f1dd4 small updates to colophone 2014-10-01 23:25:49 -04:00
Bashar Jabbour
179cee8456 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-10-01 20:43:23 -04:00
Bashar Jabbour
8caabb6ce1 update the colophone page 2014-10-01 20:43:11 -04:00
Shai Mor
4ba9a26c2b style sidebar search mapper stats 2014-10-01 18:07:05 -04:00
Bashar Jabbour
427fa99a0c Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-10-01 15:15:43 -04:00
Connor Turland
031f97ba42 search results styling 2014-10-01 13:18:24 -04:00
Shai Mor
db719abf0f merge with develop 2014-10-01 09:57:40 -04:00
Shai Mor
57fb6a15c4 start on search results styling, pulled in external js libraries and css 2014-10-01 09:54:56 -04:00
Bashar Jabbour
bc59c282a7 fixed the google analytics tracking code 2014-09-30 15:34:35 -04:00
Connor Turland
2138aa89f3 closes #368. ability to add in metacode colors 2014-09-29 22:26:12 -04:00
Connor Turland
71247a8f04 fixes for account pages 2014-09-25 13:26:09 -04:00
Connor Turland
aaf2e4c521 right click styling 2014-09-22 23:42:26 -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
af5560b495 updates to metacode select within topic card 2014-09-18 02:33:38 -04:00
Connor Turland
b6893d8f92 fixed admin panels 2014-09-15 21:57:34 -04:00
Connor Turland
0941b43391 fixed spacing on abuot lightbox 2014-09-11 08:39:56 -04:00
Shai Mor
f49f45e856 about, invite, getInvolved 2014-09-10 18:12:21 -04:00
Shai Mor
23385a946e Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop 2014-09-10 16:32:36 -04:00
Shai Mor
f91728cdb6 get involved lightbox styling 2014-09-10 16:32:18 -04:00
Connor Turland
3a7501cc7a merge shai's changes 2014-09-09 18:20:17 -04:00
Connor Turland
d2760b8688 change in embedly 2014-09-09 18:17:39 -04:00
Shai Mor
d18806bb18 merge in connors css 2014-09-09 15:17:49 -04:00
Shai Mor
4f85055c74 styled create map forms 2014-09-09 15:13:53 -04:00
Connor Turland
eedd3736cf realtime and filter box styling 2014-09-03 19:05:25 -04:00
Connor Turland
fdf0c28daf sprites 2014-08-26 22:51:50 -04:00
Connor Turland
45828d048e added some of the icons 2014-08-17 14:46:07 -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
e1fb72c2df fixed user model and map models up 2014-08-12 11:09:53 -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
85bfce0237 part way through add links to topic cards 2014-08-11 18:55:53 -04:00
Connor Turland
b596228782 restructuring for famous 2014-08-10 19:35:18 -04:00
Connor Turland
465b95753c reorganize for functional famous operation 2014-08-10 19:24:39 -04:00
Connor Turland
341f9b9bdd home page styling 2014-08-10 19:13:25 -04:00
Connor Turland
06b35e550d first draft of explore maps working 2014-08-10 13:06:58 -04:00
Connor Turland
e7a445423d work in progress on explore maps pages 2014-08-06 10:09:01 -04:00
Connor Turland
e08c702494 introduced the metamaps.router 2014-08-01 22:50:23 -04:00
Connor Turland
3476d0126c got rgraph working again 2014-07-30 21:10:10 -04:00
Connor Turland
9dec959aee more restructuring. reorganizing views files to make more sense, be grouped logically 2014-07-30 01:02:47 -04:00
Connor Turland
ae8c711d27 major code refactor 2014-07-29 13:34:10 -04:00
Connor Turland
b06f5cae35 huge refactor 75% done 2014-07-27 15:57:35 -04:00
Connor Turland
e5ba207711 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2014-06-15 14:41:11 -04:00
Connor Turland
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 2014-06-15 14:39:42 -04:00
poietic
a0cdad2138 Update _cheatsheet.html.erb
a couple of small switches
2014-06-15 10:52:38 -04:00
Connor Turland
0982916e10 hid topic view tab which was mistakenly showing 2014-06-14 18:25:37 -04:00
Connor Turland
bffda35686 updated cheatsheet to be tabbed 2014-06-14 18:21:54 -04:00
Connor Turland
5dd848abcf fixed scrolling on home page 2014-06-11 10:38:08 -04:00
Connor Turland
35985aecaa fixed styling of many of the user forms 2014-06-10 12:59:19 -04:00
Connor Turland
8760cf0280 added new images and made realtime send more relevant messages including one when someone turns on realtime 2014-06-09 16:37:09 -04:00
Connor Turland
2820f57a9f added metacode background bar set to match metacode color 2014-06-08 16:26:25 -04:00
Connor Turland
f30904d828 fixed lightbox hiding 2014-06-04 16:41:02 -04:00
Connor Turland
a46d097da9 ability to switch metacode sets from mapping page 2014-06-04 15:24:16 -04:00
Connor Turland
48dc11b53d added ability for an admin to add metacodes and metacode sets 2014-05-17 14:57:03 -04:00