civicrm-core.git
10 years agoCRM-13992 : QA fixes mentioned in #comment-57745
Pratik Joshi [Thu, 27 Feb 2014 16:09:55 +0000 (21:39 +0530)]
CRM-13992 : QA fixes mentioned in #comment-57745

10 years agoCRM-13992 : COPY action implementation
Pratik Joshi [Tue, 25 Feb 2014 13:11:03 +0000 (18:41 +0530)]
CRM-13992 : COPY action implementation

10 years agoCRM-13992 : custom data single record view handling, DELETE action handling, QA check...
Pratik Joshi [Mon, 24 Feb 2014 15:30:17 +0000 (21:00 +0530)]
CRM-13992 : custom data single record view handling, DELETE action handling, QA checks and fixes

10 years agoCRM-13992 : handling multi-custom data listing, edit, add, view actions. reused profi...
Pratik Joshi [Sat, 22 Feb 2014 15:36:46 +0000 (21:06 +0530)]
CRM-13992 : handling multi-custom data listing, edit, add, view actions. reused profile code for listing and extended custom data engine for multi-value custom handling

10 years agoCRM-13992 coding neccessary property values / configurable options required for tab...
Pratik Joshi [Tue, 18 Feb 2014 13:13:31 +0000 (18:43 +0530)]
CRM-13992 coding neccessary property values / configurable options required for tab table layout orientation

10 years agoMerge pull request #2569 from colemanw/ac
colemanw [Thu, 27 Feb 2014 02:49:26 +0000 (21:49 -0500)]
Merge pull request #2569 from colemanw/ac

Autocomplete refactoring

10 years agoCRM-13966 - Migrate case autocompletes to select2
Coleman Watts [Thu, 27 Feb 2014 01:45:37 +0000 (20:45 -0500)]
CRM-13966 - Migrate case autocompletes to select2

10 years agoCleanup tpl whitespace and ts
Coleman Watts [Wed, 26 Feb 2014 21:58:23 +0000 (16:58 -0500)]
Cleanup tpl whitespace and ts

10 years agoCiviCase tpl cleanup
Coleman Watts [Wed, 26 Feb 2014 16:50:31 +0000 (11:50 -0500)]
CiviCase tpl cleanup

10 years agoFix undefined index
Coleman Watts [Wed, 26 Feb 2014 16:49:37 +0000 (11:49 -0500)]
Fix undefined index

This function doesn't seem to do anything and throws an undefined index warning. Linking cases seems to work fine without it.

10 years agoAdd hover class to buttons
Coleman Watts [Wed, 26 Feb 2014 00:37:43 +0000 (19:37 -0500)]
Add hover class to buttons

10 years agoMerge pull request #2550 from lcdservices/CRM-13319
Dave Greenberg [Tue, 25 Feb 2014 23:42:46 +0000 (15:42 -0800)]
Merge pull request #2550 from lcdservices/CRM-13319

CRM-13319 social media links

10 years agoMerge pull request #2560 from JoeMurray/patch-1
Dave Greenberg [Tue, 25 Feb 2014 23:00:26 +0000 (15:00 -0800)]
Merge pull request #2560 from JoeMurray/patch-1

CRM-14273 Added localizable to title and instructions

10 years agoCampaign Query - search form tweaks adding select2
Coleman Watts [Tue, 25 Feb 2014 21:40:08 +0000 (16:40 -0500)]
Campaign Query - search form tweaks adding select2

10 years agoCRM-13966 - Migrate campaign form autocompletes
Coleman Watts [Tue, 25 Feb 2014 21:19:45 +0000 (16:19 -0500)]
CRM-13966 - Migrate campaign form autocompletes

10 years agoRename autocomplete term variable for consistency
Coleman Watts [Tue, 25 Feb 2014 21:02:01 +0000 (16:02 -0500)]
Rename autocomplete term variable for consistency

10 years agoAdded localizable to title and instructions
JoeMurray [Tue, 25 Feb 2014 20:42:29 +0000 (15:42 -0500)]
Added localizable to title and instructions

10 years agoImprove tag form and metadata
Coleman Watts [Tue, 25 Feb 2014 20:32:20 +0000 (15:32 -0500)]
Improve tag form and metadata

10 years agoCRM-13966 - Migrate mergeTags to use select2
Coleman Watts [Tue, 25 Feb 2014 19:56:12 +0000 (14:56 -0500)]
CRM-13966 - Migrate mergeTags to use select2

10 years agoMerge pull request #2559 from davecivicrm/CRM-14266
Dave Greenberg [Tue, 25 Feb 2014 17:35:03 +0000 (09:35 -0800)]
Merge pull request #2559 from davecivicrm/CRM-14266

CRM-14266 - include all system FROM emails.

10 years agoCRM-14266 - include all system FROM emails.
Dave Greenberg [Tue, 25 Feb 2014 17:33:29 +0000 (09:33 -0800)]
CRM-14266 - include all system FROM emails.

----------------------------------------
* CRM-14266: send receipt from contrib/event/membership should list all configured FROM email addresses
  http://issues.civicrm.org/jira/browse/CRM-14266

10 years agoCRM-13966 - Remove another unused autocomplete
Coleman Watts [Tue, 25 Feb 2014 15:58:19 +0000 (10:58 -0500)]
CRM-13966 - Remove another unused autocomplete

10 years agoCRM-13966 - Refactor autocomplete from financial acct form
Coleman Watts [Tue, 25 Feb 2014 15:53:31 +0000 (10:53 -0500)]
CRM-13966 - Refactor autocomplete from financial acct form

10 years agoCRM-13966 - Remove unused autocomplete
Coleman Watts [Tue, 25 Feb 2014 15:25:38 +0000 (10:25 -0500)]
CRM-13966 - Remove unused autocomplete

10 years agoCRM-13966 - Improve entityRef default placeholder
Coleman Watts [Tue, 25 Feb 2014 15:23:54 +0000 (10:23 -0500)]
CRM-13966 - Improve entityRef default placeholder

10 years agoCRM-12872 - add necessary js to contribution search
Coleman Watts [Tue, 25 Feb 2014 14:39:31 +0000 (09:39 -0500)]
CRM-12872 - add necessary js to contribution search

10 years agoMerge pull request #2558 from colemanw/eventSelect2
colemanw [Tue, 25 Feb 2014 14:32:23 +0000 (09:32 -0500)]
Merge pull request #2558 from colemanw/eventSelect2

Select2 work

10 years agoCleanup Participant.tpl
Coleman Watts [Tue, 25 Feb 2014 14:25:09 +0000 (09:25 -0500)]
Cleanup Participant.tpl

10 years agoCRM-14270 - Fix UX & performance issues on backend participant form
Coleman Watts [Tue, 25 Feb 2014 14:12:16 +0000 (09:12 -0500)]
CRM-14270 - Fix UX & performance issues on backend participant form

10 years agoCRM-13966 - Allow extra data to be returned with autocomplete results
Coleman Watts [Sun, 23 Feb 2014 18:05:02 +0000 (13:05 -0500)]
CRM-13966 - Allow extra data to be returned with autocomplete results

10 years agoCRM-13966 - Improve select2 description formatting
Coleman Watts [Sun, 23 Feb 2014 14:14:47 +0000 (09:14 -0500)]
CRM-13966 - Improve select2 description formatting

10 years agoCRM-13966 - Migrate event id to select2
Coleman Watts [Sat, 22 Feb 2014 17:13:36 +0000 (12:13 -0500)]
CRM-13966 - Migrate event id to select2

10 years agoCRM-13966 - Migrate event type to select2
Coleman Watts [Sat, 22 Feb 2014 15:55:33 +0000 (10:55 -0500)]
CRM-13966 - Migrate event type to select2

10 years agoCRM-13966 - Fix entityRef/getlist to work with non-id keys
Coleman Watts [Sat, 22 Feb 2014 15:54:44 +0000 (10:54 -0500)]
CRM-13966 - Fix entityRef/getlist to work with non-id keys

10 years agoMerge pull request #2545 from colemanw/tokens
colemanw [Tue, 25 Feb 2014 14:26:22 +0000 (09:26 -0500)]
Merge pull request #2545 from colemanw/tokens

Use select2 for inserting tokens

10 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-25-17-38-49
kurund [Tue, 25 Feb 2014 12:27:06 +0000 (17:57 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-25-17-38-49

Conflicts:
CRM/Report/Page/InstanceList.php
CRM/Report/Page/TemplateList.php
CRM/Utils/REST.php
css/civicrm.css
templates/CRM/Form/attachment.tpl
xml/GenCode.php

10 years agoMerge pull request #2555 from kurund/undobadcommit
Kurund Jalmi [Tue, 25 Feb 2014 10:31:51 +0000 (16:01 +0530)]
Merge pull request #2555 from kurund/undobadcommit

Revert "Merge pull request #2543 from kurund/CRM-14241"

10 years agoRevert "Merge pull request #2543 from kurund/CRM-14241"
kurund [Tue, 25 Feb 2014 10:30:49 +0000 (16:00 +0530)]
Revert "Merge pull request #2543 from kurund/CRM-14241"

This reverts commit 05288fce26229abf39dec0166075e388d56b1848, reversing
changes made to 516ee52acea65cc19face3cf3e3e880457ce125a.

10 years agoMerge pull request #2543 from kurund/CRM-14241
Kurund Jalmi [Tue, 25 Feb 2014 10:25:52 +0000 (15:55 +0530)]
Merge pull request #2543 from kurund/CRM-14241

CRM-14241, added entities generated from xml

10 years agoMerge pull request #2554 from totten/4.4-settings-hook-dedupe
Tim Otten [Tue, 25 Feb 2014 01:28:18 +0000 (17:28 -0800)]
Merge pull request #2554 from totten/4.4-settings-hook-dedupe

HR-287 - CRM_Core_BAO_Setting - Guard against duplicate settings folders

10 years agoHR-287 - CRM_Core_BAO_Setting - Guard against duplicate settings folders
Tim Otten [Tue, 25 Feb 2014 01:16:53 +0000 (17:16 -0800)]
HR-287 - CRM_Core_BAO_Setting - Guard against duplicate settings folders

Not sure this is needed, but there's been some example code floating around
in which extensions use buggy self-defenses to avoid duplicates.

10 years agoMerge pull request #2553 from davecivicrm/CRM-14227
Dave Greenberg [Tue, 25 Feb 2014 00:42:19 +0000 (16:42 -0800)]
Merge pull request #2553 from davecivicrm/CRM-14227

CRM-14227 - add Order By Registration Date to Participant Listing report...

10 years agoCRM-14227 - add Order By Registration Date to Participant Listing report.
Dave Greenberg [Tue, 25 Feb 2014 00:41:12 +0000 (16:41 -0800)]
CRM-14227 - add Order By Registration Date to Participant Listing report.

----------------------------------------
* CRM-14227: Enable sorting the participant listing report by register date
  http://issues.civicrm.org/jira/browse/CRM-14227

10 years agoMerge pull request #2538 from totten/4.4-crm-button
Tim Otten [Mon, 24 Feb 2014 23:23:31 +0000 (15:23 -0800)]
Merge pull request #2538 from totten/4.4-crm-button

HR-216 - civicrm.css - Use same styling for "crm-button" in ".crm-container" and "#crm-container"

10 years agoMerge pull request #2544 from totten/4.4-query-builder
Tim Otten [Mon, 24 Feb 2014 23:20:43 +0000 (15:20 -0800)]
Merge pull request #2544 from totten/4.4-query-builder

CRM_Utils_SQL_Select - Backport

10 years agoCRM_Utils_SQL_Select cleanup:
Tim Otten [Mon, 24 Feb 2014 22:56:08 +0000 (14:56 -0800)]
CRM_Utils_SQL_Select cleanup:

 * Add more docs
 * Add test for ORDER BY
 * Add support for LIMIT

10 years agoMerge pull request #2539 from PalanteJon/CRM-14223
Dave Greenberg [Mon, 24 Feb 2014 20:13:08 +0000 (12:13 -0800)]
Merge pull request #2539 from PalanteJon/CRM-14223

CRM-14223 - CiviEvent - don't count test registrations when returning pa...

10 years agoMerge pull request #2546 from brylie/master
Dave Greenberg [Mon, 24 Feb 2014 18:05:43 +0000 (10:05 -0800)]
Merge pull request #2546 from brylie/master

Moved "Top of page" profile below introductory text.

10 years agoCRM-13319 social media links
Brian Shaughnessy [Mon, 24 Feb 2014 17:49:01 +0000 (12:49 -0500)]
CRM-13319 social media links

10 years agoMerge pull request #2549 from jitendrapurohit/CRM-13833
Kurund Jalmi [Mon, 24 Feb 2014 12:53:27 +0000 (18:23 +0530)]
Merge pull request #2549 from jitendrapurohit/CRM-13833

api_v3_ContributionTest for CRM-13833

10 years agoapi test for CRM-13833
jitendrapurohit [Mon, 24 Feb 2014 11:21:30 +0000 (16:51 +0530)]
api test for CRM-13833

10 years agoMerge pull request #2548 from rcsheets/doc_improvements
Tim Otten [Sun, 23 Feb 2014 20:33:00 +0000 (12:33 -0800)]
Merge pull request #2548 from rcsheets/doc_improvements

Misc documentation improvements in CRM/Utils/System.php

10 years agomore phpdoc comment cleanup
Robert C. Sheets [Sun, 23 Feb 2014 15:49:12 +0000 (07:49 -0800)]
more phpdoc comment cleanup

10 years agoMoved customPre below cidzero.tpl and addl participants. Moved CMSUser.tpl above...
Brylie Oxley [Sun, 23 Feb 2014 03:25:57 +0000 (19:25 -0800)]
Moved customPre below cidzero.tpl and addl participants. Moved CMSUser.tpl above customPre.

10 years agoMoved "Top of page" profile below introductory text, to align with the documentation.
Brylie Oxley [Sat, 22 Feb 2014 21:42:23 +0000 (13:42 -0800)]
Moved "Top of page" profile below introductory text, to align with the documentation.

10 years agoCRM-14258 - Use select2 for inserting tokens
Coleman Watts [Sat, 22 Feb 2014 01:21:43 +0000 (20:21 -0500)]
CRM-14258 - Use select2 for inserting tokens

10 years agoFix doc link
Coleman Watts [Sat, 22 Feb 2014 01:11:42 +0000 (20:11 -0500)]
Fix doc link

10 years agoAdd no-popup class to doc links
Coleman Watts [Sat, 22 Feb 2014 00:33:44 +0000 (19:33 -0500)]
Add no-popup class to doc links

10 years agoCRM_Utils_SQL_Select - Backport
Tim Otten [Fri, 21 Feb 2014 22:10:18 +0000 (14:10 -0800)]
CRM_Utils_SQL_Select - Backport

10 years agoCRM-14241, added more comments
kurund [Fri, 21 Feb 2014 11:35:30 +0000 (17:05 +0530)]
CRM-14241, added more comments

----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
  http://issues.civicrm.org/jira/browse/CRM-14241

10 years agoCRM-14241, skip case related entities
kurund [Fri, 21 Feb 2014 11:02:14 +0000 (16:32 +0530)]
CRM-14241, skip case related entities

----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
  http://issues.civicrm.org/jira/browse/CRM-14241

10 years agoCRM-14241, adding entities generated from xml files
kurund [Fri, 21 Feb 2014 10:56:43 +0000 (16:26 +0530)]
CRM-14241, adding entities generated from xml files

----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
  http://issues.civicrm.org/jira/browse/CRM-14241

10 years agoremoved unwanted xml CRM-14241
kurund [Fri, 21 Feb 2014 10:45:02 +0000 (16:15 +0530)]
removed unwanted xml CRM-14241

----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
  http://issues.civicrm.org/jira/browse/CRM-14241

10 years agoCRM-14241, more fixes to entity generation
kurund [Fri, 21 Feb 2014 10:43:25 +0000 (16:13 +0530)]
CRM-14241, more fixes to entity generation

----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
  http://issues.civicrm.org/jira/browse/CRM-14241

10 years agoCRM-14241, fixes to entity generation: FK fixes
kurund [Fri, 21 Feb 2014 05:07:26 +0000 (10:37 +0530)]
CRM-14241, fixes to entity generation: FK fixes

----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
  http://issues.civicrm.org/jira/browse/CRM-14241

10 years agoCRM-14241, fixes to entity generation
kurund [Fri, 21 Feb 2014 04:40:25 +0000 (10:10 +0530)]
CRM-14241, fixes to entity generation

----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
  http://issues.civicrm.org/jira/browse/CRM-14241

10 years agoMerge pull request #2537 from totten/4.4-rest-cookie
Tim Otten [Fri, 21 Feb 2014 00:21:03 +0000 (16:21 -0800)]
Merge pull request #2537 from totten/4.4-rest-cookie

CRM-14253 - CRM_Utils_REST - Read $_GET/$_POST but not $_COOKIE

10 years agoMerge pull request #2542 from totten/master-gencode-uid
Tim Otten [Thu, 20 Feb 2014 23:47:07 +0000 (15:47 -0800)]
Merge pull request #2542 from totten/master-gencode-uid

GenCode - Ensure separate temp dirs on multi-user system

10 years agoGenCode - Ensure separate temp dirs on multi-user system
Tim Otten [Thu, 20 Feb 2014 23:46:14 +0000 (15:46 -0800)]
GenCode - Ensure separate temp dirs on multi-user system

10 years agoMerge pull request #2541 from totten/4.4-gencode-uid
Tim Otten [Thu, 20 Feb 2014 23:40:23 +0000 (15:40 -0800)]
Merge pull request #2541 from totten/4.4-gencode-uid

GenCode - Ensure separate temp dirs on multi-user system

10 years agoGenCode - Ensure separate temp dirs on multi-user system
Tim Otten [Thu, 20 Feb 2014 23:39:01 +0000 (15:39 -0800)]
GenCode - Ensure separate temp dirs on multi-user system

10 years agoMerge pull request #2540 from eileenmcnaughton/CRM-14235
Tim Otten [Thu, 20 Feb 2014 23:22:30 +0000 (15:22 -0800)]
Merge pull request #2540 from eileenmcnaughton/CRM-14235

Crm 14235

10 years agoCRM-14223 - CiviEvent - don't count test registrations when returning participant...
Jon goldberg - Linux laptop [Sat, 15 Feb 2014 16:02:02 +0000 (11:02 -0500)]
CRM-14223 - CiviEvent - don't count test registrations when returning participant counts

----------------------------------------
* CRM-14223:
  http://issues.civicrm.org/jira/browse/CRM-14223

10 years agoTried to clean up comments a bit, following Drupal comment standards
Robert C. Sheets [Thu, 20 Feb 2014 08:44:36 +0000 (00:44 -0800)]
Tried to clean up comments a bit, following Drupal comment standards

10 years agoCRM-14241, fixes to generate both DAO and entities
kurund [Thu, 20 Feb 2014 07:32:24 +0000 (13:02 +0530)]
CRM-14241, fixes to generate both DAO and entities

----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
  http://issues.civicrm.org/jira/browse/CRM-14241

10 years agotowards drupal 8 - move common permissionDenied fn
Eileen McNaughton [Thu, 20 Feb 2014 05:43:14 +0000 (18:43 +1300)]
towards drupal 8 - move common permissionDenied fn

10 years agoAdd Drupal 8 UF classes
Eileen McNaughton [Thu, 20 Feb 2014 03:44:31 +0000 (16:44 +1300)]
Add Drupal 8 UF classes

10 years agoDrupal 8 prep - refactor retrieval of uniqID in synch class
Eileen McNaughton [Thu, 20 Feb 2014 03:43:26 +0000 (16:43 +1300)]
Drupal 8 prep - refactor retrieval of uniqID in synch class

10 years agoDrupal 8 preparation - move userFramework ID retrieval to UF classes
Eileen McNaughton [Thu, 20 Feb 2014 02:52:35 +0000 (15:52 +1300)]
Drupal 8 preparation - move userFramework ID retrieval to UF classes

10 years agoHR-216 - civicrm.css - Use same styling for "crm-button" in ".crm-container" and...
Tim Otten [Thu, 20 Feb 2014 02:13:43 +0000 (18:13 -0800)]
HR-216 - civicrm.css - Use same styling for "crm-button" in ".crm-container" and "#crm-container"

10 years agoHR-216 - Setting.API - Ignore "options"
Tim Otten [Thu, 20 Feb 2014 01:58:13 +0000 (17:58 -0800)]
HR-216 - Setting.API - Ignore "options"

10 years agoCRM-14253 - CRM_Utils_REST - Read $_GET/$_POST but not $_COOKIE
Tim Otten [Thu, 20 Feb 2014 00:48:16 +0000 (16:48 -0800)]
CRM-14253 - CRM_Utils_REST - Read $_GET/$_POST but not $_COOKIE

10 years agoMerge pull request #2536 from totten/4.4-backbone-return
Tim Otten [Thu, 20 Feb 2014 00:07:54 +0000 (16:07 -0800)]
Merge pull request #2536 from totten/4.4-backbone-return

HR-216 - crm.backbone.js - Allow limiting the return to specific fields

10 years agoHR-216 - crm.backbone.js - Allow limiting the return to specific fields
Tim Otten [Wed, 19 Feb 2014 23:39:57 +0000 (15:39 -0800)]
HR-216 - crm.backbone.js - Allow limiting the return to specific fields

10 years agoMerge pull request #2534 from mlutfy/4.4-crm14243-tsfix
dlobo [Wed, 19 Feb 2014 14:33:14 +0000 (06:33 -0800)]
Merge pull request #2534 from mlutfy/4.4-crm14243-tsfix

CRM-14243: 'ts' fix for file upload description.

10 years agoMerge pull request #2535 from totten/master-symfony-ws
Tim Otten [Wed, 19 Feb 2014 01:37:09 +0000 (17:37 -0800)]
Merge pull request #2535 from totten/master-symfony-ws

CRM-13986 - CRM_Core_Invoke - Handle HTML and WS requests differently

10 years agoCRM-13986 - CRM_Core_Invoke - Handle HTML and WS requests differently
Tim Otten [Wed, 19 Feb 2014 01:33:24 +0000 (17:33 -0800)]
CRM-13986 - CRM_Core_Invoke - Handle HTML and WS requests differently

For HTML, use the CMS's output mechanism (with its theming, etc)
For web services (or any non-HTML content), use Symfony's output mechanism

10 years agoCRM-14243: 'ts' fix for file upload description.
Mathieu Lutfy [Tue, 18 Feb 2014 21:03:36 +0000 (16:03 -0500)]
CRM-14243: 'ts' fix for file upload description.

10 years agoBatch entry label change
Coleman Watts [Tue, 18 Feb 2014 16:50:21 +0000 (08:50 -0800)]
Batch entry label change

10 years agoMerge pull request #2532 from colemanw/ac2
colemanw [Tue, 18 Feb 2014 15:14:55 +0000 (07:14 -0800)]
Merge pull request #2532 from colemanw/ac2

Work on refactoring autocompletes

10 years agoMerge pull request #2523 from mlutfy/4.5-crm14319
Kurund Jalmi [Tue, 18 Feb 2014 12:41:51 +0000 (18:11 +0530)]
Merge pull request #2523 from mlutfy/4.5-crm14319

CRM-14219: templates/CRM/PCP/Form/Campaign.tpl: convert markup from tables to divs.

10 years agoMerge pull request #2533 from yashodha/4.4
Kurund Jalmi [Tue, 18 Feb 2014 12:24:00 +0000 (17:54 +0530)]
Merge pull request #2533 from yashodha/4.4

HR-231 : support for Report menu items based on grouping

10 years agoHR-231 : support for Report menu items based on grouping
yashodha [Tue, 18 Feb 2014 12:11:52 +0000 (17:41 +0530)]
HR-231 : support for Report menu items based on grouping

10 years agoCRM-13929 Cleanup activity form
Coleman Watts [Tue, 18 Feb 2014 06:00:59 +0000 (22:00 -0800)]
CRM-13929 Cleanup activity form

10 years agoCRM-13929 Refactor contribution forms
Coleman Watts [Mon, 17 Feb 2014 23:55:46 +0000 (15:55 -0800)]
CRM-13929 Refactor contribution forms

10 years agoMerge pull request #2530 from monishdeb/CRM-14195
Kurund Jalmi [Tue, 18 Feb 2014 02:36:29 +0000 (08:06 +0530)]
Merge pull request #2530 from monishdeb/CRM-14195

CRM-14195 fix - Fix buildACLClause for Activity Reports

10 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-18-07-54-54
kurund [Tue, 18 Feb 2014 02:32:16 +0000 (08:02 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-18-07-54-54

Conflicts:
CRM/Utils/Hook/Joomla.php
api/v3/examples/LocBlock/Create.php
api/v3/examples/LocBlock/CreateEntities.php
api/v3/examples/LocBlock/Get.php
api/v3/examples/LocBlock/createEntities.php
api/v3/examples/LocBlock/getEntities.php
api/v3/examples/LocBlock/simpleCreate.php
api/v3/examples/LocBlockCreate.php
api/v3/examples/LocBlockCreateEntities.php
api/v3/examples/LocBlockGet.php

10 years agoMore icon fixes - should all be multiples of 16
Coleman Watts [Mon, 17 Feb 2014 22:17:53 +0000 (14:17 -0800)]
More icon fixes - should all be multiples of 16

10 years agoCRM-13929 Refactor membership forms
Coleman Watts [Mon, 17 Feb 2014 05:31:44 +0000 (21:31 -0800)]
CRM-13929 Refactor membership forms

10 years agoCRM-14195 fix - Fix buildACLClause for Activity Reports
monishdeb [Mon, 17 Feb 2014 13:45:48 +0000 (19:15 +0530)]
CRM-14195 fix - Fix buildACLClause for Activity Reports

http://issues.civicrm.org/jira/browse/CRM-14195