Connor Turland
d673172abf
Merge branch 'develop' into tvw
2014-11-11 07:23:58 -05:00
Connor Turland
f1135854a0
fix for when mappings are corrupt
2014-11-11 07:23:44 -05:00
Connor Turland
70cf1426d7
fixed merges from develop
2014-11-11 07:05:31 -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
662f11f689
add forgot password form url to accessible signed out urls
2014-10-27 17:46:17 -04:00
Connor Turland
96ed2bcd64
Merge branch 'develop' into tvw
2014-10-27 13:26:42 -04: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
07b74ccc31
merge develop and switch default metacode set
2014-10-27 12:15:57 -04:00
Connor Turland
f58db49bc1
realtime
2014-10-27 12:03:55 -04:00
Connor Turland
a8fb22ee95
fix for allowing sign ups, and for about lightbox overflow
2014-10-23 20:31:57 -04:00
Connor Turland
3d973dc7f3
styled homepage, made sure password forgot, and password reset pages were accessible when logged out, updated metacode images
2014-10-22 13:41:06 -04:00
Connor Turland
13937ae51d
merged conflicts coming from develop branch
2014-10-22 11:52:31 -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
2db27ff15b
fixed homepage redirect loop?
2014-10-18 19:43:54 -04:00
Connor Turland
37455abfe9
removed lightboxes, password protected
2014-10-18 19:26:34 -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
Connor Turland
629a6a4172
fixed sign in redirects
2014-10-07 17:46:09 -04:00
Connor Turland
5c05c6bb83
404 page updates, synapse card 90%
2014-10-05 13:58:05 -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
90f2477566
fixed map update controller
2014-09-11 08:35:16 -04:00
Connor Turland
f6245df997
added 20 at a time loading for explore maps pages
2014-08-20 15:37:18 -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
35835fcc80
fixed home page difference between being logged in and logged out
2014-08-12 13:45:29 -04:00
Connor Turland
173179d682
fixed filters, updated ruby models further for returning json
2014-08-12 12:01:01 -04:00
Connor Turland
bbc50d1305
got radial view working
2014-08-11 18:57:34 -04:00
Connor Turland
06b35e550d
first draft of explore maps working
2014-08-10 13:06:58 -04:00
Connor Turland
e9863c0192
merge with Robs changes
2014-08-06 10:14:17 -04:00
Connor Turland
e7a445423d
work in progress on explore maps pages
2014-08-06 10:09:01 -04:00
Tadasu85
e76d780335
Filter box coding changes, Full implementgit add .
2014-08-04 12:20:16 -04:00
Connor Turland
e08c702494
introduced the metamaps.router
2014-08-01 22:50:23 -04:00
Connor Turland
3476d0126c
got rgraph working again
2014-07-30 21:10:10 -04:00
Connor Turland
e702f7023f
renamed application to not be ISSAD, now Metamaps
2014-07-30 01:24:20 -04:00
Connor Turland
f817ce772c
changed approach to map creation. reorganized code to suit that.
2014-07-29 23:18:43 -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
96197130e1
added rmagick and ruby number for heroku
2014-07-07 21:02:43 -04:00
Connor Turland
820096e853
merged raymons changes
2014-06-11 08:42:12 -04:00
Raymon Johnstone
6f2d19c570
Addition of scrollbar to search results
2014-06-10 17:41:34 -04:00
Connor Turland
a46d097da9
ability to switch metacode sets from mapping page
2014-06-04 15:24:16 -04:00
Connor Turland
f121661858
merge changes on user settings page
2014-05-30 09:25:29 -04:00
Raymon Johnstone
2a59d67d79
removed extra files
2014-05-17 16:10:44 -04:00
Connor Turland
48dc11b53d
added ability for an admin to add metacodes and metacode sets
2014-05-17 14:57:03 -04:00
