[dreamwidth/dw-free] 4f8258: Set @LANGS to en_DW only if dw-nonfree is availabl...

[github]

Branch: refs/heads/develop
Home: https://github.com/dreamwidth/dw-free
Commit: 4f8258ab4c573be42fbf46ad8590a183931fc9cc
https://github.com/dreamwidth/dw-free/commit/4f8258ab4c573be42fbf46ad8590a183931fc9cc
Author: pinterface <github@kepibu.org>
Date: 2016-05-13 (Fri, 13 May 2016)

Changed paths:
M etc/config-local.pl
M etc/config.pl

Log Message:
-----------
Set @LANGS to en_DW only if dw-nonfree is available and not already set (#1770) (#1770)

Otherwise, -free clones without -nonfree end up spamming the error
logs because en_DW doesn't exist, which is annoying and unhelpful.

Additionally makes it possible to set @LANGS via config-local,
since replacing config.pl can be much more painful.

Fixes #1768

[dreamwidth/dw-free] e1e5c4: Move DW::BusinessRules::InviteCodes::DWS to -free ...

[github]

Branch: refs/heads/develop
Home: https://github.com/dreamwidth/dw-free
Commit: e1e5c45ae91d520b852048a950362790cbf6508f
https://github.com/dreamwidth/dw-free/commit/e1e5c45ae91d520b852048a950362790cbf6508f
Author: kaberett <kaberett@gmail.com>
Date: 2016-05-13 (Fri, 13 May 2016)

Changed paths:
A cgi-bin/DW/BusinessRules/InviteCodes/DWS.pm

Log Message:
-----------
Move DW::BusinessRules::InviteCodes::DWS to -free (#1751)

Fixes Bugzilla bug 3955 (with corresponding dw-nonfree pull request).

The Bugzilla bug said:

> Following discussion in http://dw-lounge.dreamwidth.org/57318.html,
> the reasons for having separate bits in dw-free and dw-nonfree no
> longer apply, and Denise and Mark agreed to have that code GPL'd.
>
> The easiest way is probably to keep both modules, DW::BusinessRules::InviteCodes
> and DW::BusinessRules::InviteCodes::DWS, in separate files, just
> moving the dw-nonfree file to dw-free. This will keep the API
> documentation intact and minimize the risk of any side-effects for
> DW. (Note that this may cause problems for other sites that have
> their own DW::BusinessRules::InviteCodes::Foowidth. They would
> need to either delete DW::BusinessRules::InviteCodes::DWS or rename
> DW::BusinessRules::InviteCodes::Foowidth to DW::BusinessRules::InviteCodes::DWS
> in their local repo, so we need a warning in dw_dev when the change
> is committed.)

This may also affect any API work.

[dreamwidth/dw-nonfree] d24599: Moves DW::BusinessRules::InviteCodes::DWS to -free

[github]

Branch: refs/heads/develop
Home: https://github.com/dreamwidth/dw-nonfree
Commit: d245999aabfe5b3c7dc730113cb1ceb2181a5700
https://github.com/dreamwidth/dw-nonfree/commit/d245999aabfe5b3c7dc730113cb1ceb2181a5700
Author: kaberett <kaberett@dreamwidth.org>
Date: 2016-04-16 (Sat, 16 Apr 2016)

Changed paths:
R cgi-bin/DW/BusinessRules/InviteCodes/DWS.pm

Log Message:
-----------
Moves DW::BusinessRules::InviteCodes::DWS to -free

Fixes Bugzilla bug 3955 (with corresponding -free pull request).


Commit: 19dba0219982025f4c78430f856a1b2e3eb873cd
https://github.com/dreamwidth/dw-nonfree/commit/19dba0219982025f4c78430f856a1b2e3eb873cd
Author: Jen <kareila@dreamwidth.org>
Date: 2016-05-13 (Fri, 13 May 2016)

Changed paths:
R cgi-bin/DW/BusinessRules/InviteCodes/DWS.pm

Log Message:
-----------
Merge pull request #110 from kaberett/bug-3955-invite-codes-nonfree

Moves DW::BusinessRules::InviteCodes::DWS to -free


Compare: https://github.com/dreamwidth/dw-nonfree/compare/833886a93e11...19dba0219982

[dreamwidth/dw-free] b1c9ab: [#1774] only try to get a Sphinx DB handle if Sphi...

[github]

Branch: refs/heads/develop
Home: https://github.com/dreamwidth/dw-free
Commit: b1c9abafd2aec9e9807ef59b50f6a65d2e9cd2b8
https://github.com/dreamwidth/dw-free/commit/b1c9abafd2aec9e9807ef59b50f6a65d2e9cd2b8
Author: Kareila <kareila@dreamwidth.org>
Date: 2016-05-13 (Fri, 13 May 2016)

Changed paths:
M cgi-bin/DW/Hooks/SiteSearch.pm

Log Message:
-----------
[#1774] only try to get a Sphinx DB handle if Sphinx is enabled

Fixes #1774.


Commit: 2bc13a78f853ba749c485797dd3d4813f9a94025
https://github.com/dreamwidth/dw-free/commit/2bc13a78f853ba749c485797dd3d4813f9a94025
Author: Mark Smith <mark@qq.is>
Date: 2016-05-13 (Fri, 13 May 2016)

Changed paths:
M cgi-bin/DW/Hooks/SiteSearch.pm

Log Message:
-----------
Merge pull request #1775 from kareila/1774-sphinx-hook

[#1774] only try to get a Sphinx DB handle if Sphinx is enabled


Compare: https://github.com/dreamwidth/dw-free/compare/e1e5c45ae91d...2bc13a78f853

[dreamwidth/dw-free] c2d83f: Add a helper script for generating the data that g...

[github]

Branch: refs/heads/develop
Home: https://github.com/dreamwidth/dw-free
Commit: c2d83f98642bc0936de5c645a76d6bca189f2596
https://github.com/dreamwidth/dw-free/commit/c2d83f98642bc0936de5c645a76d6bca189f2596
Author: Pixie <pix@kepibu.org>
Date: 2016-05-11 (Wed, 11 May 2016)

Changed paths:
A bin/misc/mood-maker.pl

Log Message:
-----------
Add a helper script for generating the data that goes in moods.dat

As an example, you might call it as:

./bin/misc/mood-maker.pl --dir awesome-mood \
--name "user's Awesome Mood" \
--desc "A mood that will make you feel awesome even when you're sad." \
>> bin/upgrading/moods.dat

Associates moods based on the image name (e.g., happy.png -> happy).


Commit: ea59e15658b03b5b8214b48c40cef3e146c32229
https://github.com/dreamwidth/dw-free/commit/ea59e15658b03b5b8214b48c40cef3e146c32229
Author: Pixie <pix@kepibu.org>
Date: 2016-05-12 (Thu, 12 May 2016)

Changed paths:
M bin/upgrading/moods.dat
A htdocs/img/mood/teenietinies-brown/angry.gif
A htdocs/img/mood/teenietinies-brown/awake.gif
A htdocs/img/mood/teenietinies-brown/confused.gif
A htdocs/img/mood/teenietinies-brown/determined.gif
A htdocs/img/mood/teenietinies-brown/devious.gif
A htdocs/img/mood/teenietinies-brown/energetic.gif
A htdocs/img/mood/teenietinies-brown/enthralled.gif
A htdocs/img/mood/teenietinies-brown/exhausted.gif
A htdocs/img/mood/teenietinies-brown/happy.gif
A htdocs/img/mood/teenietinies-brown/indescribable.gif
A htdocs/img/mood/teenietinies-brown/nerdy.gif
A htdocs/img/mood/teenietinies-brown/okay.gif
A htdocs/img/mood/teenietinies-brown/sad.gif
A htdocs/img/mood/teenietinies-brown/scared.gif
A htdocs/img/mood/teenietinies-brown/surprised.gif
A htdocs/img/mood/teenietinies-brown/thoughtful.gif
A htdocs/img/mood/teenietinies-brown/working.gif
A htdocs/img/mood/teenietinies-cherry/angry.gif
A htdocs/img/mood/teenietinies-cherry/awake.gif
A htdocs/img/mood/teenietinies-cherry/confused.gif
A htdocs/img/mood/teenietinies-cherry/determined.gif
A htdocs/img/mood/teenietinies-cherry/devious.gif
A htdocs/img/mood/teenietinies-cherry/energetic.gif
A htdocs/img/mood/teenietinies-cherry/enthralled.gif
A htdocs/img/mood/teenietinies-cherry/exhausted.gif
A htdocs/img/mood/teenietinies-cherry/happy.gif
A htdocs/img/mood/teenietinies-cherry/indescribable.gif
A htdocs/img/mood/teenietinies-cherry/nerdy.gif
A htdocs/img/mood/teenietinies-cherry/okay.gif
A htdocs/img/mood/teenietinies-cherry/sad.gif
A htdocs/img/mood/teenietinies-cherry/scared.gif
A htdocs/img/mood/teenietinies-cherry/surprised.gif
A htdocs/img/mood/teenietinies-cherry/thoughtful.gif
A htdocs/img/mood/teenietinies-cherry/working.gif
A htdocs/img/mood/teenietinies-cyan/angry.gif
A htdocs/img/mood/teenietinies-cyan/awake.gif
A htdocs/img/mood/teenietinies-cyan/bored.gif
A htdocs/img/mood/teenietinies-cyan/confused.gif
A htdocs/img/mood/teenietinies-cyan/determined.gif
A htdocs/img/mood/teenietinies-cyan/devious.gif
A htdocs/img/mood/teenietinies-cyan/disappointed.gif
A htdocs/img/mood/teenietinies-cyan/discontent.gif
A htdocs/img/mood/teenietinies-cyan/energetic.gif
A htdocs/img/mood/teenietinies-cyan/enthralled.gif
A htdocs/img/mood/teenietinies-cyan/exhausted.gif
A htdocs/img/mood/teenietinies-cyan/happy.gif
A htdocs/img/mood/teenietinies-cyan/indescribable.gif
A htdocs/img/mood/teenietinies-cyan/jealous.gif
A htdocs/img/mood/teenietinies-cyan/nerdy.gif
A htdocs/img/mood/teenietinies-cyan/numb.gif
A htdocs/img/mood/teenietinies-cyan/okay.gif
A htdocs/img/mood/teenietinies-cyan/pessimistic.gif
A htdocs/img/mood/teenietinies-cyan/sad.gif
A htdocs/img/mood/teenietinies-cyan/scared.gif
A htdocs/img/mood/teenietinies-cyan/sick.gif
A htdocs/img/mood/teenietinies-cyan/surprised.gif
A htdocs/img/mood/teenietinies-cyan/sympathetic.gif
A htdocs/img/mood/teenietinies-cyan/thoughtful.gif
A htdocs/img/mood/teenietinies-cyan/uncomfortable.gif
A htdocs/img/mood/teenietinies-cyan/working.gif
A htdocs/img/mood/teenietinies-cyan/worried.gif
A htdocs/img/mood/teenietinies-grey/angry.gif
A htdocs/img/mood/teenietinies-grey/awake.gif
A htdocs/img/mood/teenietinies-grey/confused.gif
A htdocs/img/mood/teenietinies-grey/determined.gif
A htdocs/img/mood/teenietinies-grey/devious.gif
A htdocs/img/mood/teenietinies-grey/energetic.gif
A htdocs/img/mood/teenietinies-grey/enthralled.gif
A htdocs/img/mood/teenietinies-grey/exanimate.gif
A htdocs/img/mood/teenietinies-grey/exhausted.gif
A htdocs/img/mood/teenietinies-grey/happy.gif
A htdocs/img/mood/teenietinies-grey/indescribable.gif
A htdocs/img/mood/teenietinies-grey/nerdy.gif
A htdocs/img/mood/teenietinies-grey/okay.gif
A htdocs/img/mood/teenietinies-grey/sad.gif
A htdocs/img/mood/teenietinies-grey/scared.gif
A htdocs/img/mood/teenietinies-grey/surprised.gif
A htdocs/img/mood/teenietinies-grey/thoughtful.gif
A htdocs/img/mood/teenietinies-grey/working.gif
A htdocs/img/mood/teenietinies-olive/angry.gif
A htdocs/img/mood/teenietinies-olive/awake.gif
A htdocs/img/mood/teenietinies-olive/confused.gif
A htdocs/img/mood/teenietinies-olive/determined.gif
A htdocs/img/mood/teenietinies-olive/devious.gif
A htdocs/img/mood/teenietinies-olive/energetic.gif
A htdocs/img/mood/teenietinies-olive/enthralled.gif
A htdocs/img/mood/teenietinies-olive/exhausted.gif
A htdocs/img/mood/teenietinies-olive/happy.gif
A htdocs/img/mood/teenietinies-olive/indescribable.gif
A htdocs/img/mood/teenietinies-olive/nerdy.gif
A htdocs/img/mood/teenietinies-olive/okay.gif
A htdocs/img/mood/teenietinies-olive/sad.gif
A htdocs/img/mood/teenietinies-olive/scared.gif
A htdocs/img/mood/teenietinies-olive/sick.gif
A htdocs/img/mood/teenietinies-olive/surprised.gif
A htdocs/img/mood/teenietinies-olive/thoughtful.gif
A htdocs/img/mood/teenietinies-olive/working.gif
A htdocs/img/mood/teenietinies-pink/angry.gif
A htdocs/img/mood/teenietinies-pink/awake.gif
A htdocs/img/mood/teenietinies-pink/confused.gif
A htdocs/img/mood/teenietinies-pink/determined.gif
A htdocs/img/mood/teenietinies-pink/devious.gif
A htdocs/img/mood/teenietinies-pink/energetic.gif
A htdocs/img/mood/teenietinies-pink/enthralled.gif
A htdocs/img/mood/teenietinies-pink/exhausted.gif
A htdocs/img/mood/teenietinies-pink/happy.gif
A htdocs/img/mood/teenietinies-pink/indescribable.gif
A htdocs/img/mood/teenietinies-pink/nerdy.gif
A htdocs/img/mood/teenietinies-pink/okay.gif
A htdocs/img/mood/teenietinies-pink/sad.gif
A htdocs/img/mood/teenietinies-pink/scared.gif
A htdocs/img/mood/teenietinies-pink/surprised.gif
A htdocs/img/mood/teenietinies-pink/thoughtful.gif
A htdocs/img/mood/teenietinies-pink/working.gif
A htdocs/img/mood/teenietinies-yellow/angry.gif
A htdocs/img/mood/teenietinies-yellow/awake.gif
A htdocs/img/mood/teenietinies-yellow/confused.gif
A htdocs/img/mood/teenietinies-yellow/determined.gif
A htdocs/img/mood/teenietinies-yellow/devious.gif
A htdocs/img/mood/teenietinies-yellow/energetic.gif
A htdocs/img/mood/teenietinies-yellow/enthralled.gif
A htdocs/img/mood/teenietinies-yellow/exhausted.gif
A htdocs/img/mood/teenietinies-yellow/happy.gif
A htdocs/img/mood/teenietinies-yellow/indescribable.gif
A htdocs/img/mood/teenietinies-yellow/nerdy.gif
A htdocs/img/mood/teenietinies-yellow/okay.gif
A htdocs/img/mood/teenietinies-yellow/sad.gif
A htdocs/img/mood/teenietinies-yellow/scared.gif
A htdocs/img/mood/teenietinies-yellow/sick.gif
A htdocs/img/mood/teenietinies-yellow/surprised.gif
A htdocs/img/mood/teenietinies-yellow/thoughtful.gif
A htdocs/img/mood/teenietinies-yellow/working.gif

Log Message:
-----------
Add Teeny Tinies variants from phidari (fixes #1759)


Commit: a03c06cb77ca4c5af504cc546ce6d88ac5382d65
https://github.com/dreamwidth/dw-free/commit/a03c06cb77ca4c5af504cc546ce6d88ac5382d65
Author: Jen <kareila@dreamwidth.org>
Date: 2016-05-13 (Fri, 13 May 2016)

Changed paths:
A bin/misc/mood-maker.pl
M bin/upgrading/moods.dat
A htdocs/img/mood/teenietinies-brown/angry.gif
A htdocs/img/mood/teenietinies-brown/awake.gif
A htdocs/img/mood/teenietinies-brown/confused.gif
A htdocs/img/mood/teenietinies-brown/determined.gif
A htdocs/img/mood/teenietinies-brown/devious.gif
A htdocs/img/mood/teenietinies-brown/energetic.gif
A htdocs/img/mood/teenietinies-brown/enthralled.gif
A htdocs/img/mood/teenietinies-brown/exhausted.gif
A htdocs/img/mood/teenietinies-brown/happy.gif
A htdocs/img/mood/teenietinies-brown/indescribable.gif
A htdocs/img/mood/teenietinies-brown/nerdy.gif
A htdocs/img/mood/teenietinies-brown/okay.gif
A htdocs/img/mood/teenietinies-brown/sad.gif
A htdocs/img/mood/teenietinies-brown/scared.gif
A htdocs/img/mood/teenietinies-brown/surprised.gif
A htdocs/img/mood/teenietinies-brown/thoughtful.gif
A htdocs/img/mood/teenietinies-brown/working.gif
A htdocs/img/mood/teenietinies-cherry/angry.gif
A htdocs/img/mood/teenietinies-cherry/awake.gif
A htdocs/img/mood/teenietinies-cherry/confused.gif
A htdocs/img/mood/teenietinies-cherry/determined.gif
A htdocs/img/mood/teenietinies-cherry/devious.gif
A htdocs/img/mood/teenietinies-cherry/energetic.gif
A htdocs/img/mood/teenietinies-cherry/enthralled.gif
A htdocs/img/mood/teenietinies-cherry/exhausted.gif
A htdocs/img/mood/teenietinies-cherry/happy.gif
A htdocs/img/mood/teenietinies-cherry/indescribable.gif
A htdocs/img/mood/teenietinies-cherry/nerdy.gif
A htdocs/img/mood/teenietinies-cherry/okay.gif
A htdocs/img/mood/teenietinies-cherry/sad.gif
A htdocs/img/mood/teenietinies-cherry/scared.gif
A htdocs/img/mood/teenietinies-cherry/surprised.gif
A htdocs/img/mood/teenietinies-cherry/thoughtful.gif
A htdocs/img/mood/teenietinies-cherry/working.gif
A htdocs/img/mood/teenietinies-cyan/angry.gif
A htdocs/img/mood/teenietinies-cyan/awake.gif
A htdocs/img/mood/teenietinies-cyan/bored.gif
A htdocs/img/mood/teenietinies-cyan/confused.gif
A htdocs/img/mood/teenietinies-cyan/determined.gif
A htdocs/img/mood/teenietinies-cyan/devious.gif
A htdocs/img/mood/teenietinies-cyan/disappointed.gif
A htdocs/img/mood/teenietinies-cyan/discontent.gif
A htdocs/img/mood/teenietinies-cyan/energetic.gif
A htdocs/img/mood/teenietinies-cyan/enthralled.gif
A htdocs/img/mood/teenietinies-cyan/exhausted.gif
A htdocs/img/mood/teenietinies-cyan/happy.gif
A htdocs/img/mood/teenietinies-cyan/indescribable.gif
A htdocs/img/mood/teenietinies-cyan/jealous.gif
A htdocs/img/mood/teenietinies-cyan/nerdy.gif
A htdocs/img/mood/teenietinies-cyan/numb.gif
A htdocs/img/mood/teenietinies-cyan/okay.gif
A htdocs/img/mood/teenietinies-cyan/pessimistic.gif
A htdocs/img/mood/teenietinies-cyan/sad.gif
A htdocs/img/mood/teenietinies-cyan/scared.gif
A htdocs/img/mood/teenietinies-cyan/sick.gif
A htdocs/img/mood/teenietinies-cyan/surprised.gif
A htdocs/img/mood/teenietinies-cyan/sympathetic.gif
A htdocs/img/mood/teenietinies-cyan/thoughtful.gif
A htdocs/img/mood/teenietinies-cyan/uncomfortable.gif
A htdocs/img/mood/teenietinies-cyan/working.gif
A htdocs/img/mood/teenietinies-cyan/worried.gif
A htdocs/img/mood/teenietinies-grey/angry.gif
A htdocs/img/mood/teenietinies-grey/awake.gif
A htdocs/img/mood/teenietinies-grey/confused.gif
A htdocs/img/mood/teenietinies-grey/determined.gif
A htdocs/img/mood/teenietinies-grey/devious.gif
A htdocs/img/mood/teenietinies-grey/energetic.gif
A htdocs/img/mood/teenietinies-grey/enthralled.gif
A htdocs/img/mood/teenietinies-grey/exanimate.gif
A htdocs/img/mood/teenietinies-grey/exhausted.gif
A htdocs/img/mood/teenietinies-grey/happy.gif
A htdocs/img/mood/teenietinies-grey/indescribable.gif
A htdocs/img/mood/teenietinies-grey/nerdy.gif
A htdocs/img/mood/teenietinies-grey/okay.gif
A htdocs/img/mood/teenietinies-grey/sad.gif
A htdocs/img/mood/teenietinies-grey/scared.gif
A htdocs/img/mood/teenietinies-grey/surprised.gif
A htdocs/img/mood/teenietinies-grey/thoughtful.gif
A htdocs/img/mood/teenietinies-grey/working.gif
A htdocs/img/mood/teenietinies-olive/angry.gif
A htdocs/img/mood/teenietinies-olive/awake.gif
A htdocs/img/mood/teenietinies-olive/confused.gif
A htdocs/img/mood/teenietinies-olive/determined.gif
A htdocs/img/mood/teenietinies-olive/devious.gif
A htdocs/img/mood/teenietinies-olive/energetic.gif
A htdocs/img/mood/teenietinies-olive/enthralled.gif
A htdocs/img/mood/teenietinies-olive/exhausted.gif
A htdocs/img/mood/teenietinies-olive/happy.gif
A htdocs/img/mood/teenietinies-olive/indescribable.gif
A htdocs/img/mood/teenietinies-olive/nerdy.gif
A htdocs/img/mood/teenietinies-olive/okay.gif
A htdocs/img/mood/teenietinies-olive/sad.gif
A htdocs/img/mood/teenietinies-olive/scared.gif
A htdocs/img/mood/teenietinies-olive/sick.gif
A htdocs/img/mood/teenietinies-olive/surprised.gif
A htdocs/img/mood/teenietinies-olive/thoughtful.gif
A htdocs/img/mood/teenietinies-olive/working.gif
A htdocs/img/mood/teenietinies-pink/angry.gif
A htdocs/img/mood/teenietinies-pink/awake.gif
A htdocs/img/mood/teenietinies-pink/confused.gif
A htdocs/img/mood/teenietinies-pink/determined.gif
A htdocs/img/mood/teenietinies-pink/devious.gif
A htdocs/img/mood/teenietinies-pink/energetic.gif
A htdocs/img/mood/teenietinies-pink/enthralled.gif
A htdocs/img/mood/teenietinies-pink/exhausted.gif
A htdocs/img/mood/teenietinies-pink/happy.gif
A htdocs/img/mood/teenietinies-pink/indescribable.gif
A htdocs/img/mood/teenietinies-pink/nerdy.gif
A htdocs/img/mood/teenietinies-pink/okay.gif
A htdocs/img/mood/teenietinies-pink/sad.gif
A htdocs/img/mood/teenietinies-pink/scared.gif
A htdocs/img/mood/teenietinies-pink/surprised.gif
A htdocs/img/mood/teenietinies-pink/thoughtful.gif
A htdocs/img/mood/teenietinies-pink/working.gif
A htdocs/img/mood/teenietinies-yellow/angry.gif
A htdocs/img/mood/teenietinies-yellow/awake.gif
A htdocs/img/mood/teenietinies-yellow/confused.gif
A htdocs/img/mood/teenietinies-yellow/determined.gif
A htdocs/img/mood/teenietinies-yellow/devious.gif
A htdocs/img/mood/teenietinies-yellow/energetic.gif
A htdocs/img/mood/teenietinies-yellow/enthralled.gif
A htdocs/img/mood/teenietinies-yellow/exhausted.gif
A htdocs/img/mood/teenietinies-yellow/happy.gif
A htdocs/img/mood/teenietinies-yellow/indescribable.gif
A htdocs/img/mood/teenietinies-yellow/nerdy.gif
A htdocs/img/mood/teenietinies-yellow/okay.gif
A htdocs/img/mood/teenietinies-yellow/sad.gif
A htdocs/img/mood/teenietinies-yellow/scared.gif
A htdocs/img/mood/teenietinies-yellow/sick.gif
A htdocs/img/mood/teenietinies-yellow/surprised.gif
A htdocs/img/mood/teenietinies-yellow/thoughtful.gif
A htdocs/img/mood/teenietinies-yellow/working.gif

Log Message:
-----------
Merge pull request #1759 from pinterface/teenietinies-variants

Mood themes: Teeny Tinies variant


Compare: https://github.com/dreamwidth/dw-free/compare/2bc13a78f853...a03c06cb77ca