Connor Turland
c6fea78054
merge develop
2016-02-29 13:58:47 +13:00
Devin Howard
43bdda61de
maps controller spec passes, 3 pending
2016-02-09 11:48:07 +08:00
Devin Howard
987cd7f5a0
Merge branch 'feature/xls.export' into release/v2.8
2016-02-08 09:58:09 +08:00
Devin Howard
0ae8ea0ca5
implement csv/xls export
2016-02-07 13:12:18 +08:00
Connor Turland
4557b8e305
merge develop
2016-01-22 14:59:09 +13:00
Connor Turland
49dd2f2e92
merge develop
2015-12-22 13:16:03 -05:00
Devin Howard
006acac6b5
remove redundant authorize_to_view function
2015-12-17 23:20:19 +08:00
Devin Howard
d5f66487b7
update map spec - add authorize_to_delete. TODO: add other map authorize specs
2015-12-17 09:44:48 +08:00
Devin Howard
696bac17e6
map spec
2015-12-17 09:16:02 +08:00
Devin Howard
2525a6fb65
add permission service, refactor map model a bit, add validations
2015-12-17 09:10:52 +08:00
Devin Howard
bfd4e4f228
add permission service, add validations to map.rb
2015-12-17 09:03:51 +08:00
Connor Turland
089528c46d
great progress
2015-12-11 14:23:41 -05:00
Devin Howard
3674aefb04
remove secrets.yml stuff because it doesn't work with heroku
2015-12-03 16:57:29 -05:00
Devin Howard
ede4e7a509
fix references to Rails.application.secrets
2015-12-03 16:57:28 -05:00
Devin Howard
570fa931b7
use secrets.yml to allow overriding config variables
2015-12-03 16:57:28 -05:00
Connor Turland
d8da2d93fd
updated files to use amazon assets
2015-12-03 16:57:28 -05:00
Devin Howard
2cbf1cad7f
fix
2015-12-03 16:57:28 -05:00
Devin Howard
4b6e33f983
does this fix missing-map.png?
2015-12-03 16:57:28 -05:00
Devin Howard
4245703084
see if we can make missing-map.png show up
2015-12-03 16:57:27 -05:00
Devin Howard
b9ac614057
asset_path doesn't work in models
2015-12-03 16:57:26 -05:00
Devin Howard
cef83e1f3d
asset_path
2015-12-03 16:57:26 -05:00
Devin Howard
5dc53543f7
migrate to polymorphic mappings - DB MIGRATION
2015-12-03 16:57:24 -05:00
Devin Howard
e5c83a2a0c
dependent destroy models for topics/maps/synapses on mappings
2015-12-03 16:57:23 -05:00
Devin Howard
7d738b7abf
fix map/mapping associations that I broke
2015-12-03 16:57:22 -05:00
Devin Howard
32311e3610
fix has_many relationships in map & mapping models for rails 4
2015-12-03 16:57:22 -05:00
Devin Howard
6487202e6f
remove secrets.yml stuff because it doesn't work with heroku
2015-10-30 14:30:24 +08:00
Devin Howard
e2a8e0331d
fix references to Rails.application.secrets
2015-10-30 14:18:50 +08:00
Devin Howard
8e1ae0a1fc
use secrets.yml to allow overriding config variables
2015-10-29 16:23:41 +08:00
Connor Turland
6e79b58e16
updated files to use amazon assets
2015-10-27 21:46:07 -07:00
Devin Howard
eea2bf30df
fix
2015-10-27 18:16:35 +08:00
Devin Howard
43c851e6b4
does this fix missing-map.png?
2015-10-26 21:12:18 +08:00
Devin Howard
9d6372c7b9
see if we can make missing-map.png show up
2015-10-26 20:16:49 +08:00
Devin Howard
837abbe9ee
asset_path doesn't work in models
2015-10-23 23:09:14 +08:00
Devin Howard
d539846c61
asset_path
2015-10-23 23:06:24 +08:00
Devin Howard
69f4b8c645
migrate to polymorphic mappings - DB MIGRATION
2015-10-02 16:22:16 +08:00
Devin Howard
9e43cc2e96
dependent destroy models for topics/maps/synapses on mappings
2015-10-01 11:02:39 +08:00
Devin Howard
2f9b09db86
fix map/mapping associations that I broke
2015-09-19 16:48:24 +08:00
Devin Howard
a8cef723a2
fix has_many relationships in map & mapping models for rails 4
2015-09-10 22:48:35 +08:00
Connor Turland
531f09c6d3
active lists are sorting right. explore url breaking doesn't happen. explore maps pages do nicer infinite scrolling, properly loading only 20 at a time
2015-01-31 12:39:48 -05:00
Connor Turland
7182996134
removed other sidekiq stuff.
2014-11-16 12:39:41 -05:00
Connor Turland
44923eb660
added new map screenshot capture method
2014-11-09 22:10:13 -05:00
Connor Turland
acfd55a258
add authorize to delete to controller, fix private map message, fix new map css issue
2014-10-27 13:26:24 -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
cde771e007
got map screenshot working decent
2014-10-08 00:07:54 -04:00
Devin Howard
c6c05085ad
Added phantomjs script to save an image - this doesn't totally work yet, it has a error with famous
...
Added worker process to call the phantomjs script in app/workers
Added hook in models/map.rb to call the worker
Added calls to map.touch in mappings_controller.rb so it would get triggered correctly - I'm not sure how this will proceed moving forward
2014-10-07 19:11:55 -04:00
Connor Turland
fdf0c28daf
sprites
2014-08-26 22:51:50 -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
6422b54dc0
clickable map cards
2014-08-12 18:14:04 -04:00
Connor Turland
173179d682
fixed filters, updated ruby models further for returning json
2014-08-12 12:01:01 -04:00
Connor Turland
e1fb72c2df
fixed user model and map models up
2014-08-12 11:09:53 -04:00
