Commit Graph

462 Commits

Author SHA1 Message Date
Rafael França 58fdac9d0a Merge pull request #142 from georgeclaghorn/rm-everything
Remove source code
2016-01-01 15:32:44 -02:00
George Claghorn 376136498f Remove source code 2015-12-31 20:41:09 -05:00
Guillermo Iguaran 265535ce93 Merge pull request #141 from jeroenvisser101/patch-1
Update copyright year [ci-skip]
2015-12-31 20:11:14 -05:00
Jeroen Visser a68ddafa5e Update copyright year
Happy new year!
2016-01-01 02:10:11 +01:00
Rafael França 50b4edc29b Merge pull request #140 from rails/move-to-rails-rails
Link to actioncable in rails/rails
2015-12-18 20:24:00 -02:00
Claudio B e1f0b6f61f Link to actioncable in rails/rails
Together with this PR, I suggest to remove the "Issues" tab in this project (in GitHub settings)
2015-12-18 12:28:33 -08:00
Javan Makhmali 92adbc2fab Fix createConsumer examples 2015-12-15 09:56:22 -05:00
Javan Makhmali a87a5ff513 Rename helper and update comment 2015-12-15 09:53:10 -05:00
Javan Makhmali 11a0b2c6d8 Fix URL helper object property 2015-12-15 09:50:03 -05:00
Javan Makhmali 4f95cb022c Merge branch 'nicer_create' of git://github.com/kbrock/actioncable into relative-websocket-url 2015-12-15 09:46:54 -05:00
Keenan Brock beb8a3141b Allow relative urls for createCable
thanks to https://gist.github.com/jlong/2428561
2015-12-14 18:53:53 -05:00
Javan Makhmali f2fe68d5c9 websocket -> WebSocket 2015-12-14 14:28:48 -05:00
David Heinemeier Hansson 4073a3e3fe Merge pull request #137 from rails/freshen-client-side-examples
Freshen up the client-side subscription examples. Fixes #118
2015-12-13 14:29:38 +01:00
David Heinemeier Hansson a890c81626 Merge pull request #135 from gregmolnar/readme
add devise example to readme
2015-12-13 14:28:39 +01:00
David Heinemeier Hansson 7328aa41c5 Merge pull request #73 from smellsblue/websocket-url-differentiation
Easy websocket url configuration
2015-12-13 14:26:46 +01:00
David Heinemeier Hansson 5fec4b96ff Merge pull request #130 from adamliesko/allow_regexps_allowed_origins
Allow regexp for a allowed_request_origins array
2015-12-13 14:24:28 +01:00
adamliesko 1c6fb5e397 Remove unused method allowed_origins in Connection::Base 2015-12-13 12:47:08 +01:00
adamliesko 09e10ef643 Allow regexp for a allowed_request_origins array 2015-12-12 23:14:49 +01:00
Mike Virata-Stone 62250e38a1 Easy websocket url configuration
Thanks to feedback from @ascrazy, @jeremy, and @javan
2015-12-11 14:57:01 -08:00
Javan Makhmali 2b33675528 Associate comments with `perform` 2015-12-11 17:17:18 -05:00
Javan Makhmali 14628ffbff Freshen up the client-side subscription examples. Fixes #118 2015-12-11 17:09:02 -05:00
Greg Molnar 3816fac41d add devise example to readme 2015-12-11 16:38:16 +00:00
David Heinemeier Hansson c362beab2e Merge pull request #57 from lsylvester/log-to-stdout-in-developement-mode
Add logging to stdout in development mode.
2015-12-11 17:27:43 +01:00
David Heinemeier Hansson a86d506339 Merge pull request #115 from habermann24/master
Fix an error when using multiple gid identifiers
2015-12-11 17:22:56 +01:00
David Heinemeier Hansson cf4d9aa992 Merge pull request #125 from lsylvester/handle-custom-loggers
Handle cases where logger is not a tagged logger.
2015-12-11 17:22:12 +01:00
David Heinemeier Hansson 2b4aa9a173 Merge pull request #126 from mikecarroll/add_allowed_request_origins_to_readme
README.md instructions for configuring allowed request origins
2015-12-11 17:21:13 +01:00
David Heinemeier Hansson 0e283fed20 Merge pull request #133 from assimovt/master
Update README find_verified_user example
2015-12-09 14:19:26 +01:00
Tair Assimov a3d293b4b3 Update README find_verified_user example 2015-12-08 10:48:07 +01:00
Rafael França 928aed6e2a Merge pull request #128 from ma2gedev/patch1
fix typo
2015-12-03 13:02:06 -02:00
Takayuki Matsubara 6bd458d97d fix typo 2015-12-03 23:06:14 +09:00
Michael Carroll e17b65e46b Add README.md instructions on configuring ActionCable.server.config.allowed_request_origins 2015-11-20 08:50:33 -05:00
Lachlan Sylvester 43c6c77879 Handle cases where logger is not a tagged logger.
Previously, a TaggedLoggerProxy was only created if the logger responded to
:tagged, but was still used as if it was a TaggedLoggerProxy elsewhere in the
code, causing undefined method  errors.

This moved the check for tagging abilities inside the TaggedLoggerProxy so the
code can always tread the logger like a tagged logger, and if it is not a
tagged logger the tags will just be ignored. This prevents needing to check
if the logger is tagged every time we use it.
2015-11-18 22:53:23 +11:00
Jan Habermann 952887a8bd Use to_gid_param for connection identifiers 2015-11-18 12:15:18 +01:00
Kasper Timm Hansen 6be2604aa7 Tune whitespace in README.md
* Realign `end` statements with the opening `class` statement.
* Pad JavaScript objects with spaces to match Rails styleguide and for consistency with other examples.
2015-11-15 21:09:14 +01:00
Javan Makhmali 63cdbf87dd Merge pull request #117 from rails/shared-constants
Share internal identifiers and message types with the JavaScript client
2015-11-06 15:34:31 -05:00
Javan Makhmali 365891d5ef Share internal identifiers and message types with the JavaScript client 2015-11-06 14:09:38 -05:00
Pratik Naik e2ed68cc70 Missed updating a method name 2015-11-06 10:49:10 -06:00
Jan Habermann a74bcae30a Add multiple identifiers test 2015-11-06 00:28:58 +01:00
Jan Habermann e95e598b43 Fix an error when using multiple gid identifiers 2015-11-05 23:38:44 +01:00
Pratik Naik 37fe48928e Rename Subscription#reject! to Subscription#reject as there's only one version of the method 2015-11-05 09:37:15 -06:00
Pratik de64aa3440 Merge pull request #102 from rails/subscription-rejection
Allow rejecting subscriptions from the channel
2015-11-04 17:43:31 -06:00
Pratik Naik 1ce0e66f09 Add some documentation explaining subscription rejection 2015-11-04 17:42:34 -06:00
Pratik Naik 476aca0967 Fix a merge fail syntax issue 2015-11-04 17:23:24 -06:00
Pratik Naik cb4ef80f20 Merge branch 'master' into subscription-rejection 2015-11-04 17:22:48 -06:00
Pratik Naik 7c1631fa48 Make sure cable closes the connection if open when responding to an invalid request 2015-11-04 12:38:43 -06:00
Jeremy Daer df20d87c7b Merge pull request #113 from dballona/fix-subscription-callbacks
Fixing subscription callbacks
2015-11-04 09:21:06 -07:00
Diego Ballona 351a663e57 Fixing subscription callbacks 2015-11-04 13:42:56 -02:00
Kasper Timm Hansen eeb2b5cf47 Merge pull request #106 from nobrick/master
Remove unnecessary space in README [ci skip]
2015-10-24 17:17:21 +02:00
Ming Qu bb322ee19d Remove unnecessary space in README [ci skip] 2015-10-24 21:09:14 +08:00
Rafael Mendonça França d88bad3e96 Don't ask an yanked celluloid version 2015-10-23 20:41:33 -02:00