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

1164 commits

Author SHA1 Message Date
Devin Howard 7b9c6459e3 allow embedding 2016-02-19 09:23:39 +08:00
Connor Turland 2f4b3b3761 call was ending in wrong situation 2016-02-17 13:49:48 +13:00
Connor Turland d82288c9f2 fixed up call ending/starting events 2016-02-17 13:27:22 +13:00
Devin Howard 9ff6375e62 don't need to create synapse on canvas click 2016-02-14 15:19:36 +08:00
Devin Howard dc1aa1e28e document synapse cancellation in cheatsheet 2016-02-14 15:19:36 +08:00
Devin Howard 9469b08ffa cancel synapse creation with esc, backspace, or delete 2016-02-14 15:19:35 +08:00
Devin Howard 056ef2b5b6 smoother synapse creation with clicks/tabs 2016-02-14 15:19:35 +08:00
Devin Howard 48863ce246 create synapse if you click away from the synapse title form 2016-02-14 15:19:35 +08:00
Devin Howard f9bcd33344 update synapses specs; all specs pass again. all models/controllers tested 2016-02-09 14:25:39 +08:00
Devin Howard 7f50db1ae9 ok metacode spec done 2016-02-09 13:30:49 +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
Connor Turland e29b683b38 new junto images 2016-02-09 09:14:33 +13:00
Devin Howard e460899ea3 testing simplecov and rcov stuff 2016-02-08 11:19:39 +08:00
Devin Howard cc99ed001d fix mapping_controller_spec.rb 2016-02-08 11:19:38 +08:00
Devin Howard fa3a725df9 mapping spec 2016-02-08 11:19:37 +08:00
Devin Howard 987cd7f5a0 Merge branch 'feature/xls.export' into release/v2.8 2016-02-08 09:58:09 +08:00
Devin Howard f42b30e8b5 Merge branch 'feature/auto.synapse' into release/v2.8 2016-02-08 09:57:58 +08:00
Devin Howard 0ae8ea0ca5 implement csv/xls export 2016-02-07 13:12:18 +08:00
Devin Howard 83551e317e create synapse if you click away from the synapse title form 2016-02-06 13:03:47 +08:00
Devin Howard 786eeae72a Merge branch 'develop' into feature/realtime.video 2016-02-06 12:56:23 +08:00
Devin Howard 798035107f Merge branch 'master' into develop 2016-02-06 10:11:55 +08:00
Devin Howard 67da49c1be max height on search results so they scroll 2016-02-05 22:13:23 +08:00
Devin Howard 57a8b654ba smoother 'added by me' filtering 2016-02-05 21:25:20 +08:00
Devin Howard 3fe93be987 Merge branch 'master' into develop 2016-02-05 20:21:31 +08:00
Devin Howard 48ec4a024e mark 2.7.1 2016-02-05 20:12:05 +08:00
Devin Howard 6b9aa52224 well, the loading icon mostly works now too 2016-02-05 20:09:00 +08:00
Devin Howard 5f90843da2 gross, but it works. checkboxes in search results work 2016-02-05 20:02:57 +08:00
Devin Howard c427e7fd7e mess with typeahead(val) calls. looks like the header is being destroyed during suggestion rendering, need a variable 2016-02-05 19:54:38 +08:00
Devin Howard 353872001f vertical align no results 2016-02-05 19:21:09 +08:00
Devin Howard aabdaaf21b nicer icon positioning 2016-02-05 19:19:16 +08:00
Devin Howard f1f56f9286 centre topic icons if there are results 2016-02-05 19:11:19 +08:00
Devin Howard 461b62628d fix minimizing search results 2016-02-05 19:06:57 +08:00
Devin Howard 3405bf5942 fix the problem where it always closes on you 2016-02-05 18:56:16 +08:00
Devin Howard a05fe70eda topic headers on resultnoresults 2016-02-05 18:35:45 +08:00
Devin Howard b3d321c7e9 topic icon <-- 2016-02-05 18:27:26 +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
Devin Howard 3e28831595 Merge branch 'develop' into feature/realtime.video 2016-02-05 11:38:19 +08:00
Devin Howard c80efac7de tag v2.8 2016-02-05 11:37:33 +08:00
Devin Howard e73ade0442 tag v2.7 2016-02-05 11:29:05 +08:00
poietic c8d6563f45 changed links from old uservoice url. 
links to support forum were pointed towards our expired custom domain
from service, renamed them all so that they link up.
 2016-01-29 16:00:30 -08:00
Connor Turland 8e07c10ecc make sure the chat pane is closed for opening the next map 2016-01-26 15:29:32 +13:00
Connor Turland 1fa84e0d29 chat only displays on maps 2016-01-26 14:46:26 +13:00
Connor Turland 74d372b942 fix the scrolling in the chat messages box 2016-01-22 16:49:50 +13:00
Connor Turland 4557b8e305 merge develop 2016-01-22 14:59:09 +13:00
Devin Howard 14a292331b two tweaks to help production deploy 2016-01-19 14:27:25 +08:00
Connor Turland 11fc7a01f3 fixes the issue where video feeds go black after first call 2016-01-09 16:11:28 +13:00
Devin Howard 4842856358 merge develop into rspec-tests 2016-01-07 16:04:23 +08:00
Devin Howard 4469b29ec2 in user model 2016-01-07 15:32:19 +08:00
Devin Howard bf21dcc3e6 merge develop into rspec tests 2016-01-06 23:03:34 +08:00
Devin Howard 3cdab531a6 move more config into .example-env 2016-01-06 22:57:01 +08:00
Devin Howard 844a52fc52 Merge pull request #450 from metamaps/feature/fix-searchbox 
fix searchbox
 2015-12-24 15:44:12 +08:00
Devin Howard 40561c629a fix handleResultClick on search box 2015-12-24 15:42:51 +08:00
Devin Howard a45d0f7791 fix search box on authenticated homepage 2015-12-24 15:19:03 +08:00
Connor Turland 6db91ea703 broken funnnnnction 2015-12-23 11:34:52 +08:00
Connor Turland 26bc04262a broken funnnnnction 2015-12-22 22:28:03 -05:00
Connor Turland 5ad1504494 handle socketio reconnect situation 2015-12-22 18:05:13 -05:00
Connor Turland 64283850e3 add junto spinner for call in progress 2015-12-22 17:46:19 -05:00
Connor Turland dfc94b4079 fix up styling on chat text input 2015-12-22 16:34:30 -05:00
Connor Turland 49dd2f2e92 merge develop 2015-12-22 13:16:03 -05:00
Connor Turland 8d85f8d308 videos positioning decently. chats loading more smoothly 2015-12-22 12:43:50 -05:00
Devin Howard 8394e0ce86 re-add regular uservoice code 2015-12-22 07:13:26 +08:00
Devin Howard c58b2c805e syntax error 2015-12-21 21:38:02 +08:00
Devin Howard d96e991de3 don't use // for heroku either 2015-12-21 21:29:15 +08:00
Devin Howard 6e10b4c508 make use of realtime.metamaps.cc server 2015-12-21 21:28:18 +08:00
Devin Howard 603b9dc52e remove uservoice code 2015-12-21 10:16:51 +08:00
Devin Howard 9a7ef25afc Merge branch 'develop' into feature/https-preparation 2015-12-20 22:28:43 +08:00
Devin Howard 888edae6f6 finish remove asset_path_icon whoops 2015-12-20 22:28:05 +08:00
Devin Howard c79a5f0072 Merge branch 'develop' into feature/https-preparation 2015-12-20 22:24:47 +08:00
Devin Howard 96ec672779 Merge branch 'develop' into feature/rspec-tests 2015-12-20 22:24:39 +08:00
Devin Howard df485002b1 remove redundant asset_path_icon function 2015-12-20 22:22:01 +08:00
Devin Howard d33f4bffb1 typekit https 2015-12-20 20:19:24 +08:00
Devin Howard e2bf1d5eb1 try to make metamaps more tls friendly 2015-12-20 18:36:57 +08:00
Devin Howard c4be57e525 topic and synapse validate permission 2015-12-18 09:25:54 +08:00
Devin Howard 006acac6b5 remove redundant authorize_to_view function 2015-12-17 23:20:19 +08:00
Devin Howard d5f66487b7 update map spec - add authorize_to_delete. TODO: add other map authorize specs 2015-12-17 09:44:48 +08:00
Devin Howard 9e4a7b821f cleanup topic model a bit 2015-12-17 09:34:49 +08:00
Devin Howard 696bac17e6 map spec 2015-12-17 09:16:02 +08:00
Devin Howard 2525a6fb65 add permission service, refactor map model a bit, add validations 2015-12-17 09:10:52 +08:00
Devin Howard bfd4e4f228 add permission service, add validations to map.rb 2015-12-17 09:03:51 +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 b2aa2074a7 update generation calcuation code, incl. fix user signup bug 2015-12-15 12:33:22 +08:00
Connor Turland a905094d4d inviting, joining, and leaving conversations 2015-12-14 02:28:13 -05:00
Connor Turland 8b090be0b3 convert to something more 'call' style 2015-12-12 19:00:51 -05:00
Connor Turland be2997d7e4 fix bad tooltip placement 2015-12-12 11:31:54 -05:00
Connor Turland eec7dcb9c3 make the messages box fill up all available space 2015-12-11 19:18:53 -05:00
Connor Turland 56e3fc753a use asset_path for link to sound files 2015-12-11 19:15:18 -05:00
Connor Turland 20aa78208e rename junto to erb file 2015-12-11 18:49:22 -05:00
Connor Turland 6c7ba76937 update to https for sockets 2015-12-11 18:45:51 -05:00
Connor Turland 5f1ef5f5c8 remove extra code 2015-12-11 18:10:38 -05: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
Connor Turland 2929547736 position the chat box, and remove the old junto panel 2015-12-03 17:15:15 -05:00
Connor Turland 75554d58bf temp 2015-12-03 17:15:15 -05:00
Devin Howard 519342a468 fix filter bug 2015-12-03 16:58:21 -05:00
Devin Howard 31fceab45d search box css fixes 2015-12-03 16:58:21 -05:00
Devin Howard 47a7e161ee fix error with mapper search rendering 2015-12-03 16:58:21 -05:00
Devin Howard 7336c262e3 fix up user model json output function 2015-12-03 16:58:21 -05:00
Devin Howard 48ea29b13e refactor search css into scss for clearer organization, plus do some fixes to the typeahead css 2015-12-03 16:58:20 -05:00
Devin Howard 38662fcda8 split search css out into its own file 2015-12-03 16:58:20 -05:00
Devin Howard 7db75b8d6d more fixes 2015-12-03 16:57:30 -05:00
Devin Howard 43624caf88 get autocomplete working again with new typeahead.js, but not the CSS 2015-12-03 16:57:30 -05:00
Devin Howard 4139c2c84a syntax error 2015-12-03 16:57:30 -05:00
Connor Turland 53d7ccab56 fix cannot set readonly property highlight 2015-12-03 16:57:30 -05:00
Connor Turland 5b0e7ffcde switching metacode sets was being caught by Metamaps.Router.intercept 2015-12-03 16:57:30 -05:00
Connor Turland 5f14601c74 styling of the vertical tab selectors needed improvement 2015-12-03 16:57:30 -05:00
Connor Turland 1b60927641 had to update because jquery ui version changed 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 520fe095bd fix #465, metacode sort problem 2015-12-03 16:57:29 -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 3e03e64845 css fixes for heroku 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 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 f0c0dc48d8 add highlight to typeahead 2015-12-03 16:57:28 -05:00
Devin Howard 0b96171aa3 bugfix 2015-12-03 16:57:27 -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 47205883a9 whoops 2015-12-03 16:57:27 -05:00
Devin Howard f4987bffc0 change css files to use asset_data_uri 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 d8dffad38a metacodes#index map in asset_path 2015-12-03 16:57:27 -05:00
Devin Howard 96f5e6ac35 add asset_path calls 2015-12-03 16:57:26 -05:00
Devin Howard 29411cf1e5 asset_path 2015-12-03 16:57:26 -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 4d7f509235 change some css to erb 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 2505ce36a5 syntax 2015-12-03 16:57:25 -05:00
Devin Howard 235aa7a6b3 convert javascript to asset_path syntax 2015-12-03 16:57:25 -05:00
Devin Howard 6e9b0ac9ef rename js files to js.erb files 2015-12-03 16:57:25 -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 1453a3c181 function naming 2015-12-03 16:57:25 -05:00