Commit graph

405 commits

Author SHA1 Message Date
Devin Howard 895b872bda remove unneeded https stuff 2016-02-28 17:15:09 +08:00
Devin Howard 25774d9f16 remove unneeded https stuff 2016-02-28 16:57:25 +08:00
Devin Howard cbb6b648be implement main_policy (headless). also remove all @current references 2016-02-28 16:53:59 +08:00
Devin Howard bc7db85c8c update map index views 2016-02-28 13:14:34 +08:00
Devin Howard 8ef847bd6d factor maps#index into 4 separate functions 2016-02-28 12:30:41 +08:00
Devin Howard 66f1d2ec0b install pundit 2016-02-28 12:30:41 +08:00
Devin Howard 40cd1ebb5c modify metacodes to instead have two fields, and validate that only one is present. Manual icons can be entered through rake tasks or on the rails console or in db seed 2016-02-25 14:49:48 +08:00
Devin Howard 40a833b069 Merge pull request #473 from metamaps/feature/fix-invite-link
fix get_invite_link function. fixes #471
2016-02-21 15:22:34 +08:00
Devin Howard e629a9bf71 fix get_invite_link function. fixes #471 2016-02-19 18:09:46 +08:00
Devin Howard 7b9c6459e3 allow embedding 2016-02-19 09:23:39 +08:00
Devin Howard 056ef2b5b6 smoother synapse creation with clicks/tabs 2016-02-14 15:19:35 +08:00
Devin Howard 6d0dcec1ba mess with metacode tests 2016-02-09 12:43:34 +08:00
Devin Howard 43bdda61de maps controller spec passes, 3 pending 2016-02-09 11:48:07 +08:00
Devin Howard 005250f330 typo 2016-02-09 11:26:42 +08:00
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 987cd7f5a0 Merge branch 'feature/xls.export' into release/v2.8 2016-02-08 09:58:09 +08:00
Devin Howard 0ae8ea0ca5 implement csv/xls export 2016-02-07 13:12:18 +08:00
Devin Howard 8202fb38f3 Merge branch 'develop' into feature/realtime.video 2016-02-05 16:27:43 +08:00
Devin Howard f2cbde50ca dos2unix on the whole repo 2016-02-05 11:43:15 +08:00
Connor Turland 4557b8e305 merge develop 2016-01-22 14:59:09 +13:00
Devin Howard bf21dcc3e6 merge develop into rspec tests 2016-01-06 23:03:34 +08:00
Connor Turland 49dd2f2e92 merge develop 2015-12-22 13:16:03 -05: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
Connor Turland 089528c46d great progress 2015-12-11 14:23:41 -05:00
Devin Howard 7db75b8d6d more fixes 2015-12-03 16:57:30 -05:00
Devin Howard 67d4a2aa34 sandi metz function simplification 2015-12-03 16:57:30 -05:00
Connor Turland 87389a88ed current_user can be nil 2015-12-03 16:57:29 -05:00
Devin Howard 75700f06a9 make invite link use REQUEST_URI 2015-12-03 16:57:29 -05:00
Devin Howard f4456d06ef fix devise integration for rails 4 2015-12-03 16:57:29 -05:00
Devin Howard 0b96171aa3 bugfix 2015-12-03 16:57:27 -05:00
Devin Howard d8dffad38a metacodes#index map in asset_path 2015-12-03 16:57:27 -05:00
Devin Howard c782c4d0bb remove binding.pry 2015-12-03 16:57:26 -05:00
Devin Howard 52b37e7ac6 asset_path in css erb files 2015-12-03 16:57:26 -05:00
Devin Howard 566a0a3aa6 brute force prevent nil synapse descriptions 2015-12-03 16:57:25 -05:00
Devin Howard 617fe43f71 fix problem with mappings and forking maps 2015-12-03 16:57:25 -05:00
Devin Howard ae16f8f08d fix a few more mappable/topic/synapse things in JS 2015-12-03 16:57:24 -05:00
Devin Howard 3e8c971155 change from category/topic_id/synapse_id to mappable_type/mappable_id 2015-12-03 16:57:24 -05:00
Devin Howard 379b37b445 fix typo + debug statements to make existingSynapse autocomplete work 2015-12-03 16:57:24 -05:00
Devin Howard 4bc03e3d2a code tweaks to searchsynapses 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 7c28070978 fix other controllers needing create/update changed for rails 4 2015-12-03 16:57:23 -05:00
Devin Howard 919fc0a60f fiddle with topic and mapping controllers so they work again 2015-12-03 16:57:23 -05:00
Devin Howard 7877e5bdbc delete_if threw errors, so convert things to arrays for it 2015-12-03 16:57:22 -05:00
Devin Howard 7d738b7abf fix map/mapping associations that I broke 2015-12-03 16:57:22 -05:00
Devin Howard e9cb8561fa add required params to all controllers 2015-12-03 16:57:22 -05:00
Devin Howard 371851cb89 remove attr_accessible 2015-12-03 16:57:22 -05: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
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
Raymon Johnstone dc6295328a Fixed issue where setting your settings would log you out. 2014-05-15 18:28:30 -04:00
Raymon Johnstone 0e25fb4cdb removed backup files as well as further mods for settings page 2014-05-14 16:51:16 -04:00
Connor Turland 8c1c4e3202 fixed registration issues 2014-03-03 10:28:16 -08:00
Connor Turland 72724c8da5 recently active maps 2014-03-03 01:11:04 -08:00
Connor Turland 19df96cb77 reworked logged in homepage 2014-03-03 00:25:47 -08: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 c9aea733ad fixed explore maps floating left issue 2014-02-26 12:00:18 -08:00
Connor Turland 4362e4f126 set the background back to normal, fixed the user sign up issue 2014-02-26 11:53:20 -08:00
Connor Turland d093ebeeba adding tooltips, added maps topic appears on pages. 2014-02-20 17:22:13 -08:00
Robert Best f721441f11 Update main_controller.rb
Made edits to what results end up in the @topics array... THis should add more results, and not exclude incorrectly... and I made the default to search the desc and the link text too.

I hope I have done the array manipulation right with:
@topics = @topics + (@topics2 - @topics)
2014-02-18 23:33:09 -05:00
Robert Best 7cff0fb6fe Update main_controller.rb
Made the changes from earlier comments... mostly just adding '%' to many of the searches
2014-02-18 22:44:10 -05:00
Connoropolous 2fdcb5dcc5 Update main_controller.rb
realized these lines we're duplicated
2014-02-18 16:45:11 -08:00
Connoropolous f9166119f3 Update topics_controller.rb 2014-02-15 09:52:56 -08:00
Robert Best 350df8a410 Update main_controller.rb
changes comments to be same as others
2014-02-13 22:46:13 -05:00
Robert Best 2050e137bf Update topics_controller.rb
We were missing the .downcase on term, so no queries with a capital ever find a match

See !connor
2014-02-13 22:32:51 -05:00
Robert Best 7c28e20b00 Update main_controller.rb
I commented notifications to you connor with !connor.... I havent looked at how to sort better yet, but my markups should make the pre-sort results a little better
2014-02-13 22:22:01 -05:00
Connor Turland f26d13fb5f fixed best_in_place issue, fixed toolbar functionality 2014-02-10 19:32:05 -05:00
Connor Turland 4e8fc6fe06 added tips to cards 2014-02-10 01:29:02 -05:00
Connor Turland 5181c91aa7 restyled PAQ and Request pages. 2014-02-09 23:36:23 -05:00
Connor Turland ac12c2a9ae added ability to change metacode. updated bottom left menu with icon, upper right menu with hover states 2014-02-09 18:54:45 -05:00
Connor Turland 1c49a805bd removed more old files, styled request invite page 2014-02-07 18:13:51 -05:00
Connor Turland ae46c27bec started styling map forms 2014-02-05 12:37:21 -05:00
Connor Turland 4350c0df1b added lightboxes 2014-02-05 00:03:44 -05:00
Connor Turland 6a63b1fe47 removed assets 2014-02-04 22:03:24 -05:00
Connor Turland fdcee3ae40 synapse autocomplete working 2014-02-04 20:28:06 -05:00
Connor Turland 285c87ade7 configured for redistogo and uncommented realtime messages 2014-02-04 12:08:09 -05:00
Connor Turland 6538577387 added ability to limit search results to just your own, and to minimize the different sections of search results 2014-02-02 14:56:07 -05:00
Connor Turland 7412b0a1b1 fixed one spot where it was trying to send realtime message over redis from the maps controller in save layout 2014-01-30 21:39:24 -05:00
Connor Turland 9ca9e56536 improved the labels. started the right click menu. added the wand menu. added the create map feature. replaced images with recolored ones. 2014-01-30 19:32:15 -05:00
Connor Turland efcc449471 fixed issue where settings page was redirecting to nonexistent user profile page 2014-01-28 23:53:13 -05:00
Connor Turland fbdfff6b83 temporarily commented out lines that send realtime messages via redis 2014-01-28 23:34:50 -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 e44d57a6d9 updated the home page 2013-12-01 20:47:28 -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
Devin Howard f714212423 implement synapse autocomplete controller function to make the results distinct. fixes #139 2013-03-16 13:30:54 -04:00
Devin Howard eaa9ba4d88 formatting in synapses_controller 2013-02-28 21:46:08 -05:00
Devin Howard e0e505de1d ok you can now create mappings only if logged in and it's wonderful and you can double click things and closing the seek... tab destroys your search results 2013-02-28 20:56:57 -05:00
Devin Howard 564d18df4d finished mappings#create except it doesn't authenticate... 2013-02-28 20:41:30 -05:00
Devin Howard 4e5fb95c7e fixed a few problems with mappings_controller.rb 2013-02-28 20:16:04 -05:00
Devin Howard d325cb0088 renamed mapping_controller to mappings_controller 2013-02-28 20:08:55 -05:00
Devin Howard 101f49b9e6 added mapping_controller and routes, but only implemented create 2013-02-28 19:56:27 -05:00
Devin Howard fcc1a6968c lowercase in commons searching for topic names 2013-02-21 21:36:33 -05:00
Connor Turland 50bc2b53a9 added url for embedding maps 2013-02-19 09:44:43 -05:00
Connor Turland 210c73e81b Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-02-16 19:03:48 -05:00
Connor Turland c7f44d34a7 fixed console issue 2013-02-16 19:03:21 -05:00
Connor Turland a1c5a82ac4 fixed autocomplete bugginess, fixed synapse half opacity bug 2013-02-15 20:00:05 -05:00
Devin Howard 1ea2317ab4 nicer formatting on savelayout in maps_controller.rb 2013-02-14 22:36:08 -05:00
Connor Turland 9160ae305e finished devins piece editing synapse directionality 2013-02-03 21:12:15 -05:00
Connor Turland 8167708383 added link to Click Me topic in logged out menu, and made it the place you go when you log in 2013-02-03 20:20:29 -05:00
Connor Turland 4bbb838cd4 reformatted home page, fixed text-overflow, added request invite page and a link to the blog 2013-02-03 19:13:21 -05:00
Devin Howard dfa2b2eb83 merged in changes from github and merged with synapse editng code 2013-01-30 19:51:55 -05:00
Devin Howard 25fa45356f javascript, etc to allow editing of directionality and edge titles. This commit results in effective, but really horrid UI-wise, editing of such things. 2013-01-27 17:21:19 -05:00
Connor Turland b358f3dc5b fixed login bug 2013-01-26 00:46:03 -05:00
Connor Turland a0f638c10c added ability to switch what metacodes you are mapping with 2013-01-25 20:49:40 -05:00
Connor Turland 9853f91a59 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-25 00:48:09 -05:00
Connor Turland 9bc07b04fa improved so many things 2013-01-25 00:47:32 -05:00
Devin Howard 0ad2392af5 Merge branch 'master' into devel 2013-01-24 19:53:07 -05:00
Devin Howard 87b2526373 removed 2 spaces from sessions_controller 2013-01-24 19:52:13 -05:00
Devin Howard c9614e33e3 removed buggy line from users_controller preventing people from joining (?) Or just Ishan's friends? 2013-01-24 19:51:51 -05:00
Connor Turland 1633b61637 permissions not fully fully functional yet, don't push to staging. editing of maps as cards in place. raw data available as json at maps/:id/json, or topics/:id/json, or synapses/:id/json 2013-01-18 17:08:06 -05:00
Connor Turland f48659288c Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-07 23:04:14 -05:00
Connor Turland 1b44175c31 added home page with recent info, and personal profiles with recent indo 2013-01-07 23:03:41 -05:00
Devin Howard 1fed4d2f06 save synapses to map in saveToMap function wasn't working, but it is now 2013-01-07 23:03:29 -05:00
Devin Howard e481dcd822 changed maps controller so it accepts synapses as a csv list 2013-01-07 22:04:53 -05:00
Connor Turland bf957617da Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-07 19:57:35 -05:00
Connor Turland 3ee2921ae4 updating user profile pages 2013-01-07 19:57:04 -05:00
Devin Howard 954ce2009b got editing of synapses working. Also tidied up selection code. 2013-01-07 19:43:12 -05:00
Devin Howard b3ccbbbd74 can now remove synapses from maps with R key, although you can't really tell if you reload the page 2013-01-05 23:37:24 -05:00
Connor Turland e0a2df285f Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-05 23:03:30 -05:00
Devin Howard 01fe14dbd1 remove all mappings from a synapse on destroy in controller. Haven't added stuff to remove mappings to controller 2013-01-05 22:40:10 -05:00
Connor Turland 76fd9b14da added assets for staging 2013-01-05 17:50:40 -05:00
Connor Turland e5076533c0 disabled awkward panning and zooming bugs by editing jit code 2013-01-05 16:21:11 -05:00
Connor Turland b31906823a minor error in controller for deleting mappings 2013-01-04 21:44:16 -05:00
Connor Turland e593bbc8b2 added ability to hide topics from canvas, remove topics from map, and delete topics, all from the graph. 2013-01-04 21:39:16 -05:00
Connor Turland ea19ce5375 changed the mechanism for realtime so that it only pulls in new information 2013-01-04 16:51:37 -05:00
Connor Turland 8180742ec4 added an attempt at real time updates on maps 2013-01-04 00:20:43 -05:00
Connor Turland 7497688724 fixed a bunch of strange behaviours, and made synapse and topic creation work on all major browsers except haven't tested it out fully with opera yet, Devin will do that. added, but hid the framework for using analyze and organize functions on the left hand side. 2013-01-03 18:21:46 -05:00
Connor Turland 940c6f02a5 too tired cause I stayed up to stupid late to say something intelligeblle here see. 2013-01-03 03:53:25 -05:00
Devin Howard 50dd586fbe removed showcard routes, html.erb, and controller entries/files since it's back in javascript 2013-01-02 21:01:56 -05:00