Devin Howard
|
e460899ea3
|
testing simplecov and rcov stuff
|
2016-02-08 11:19:39 +08:00 |
|
Devin Howard
|
cc99ed001d
|
fix mapping_controller_spec.rb
|
2016-02-08 11:19:38 +08:00 |
|
Devin Howard
|
fa3a725df9
|
mapping spec
|
2016-02-08 11:19:37 +08:00 |
|
Devin Howard
|
f2cbde50ca
|
dos2unix on the whole repo
|
2016-02-05 11:43:15 +08:00 |
|
Devin Howard
|
4469b29ec2
|
in user model
|
2016-01-07 15:32:19 +08:00 |
|
Devin Howard
|
bf21dcc3e6
|
merge develop into rspec tests
|
2016-01-06 23:03:34 +08:00 |
|
Devin Howard
|
888edae6f6
|
finish remove asset_path_icon whoops
|
2015-12-20 22:28:05 +08:00 |
|
Devin Howard
|
96ec672779
|
Merge branch 'develop' into feature/rspec-tests
|
2015-12-20 22:24:39 +08:00 |
|
Devin Howard
|
df485002b1
|
remove redundant asset_path_icon function
|
2015-12-20 22:22:01 +08:00 |
|
Devin Howard
|
c4be57e525
|
topic and synapse validate permission
|
2015-12-18 09:25:54 +08: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
|
9e4a7b821f
|
cleanup topic model a bit
|
2015-12-17 09:34:49 +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 |
|
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 |
|
Devin Howard
|
b2aa2074a7
|
update generation calcuation code, incl. fix user signup bug
|
2015-12-15 12:33:22 +08:00 |
|
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 |
|