Devin Howard
0b98e446ca
fiddle with maps_controller code style
2016-02-09 11:20:04 +08:00
Devin Howard
cc99ed001d
fix mapping_controller_spec.rb
2016-02-08 11:19:38 +08:00
Devin Howard
f2cbde50ca
dos2unix on the whole repo
2016-02-05 11:43:15 +08:00
Devin Howard
bf21dcc3e6
merge develop into rspec tests
2016-01-06 23:03:34 +08:00
Devin Howard
c58b2c805e
syntax error
2015-12-21 21:38:02 +08:00
Devin Howard
e2bf1d5eb1
try to make metamaps more tls friendly
2015-12-20 18:36:57 +08:00
Devin Howard
4dbff85443
default value if no request.env in application controller passes the rspec test woot. Only 80 more tests to implement
2015-12-16 22:36:12 +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
be3924aa54
setup bare minimum devise authentication in tests
2015-12-16 21:32:50 +08:00
Devin Howard
6148f55e1c
handle nil unsafe_uri in app conttroller function
2015-12-16 21:05:18 +08:00
Devin Howard
1f82238362
more fixes
2015-11-08 23:14:53 +08:00
Devin Howard
fa017a8559
sandi metz function simplification
2015-11-06 17:08:42 +08:00
Connor Turland
86c467b2f1
current_user can be nil
2015-11-04 00:14:14 -05:00
Devin Howard
660ee52292
make invite link use REQUEST_URI
2015-11-03 22:22:53 +08:00
Devin Howard
62ae38e70d
fix devise integration for rails 4
2015-11-03 20:56:50 +08:00
Devin Howard
fb848b29d5
bugfix
2015-10-26 20:41:37 +08:00
Devin Howard
0dbb37eaa4
metacodes#index map in asset_path
2015-10-25 17:14:56 +08:00
Devin Howard
b00784731b
remove binding.pry
2015-10-23 23:42:21 +08:00
Devin Howard
46dd54a1d7
asset_path in css erb files
2015-10-23 23:34:18 +08:00
Devin Howard
96871cadab
brute force prevent nil synapse descriptions
2015-10-23 22:17:08 +08:00
Devin Howard
588b62b942
fix problem with mappings and forking maps
2015-10-23 22:07:44 +08:00
Devin Howard
85b3012cd9
fix a few more mappable/topic/synapse things in JS
2015-10-02 18:54:17 +08:00
Devin Howard
6d1e382d5c
change from category/topic_id/synapse_id to mappable_type/mappable_id
2015-10-02 16:32:16 +08:00
Devin Howard
120edfc278
fix typo + debug statements to make existingSynapse autocomplete work
2015-10-02 15:46:48 +08:00
Devin Howard
d895bca1a4
code tweaks to searchsynapses
2015-10-01 12:33:38 +08:00
Devin Howard
9e43cc2e96
dependent destroy models for topics/maps/synapses on mappings
2015-10-01 11:02:39 +08:00
Devin Howard
62035ed015
fix other controllers needing create/update changed for rails 4
2015-09-19 20:05:36 +08:00
Devin Howard
e14001061c
fiddle with topic and mapping controllers so they work again
2015-09-19 20:01:44 +08:00
Devin Howard
6692c28965
delete_if threw errors, so convert things to arrays for it
2015-09-19 17:08:12 +08:00
Devin Howard
2f9b09db86
fix map/mapping associations that I broke
2015-09-19 16:48:24 +08:00
Devin Howard
c361349c20
add required params to all controllers
2015-09-19 16:26:34 +08:00
Devin Howard
dc51d0080e
remove attr_accessible
2015-09-10 22:12:50 +08: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
Connor Turland
cb3db06406
switched home page to active maps instead of my maps
2014-11-29 01:37:06 -05:00
Connor Turland
d08774d8bc
changed user image settings. added mapper profile page
2014-11-25 15:06:30 -05:00
Connor Turland
951bd8d4a5
removed sidekiq leftovers. altered synapse results to only return unique
2014-11-16 12:35:06 -05:00
Connor Turland
23d5527adc
lots of little fixes
2014-11-15 17:43:24 -05:00
Connor Turland
f1135854a0
fix for when mappings are corrupt
2014-11-11 07:23:44 -05:00
Connor Turland
8d3de3867f
enabled pulling in siblings through right click menus in topic view
2014-11-11 06:48:21 -05:00
Connor Turland
9b0304c403
added filtering back to topic view
2014-11-11 02:23:39 -05:00
Connor Turland
44923eb660
added new map screenshot capture method
2014-11-09 22:10:13 -05:00
Connor Turland
ee1ca7853f
removed embed. fixed switch metacode set lightbox overflow. disabled topic creation and topic deletion from public maps by non-owner
2014-11-03 08:46:22 -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
f58db49bc1
realtime
2014-10-27 12:03:55 -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
cf01e711dd
merge with devin
2014-10-07 19:19:24 -04:00
Connor Turland
db3a4b66ad
fixed issue that others might end up having with sso_key
2014-10-07 19:14:25 -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
a8d173ff1d
made http protocol for uservoice redirect consistent
2014-10-07 18:49:14 -04:00
Connor Turland
9a250d0034
got redirect for single sign on with uservoice working
2014-10-07 18:38:33 -04:00
