glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1628 commits 40 branches 27 tags 58 MiB
Commit graph

297 commits

Author SHA1 Message Date
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