Commit graph

1121 commits

Author SHA1 Message Date
Connoropolous
816231234a Update README.rdoc 2014-04-30 21:09:07 -04:00
Connoropolous
53944a9a05 Update README.rdoc 2014-04-30 20:47:09 -04:00
Connoropolous
9b2e4d7130 Update README.rdoc 2014-04-30 20:44:54 -04:00
Connoropolous
e47a3c81e4 Delete 20140210031525_add_admin_to_users.rb 2014-04-30 20:40:48 -04:00
Connoropolous
c79047d897 Delete 20140210025850_add_featured_to_maps.rb 2014-04-30 20:40:28 -04:00
Connoropolous
756823a1c8 Update users.yml
Switch to adding two users by default, one with regular user permissions (sign in with user@user.com), and one with admin permissions (sign in with admin@admin.com). both have password 'toolsplusconsciousness'
2014-04-30 20:38:55 -04:00
Connoropolous
2e6ea8fb1e removed coming soon 2014-03-06 08:12:41 -08:00
Connoropolous
27caf6e0a8 Added tutorial video in 2014-03-06 08:08:45 -08:00
Robert Best
6cf63b4e83 Added financial support links to PAQ 2014-03-05 13:10:41 -05:00
Robert Best
6a80c021ec Update paq.html.erb
Made a few changes, mostly just adding links.... what still remains is to add links for Flattr, Paypal, and Bitcoin
2014-03-03 23:21:23 -05:00
Connor Turland
8c985add2c styled autocompletes and tooltips 2014-03-03 16:58:03 -08:00
Connor Turland
8c1c4e3202 fixed registration issues 2014-03-03 10:28:16 -08:00
Connor Turland
1c5a57d67c disabled topic and synapse creation on public map that's not yours 2014-03-03 03:05:59 -08:00
Connor Turland
d89dddb45c hopefully changed jit to not cause compile error 2014-03-03 02:23:14 -08:00
Connor Turland
ee82650e64 precompiled 2014-03-03 02:17:54 -08:00
Connor Turland
5b2c20e475 precompiled 2014-03-03 02:17:44 -08:00
Connor Turland
b766278f8e added assets for live site 2014-03-03 01:52:17 -08:00
Connor Turland
909a5307d0 social icons name change 2014-03-03 01:37:15 -08:00
Connor Turland
672ebb99e2 changes for live site 2014-03-03 01:22:08 -08:00
Connor Turland
72724c8da5 recently active maps 2014-03-03 01:11:04 -08:00
Connor Turland
19df96cb77 reworked logged in homepage 2014-03-03 00:25:47 -08:00
Connor Turland
7f5269bb84 added the ability to change the map permission from the map info box 2014-03-02 18:53:19 -08:00
Connor Turland
5fe3eb8f00 fixed capitalization issues. tidied up topic pages. added center this topic icon 2014-03-02 16:36:18 -08:00
Connor Turland
c20c3b0e54 added ctrl+click for mac to act as right click for nodes and synapses 2014-03-02 15:56:07 -08:00
Connor Turland
dfca29c9b3 put message above canvas 2014-03-02 15:24:13 -08:00
Connor Turland
4fc60c13e7 ability to change the permissions of multiple through the right click menu implemented 2014-03-02 15:05:03 -08:00
Connor Turland
a36d1c8aec added updated metacode images and fixed synapse pointer 2014-03-02 12:01:06 -08:00
Connor Turland
2249fc4893 added pointer to node hover, fixed synapse permission edit bug 2014-03-02 11:53:22 -08:00
Connor Turland
2abeb73e9a styled synapse card 2014-03-01 19:02:27 -08:00
Connor Turland
5dd03ab4f7 cross browser flexbox support 2014-02-26 15:52:54 -08:00
Connor Turland
428462abf5 hope to have fixed the double click to open topic card issue 2014-02-26 14:45:01 -08:00
Connor Turland
762fc21e9e Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2014-02-26 12:40:13 -08:00
Connor Turland
2cf04f96cb removed last_edited from map model, and set up code to update map updated_at column whenever certain events happen that update the map 2014-02-26 12:23:29 -08:00
Connor Turland
c9aea733ad fixed explore maps floating left issue 2014-02-26 12:00:18 -08:00
Connor Turland
4362e4f126 set the background back to normal, fixed the user sign up issue 2014-02-26 11:53:20 -08:00
Connor Turland
3a88abbb1b background update test 2014-02-25 15:05:25 -08:00
Connor Turland
f990ee1c8c added ability to change topic permission 2014-02-24 17:03:13 -08:00
Connor Turland
2e252c2647 fixed scrollbars further 2014-02-24 12:47:02 -08:00
Connor Turland
000089730c fixed custom scroll bars on maps pages 2014-02-24 12:29:54 -08:00
Connor Turland
eb940a1f7b moved lower bars lower to bottom 2014-02-24 11:51:55 -08:00
Connor Turland
2df3bda590 added hover to homepage image 2014-02-24 11:35:48 -08:00
Connor Turland
08341e3c83 replaced background images 2014-02-23 23:22:40 -08:00
Connor Turland
d093ebeeba adding tooltips, added maps topic appears on pages. 2014-02-20 17:22:13 -08:00
poietic
d2ac26cbaf Update paq.html.erb
changed answer about "are we making money from it or do we plan to?
2014-02-20 11:38:56 -08:00
Connoropolous
144069f82a Merge pull request #303 from Connoropolous/Robs-1st-edits
Robs 1st edits
2014-02-20 11:08:09 -08:00
Robert Best
f721441f11 Update main_controller.rb
Made edits to what results end up in the @topics array... THis should add more results, and not exclude incorrectly... and I made the default to search the desc and the link text too.

I hope I have done the array manipulation right with:
@topics = @topics + (@topics2 - @topics)
2014-02-18 23:33:09 -05:00
Robert Best
7cff0fb6fe Update main_controller.rb
Made the changes from earlier comments... mostly just adding '%' to many of the searches
2014-02-18 22:44:10 -05:00
Connoropolous
2fdcb5dcc5 Update main_controller.rb
realized these lines we're duplicated
2014-02-18 16:45:11 -08:00
poietic
f7dc8cff60 Update _lightboxes.html.erb
evolved "about" description.
2014-02-17 16:30:40 -08:00
poietic
841879798b Update paq.html.erb
added in flattr button and bitcoin address, for donations - may need a bit of formatting work..
2014-02-16 23:39:39 -08:00