Commit graph

55 commits

Author SHA1 Message Date
Devin Howard
7956e6d289 check map#contains matches json schema in spec 2016-02-09 11:20:39 +08:00
Devin Howard
80a6bcbca2 remove annoying rcov gem 2016-02-08 11:19:40 +08:00
Devin Howard
b3f8f6652a simplecov added 2016-02-08 11:19:36 +08:00
Devin Howard
b3ba6d3a80 add shoulda-matchers gem 2015-12-17 08:53:45 +08:00
Devin Howard
1597665be5 merge develop with rails4 stuff 2015-12-07 13:58:42 +08:00
Devin Howard
45e09a27bd gc tuning 2015-11-25 11:59:56 +08:00
Connor Turland
1bbaa47b80 getting uploads working
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
2015-11-07 01:33:18 +08:00
Devin Howard
8e19083035 ok put ruby back in Gemfile' 2015-10-30 14:21:47 +08:00
Devin Howard
cda76a4bae remove ruby from Gemfile in favour of .ruby-version 2015-10-29 16:18:06 +08:00
Devin Howard
5c813beafe merge 2015-10-27 18:20:12 +08:00
Devin Howard
3440826d51 binding_of_caller gem for devel debug 2015-10-26 11:53:50 +08:00
Devin Howard
dc66ac10a9 pry byebug 2015-10-23 22:27:33 +08:00
Devin Howard
0d2ddbd9b6 add rspec to Gemfile 2015-10-12 11:24:30 +08:00
Devin Howard
bb29e0e724 fiddle with Gemfile 2015-10-01 11:02:03 +08:00
Devin Howard
c0d29e54bd Merge branch 'rails4' of ssh://github.com/metamaps/metamaps_gen002 into rails4 2015-09-28 14:43:16 +08:00
Devin Howard
741c584651 Merge branch 'develop' into rails4 2015-09-20 13:55:21 +08:00
Connor Turland
f5dbfd5d72 configuration for production environments like heroku 2015-09-19 14:10:43 -04:00
Devin Howard
b2e15c6483 cancan => cancancan 2015-09-19 20:25:07 +08:00
Devin Howard
1aa4d862a1 whoo new gems for development. binding.pry is so cool 2015-09-19 17:01:27 +08:00
Devin Howard
8cf8277573 add jquery_ui to gemfile 2015-09-10 22:13:10 +08:00
Devin Howard
5848af7765 update Gemfile for rails 4 2015-09-10 17:43:48 +08:00
mix irving
7a1b68960d install dotenv to help managed env vars 2015-03-09 08:50:24 +13:00
Connor Turland
23d5527adc lots of little fixes 2014-11-15 17:43:24 -05:00
Connor Turland
b4f4aefed0 switch ruby version 2014-10-18 13:02:31 -04:00
Connor Turland
19987594d6 ruby 2.1.2 2014-10-08 01:22:02 -04:00
Connor Turland
47132f3e60 ruby 2.1 2014-10-08 01:21:02 -04:00
Connor Turland
841e6fb3ab update phantom settings 2014-10-08 00:47:17 -04:00
Connor Turland
cf01e711dd merge with devin 2014-10-07 19:19:24 -04:00
Devin Howard
f7f17a2908 added sidekiq gem and a route to /sidekiq (commented) for devel 2014-10-07 19:00:55 -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
Connor Turland
f6245df997 added 20 at a time loading for explore maps pages 2014-08-20 15:37:18 -04:00
Connor Turland
5cfbb82760 configured for local dev 2014-08-15 22:46:36 -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
Robert Best
b09eed715b specify redis gem version number 2014-08-02 14:32:07 -04:00
Connor Turland
b06f5cae35 huge refactor 75% done 2014-07-27 15:57:35 -04:00
Connor Turland
96197130e1 added rmagick and ruby number for heroku 2014-07-07 21:02:43 -04:00
Connor Turland
1970f794c4 code cleaning 2014-05-30 11:00:31 -04:00
Raymon Johnstone
2f2f6e64fe Changes to PAG for external pages to load in a new tab 2014-05-14 14:42:15 -04:00
Robert Best
2e5947a243 Fixes #312 2014-05-04 15:12:38 -04:00
Connor Turland
8c985add2c styled autocompletes and tooltips 2014-03-03 16:58:03 -08:00
Connor Turland
08341e3c83 replaced background images 2014-02-23 23:22:40 -08:00
Connoropolous
5fbbedc885 Update Gemfile 2014-02-10 02:11:48 -05:00
Connor Turland
e69b6e9705 specified jbuilder version 2014-01-28 22:57:12 -05:00
Connor Turland
ac27da08dc removed sass-rails version number 2014-01-28 22:53:10 -05:00
Connor Turland
41044140b7 added completely new logging in system 2013-07-10 14:02:38 -04:00
Connor Turland
2545126b0b fixed up some styling. extended rgraph radius. added show/hide labels 2013-07-09 12:32:13 -04:00
Connor Turland
f657a61327 added all the code for realtime mapping using websockets. fixed some minor bugs like the label glitches, dragBox to deselect as well as select, shift click for synapses working again, panning won't deselect all your selected nodes and edges, nor hide the showcard, but a single click will hide the open card 2013-04-26 00:07:29 -04:00
Metamaps on Linode
9f82e804bf removed windows-generated Gemfile.lock 2013-03-17 10:48:46 -04:00
Devin Howard
3c66e4c50f updated Gemfile with two gems needed for Linode. Sorry people who don't like therubyracer! 2013-03-07 21:44:58 -05:00
Connor Turland
a97caa5c7a updated gem file to use older version of jquery rails that is working locally 2013-02-03 20:06:19 -05:00