Devin Howard
b037c84f15
fix small error in user model
...
need to use the parent's generation to calculate generation!
2015-12-07 11:44:08 +08:00
Devin Howard
3aaf501b03
fix up user model json output function
2015-11-28 21:51:28 +08:00
Devin Howard
fe0d38ec67
syntax error
2015-11-07 01:34:08 +08:00
Devin Howard
fa017a8559
sandi metz function simplification
2015-11-06 17:08:42 +08: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
5ce460e967
metacode asset_path calls
2015-10-26 21:04:07 +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
b0327da649
try to fix custom metacode icon path
2015-10-26 18:28:25 +08:00
Devin Howard
20f4497064
whoops again
2015-10-26 12:39:40 +08:00
Devin Howard
6b8686c4e2
only run metacode.icon through asset_path if the path doesn't start with http
2015-10-26 12:12:07 +08:00
Devin Howard
6d4481979f
woot fix metacodes
2015-10-26 11:53:54 +08:00
Devin Howard
46dd54a1d7
asset_path in css erb files
2015-10-23 23:34:18 +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
086acb09af
select metacodes with one query instead of n queries, move logic to application_helper
2015-09-19 20:17:56 +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
Devin Howard
dc51d0080e
remove attr_accessible
2015-09-10 22:12:50 +08:00
Connor Turland
499f6349e6
add ability for admin to delete any topics and synapses
2015-04-28 18:43:47 -04: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
a048c87356
mapper who doesn't own a topic or synapse should not be able to delete it.
2015-01-28 22:35:03 -05:00
Bashar Jabbour
78743fbba5
updated the tooltip of maps topic appears in
2014-11-27 15:02:44 -05:00
Bashar Jabbour
814a804dd8
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
2014-11-26 14:44:42 -05:00
Bashar Jabbour
085bf78b0e
added tooltip for maps that topic appears in
2014-11-26 14:44:31 -05:00
Connor Turland
d08774d8bc
changed user image settings. added mapper profile page
2014-11-25 15:06:30 -05:00
Connor Turland
2de697bcca
ensured that new users can sign up with other new users invite codes
2014-11-21 17:24:08 -05:00
Connor Turland
a9e488d9cb
NOTE: rake db:migrate required. added generation column to users
2014-11-21 16:50:42 -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
c5907914e3
fixed user images, set up map updates for realtime
2014-11-04 12:37:17 -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
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
a7328526a8
got profile picture uploading working, as well as profile picture removing, as well as password changing
2014-10-21 20:31:59 -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
Connor Turland
cf01e711dd
merge with devin
2014-10-07 19:19:24 -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
d30417f958
fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar
2014-10-04 00:15:47 -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
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
