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
Connor Turland
3c9d722945
accept or reject video offers
2015-12-11 17:29:17 -05:00
Connor Turland
089528c46d
great progress
2015-12-11 14:23:41 -05: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
7336c262e3
fix up user model json output function
2015-12-03 16:58:21 -05:00
Devin Howard
4139c2c84a
syntax error
2015-12-03 16:57:30 -05:00
Devin Howard
67d4a2aa34
sandi metz function simplification
2015-12-03 16:57:30 -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
204544dc22
metacode asset_path calls
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
89424dcd7f
try to fix custom metacode icon path
2015-12-03 16:57:27 -05:00
Devin Howard
f63a242256
whoops again
2015-12-03 16:57:27 -05:00
Devin Howard
684dcd8d33
only run metacode.icon through asset_path if the path doesn't start with http
2015-12-03 16:57:27 -05:00
Devin Howard
bdb5623a02
woot fix metacodes
2015-12-03 16:57:27 -05:00
Devin Howard
52b37e7ac6
asset_path in css erb files
2015-12-03 16:57:26 -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
2369c9ce5e
select metacodes with one query instead of n queries, move logic to application_helper
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
371851cb89
remove attr_accessible
2015-12-03 16:57:22 -05: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
Connor Turland
e1fb72c2df
fixed user model and map models up
2014-08-12 11:09:53 -04:00
Connor Turland
ae8c711d27
major code refactor
2014-07-29 13:34:10 -04:00
Connor Turland
b06f5cae35
huge refactor 75% done
2014-07-27 15:57:35 -04:00
Connor Turland
eceb1174c3
removed ccircular image processor to test
2014-07-08 00:21:43 -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
Robert Best
2e5947a243
Fixes #312
2014-05-04 15:12:38 -04:00
Connor Turland
2cf04f96cb
removed last_edited from map model, and set up code to update map updated_at column whenever certain events happen that update the map
2014-02-26 12:23:29 -08:00
Connor Turland
d093ebeeba
adding tooltips, added maps topic appears on pages.
2014-02-20 17:22:13 -08:00
Connor Turland
4e8fc6fe06
added tips to cards
2014-02-10 01:29:02 -05:00
Connor Turland
4b64e4bc06
fixed issue with date edited in map info box
2014-02-04 11:06:10 -05:00
Connor Turland
9a560ff829
styled carousel autocomplete results. moved tooltips. built out map info box
2014-02-03 20:43:31 -05:00
Connor Turland
9c3c7c5e01
enabled filter by metacode. enabled navigation through topic pages using right click. styled topic card
2014-02-01 03:57:19 -05:00
Connor Turland
d3500b0ce9
adjusted user model to not prevent sign ups
2014-01-31 11:58:32 -05:00
Connor Turland
d6d428df60
perhaps fixed login error
2014-01-28 23:27:32 -05:00
Connor Turland
414e59e280
this is a lot of changes. too many to say here, oops
2014-01-28 22:46:58 -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
b218d898ea
added account creation again. fixed realtime bug, border radius on the menu, fixed menu on console
2013-07-11 11:13:27 -04:00
Connor Turland
41044140b7
added completely new logging in system
2013-07-10 14:02:38 -04:00
Connor Turland
f657a61327
added all the code for realtime mapping using websockets. fixed some minor bugs like the label glitches, dragBox to deselect as well as select, shift click for synapses working again, panning won't deselect all your selected nodes and edges, nor hide the showcard, but a single click will hide the open card
2013-04-26 00:07:29 -04:00
Connor Turland
a0f638c10c
added ability to switch what metacodes you are mapping with
2013-01-25 20:49:40 -05:00
