Commit graph

79 commits

Author SHA1 Message Date
Connor Turland
c6fea78054 merge develop 2016-02-29 13:58:47 +13:00
Devin Howard
40cd1ebb5c modify metacodes to instead have two fields, and validate that only one is present. Manual icons can be entered through rake tasks or on the rails console or in db seed 2016-02-25 14:49:48 +08:00
Devin Howard
295534e4ab migrate to using aws/paperclip for metacodes. RUN RAKE TASK ON PRODUCTION 2016-02-23 14:58:20 +08:00
Devin Howard
821966c5db update schema.rb 2016-02-05 18:11:35 +08:00
Devin Howard
8a74118cb1 Merge branch 'develop' into feature/realtime.video 2016-01-25 11:23:32 +08:00
Devin Howard
79431f8515 fix user seeds 2016-01-25 11:23:10 +08:00
Connor Turland
5d838303a8 broken gemfile.lock and pass recent migrations 2016-01-22 16:14:35 +13:00
Connor Turland
4557b8e305 merge develop 2016-01-22 14:59:09 +13:00
Devin Howard
8a8ac92a8f data safety 2016-01-20 10:18:44 +08:00
Devin Howard
0e7690f2af fix metacode asset path update db migration 2016-01-20 10:18:22 +08:00
Devin Howard
4842856358 merge develop into rspec-tests 2016-01-07 16:04:23 +08:00
Devin Howard
75d9339010 make mapping polymorphism migration handle mapping problems 2016-01-06 10:23:01 +08:00
Connor Turland
49dd2f2e92 merge develop 2015-12-22 13:16:03 -05:00
Devin Howard
ae1117338a set up devise authentication more srsly. Still doesn't pass the test though haha 2015-12-16 22:16:02 +08:00
Connor Turland
92ddbbaf4f remove metacode asset path migration 2015-12-11 18:10:53 -05:00
Connor Turland
089528c46d great progress 2015-12-11 14:23:41 -05:00
Devin Howard
1597665be5 merge develop with rails4 stuff 2015-12-07 13:58:42 +08:00
Devin Howard
67d4a2aa34 sandi metz function simplification 2015-12-03 16:57:30 -05:00
Devin Howard
d99ed6b627 migrate metacodes that started with /assets/icons to use amazonaws urls. Remove last migration I made 2015-12-03 16:57:28 -05:00
Devin Howard
96f5e6ac35 add asset_path calls 2015-12-03 16:57:26 -05:00
Devin Howard
d3080906b1 add db migration to remove asset paths from metacodes 2015-12-03 16:57:26 -05:00
Devin Howard
d52caac1d6 add indexes to schema 2015-12-03 16:57:26 -05:00
Devin Howard
3f5404b043 add missing indexes for speed 2015-12-03 16:57:25 -05:00
Devin Howard
53d77a0e5b fix migration for heroku 2015-12-03 16:57:25 -05:00
Devin Howard
5dc53543f7 migrate to polymorphic mappings - DB MIGRATION 2015-12-03 16:57:24 -05:00
Devin Howard
fa017a8559 sandi metz function simplification 2015-11-06 17:08:42 +08:00
Devin Howard
ddce6ad95c migrate metacodes that started with /assets/icons to use amazonaws urls. Remove last migration I made 2015-10-28 14:24:52 +08:00
Devin Howard
5c813beafe merge 2015-10-27 18:20:12 +08:00
Devin Howard
fcd866c05e add asset_path calls 2015-10-25 16:50:07 +08:00
Devin Howard
9de4492f04 add db migration to remove asset paths from metacodes 2015-10-25 16:37:45 +08:00
Devin Howard
e572389c49 add indexes to schema 2015-10-23 23:22:54 +08:00
Devin Howard
e078b59503 add missing indexes for speed 2015-10-23 22:38:42 +08:00
Devin Howard
582ef63635 fix migration for heroku 2015-10-23 22:32:09 +08:00
Devin Howard
053f035d31 move fixtures to seeds.rb 2015-10-12 11:22:55 +08:00
Devin Howard
69f4b8c645 migrate to polymorphic mappings - DB MIGRATION 2015-10-02 16:22:16 +08:00
Connor Turland
a9e488d9cb NOTE: rake db:migrate required. added generation column to users 2014-11-21 16:50:42 -05:00
Robert Best
ef39443eb0 Relocated keyboard shortcut code to Metamaps.Listeners.... Then added CTRL+ R , +H, and +D shortcuts for remove, hide and delete 2014-10-05 01:03:54 -04:00
Connor Turland
c1885615cd remove tilda file 2014-09-29 22:26:50 -04:00
Connor Turland
2138aa89f3 closes #368. ability to add in metacode colors 2014-09-29 22:26:12 -04:00
Robert Best
b15da256fa Included title box size in zoom to extents and put a limits on the zooming 2014-08-16 12:46:06 -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
Shai
6182ba4e14 data validation 2014-08-10 16:52:49 -04:00
Connor Turland
96197130e1 added rmagick and ruby number for heroku 2014-07-07 21:02:43 -04:00
Connor Turland
48dc11b53d added ability for an admin to add metacodes and metacode sets 2014-05-17 14:57:03 -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
Connor Turland
fb4da722ab removed extra migrate files 2014-02-09 23:48:05 -05:00
Connor Turland
5181c91aa7 restyled PAQ and Request pages. 2014-02-09 23:36:23 -05:00
Connor Turland
adcdea5d5e fixed selecting things on the radial view, and the weird synapse autocomplete bug 2013-11-14 12:28:31 -05:00
Connor Turland
41044140b7 added completely new logging in system 2013-07-10 14:02:38 -04:00