kurund [Sat, 1 Mar 2014 21:21:58 +0000 (02:51 +0530)]
fixed enable/disable actions, CRM-14201
----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
http://issues.civicrm.org/jira/browse/CRM-14201
kurund [Sat, 1 Mar 2014 20:57:31 +0000 (02:27 +0530)]
CRM-14201, converted contact relationship listing to ajax/datatable listing
----------------------------------------
* CRM-14201: Contact Relationships tab needs pagination
http://issues.civicrm.org/jira/browse/CRM-14201
Kurund Jalmi [Sat, 1 Mar 2014 06:34:20 +0000 (12:04 +0530)]
Merge pull request #2587 from colemanw/forms
CRM-14288 - Refactor and simplify relationship form
Coleman Watts [Sat, 1 Mar 2014 03:19:36 +0000 (22:19 -0500)]
CRM-13966 - Remove CRM_Contact_Form_NewContact and related functions
Coleman Watts [Sat, 1 Mar 2014 03:03:38 +0000 (22:03 -0500)]
CRM-14288 - Remove unnecessary relationship ajax callback
Coleman Watts [Sat, 1 Mar 2014 03:02:54 +0000 (22:02 -0500)]
CRM-14288 - Change th ids to prevent dom conflicts with date fields
Coleman Watts [Sat, 1 Mar 2014 03:01:55 +0000 (22:01 -0500)]
CRM-14288 - Refactor and simplify relationship form
Coleman Watts [Sat, 1 Mar 2014 03:01:38 +0000 (22:01 -0500)]
CRM-14288 - Make select2 renderer a public utility fn
Coleman Watts [Sat, 1 Mar 2014 02:59:43 +0000 (21:59 -0500)]
Add no-popup to contact links
Dave Greenberg [Sat, 1 Mar 2014 01:19:09 +0000 (17:19 -0800)]
Merge pull request #2585 from davecivicrm/CRM-14286
CRM-14286 - Contact mailings tab should show opens and clicks for curren...
Dave Greenberg [Sat, 1 Mar 2014 01:16:53 +0000 (17:16 -0800)]
CRM-14286 - Contact mailings tab should show opens and clicks for currently viewed contact. This commit cannot be backported to 4.3 without adjustment since CRM_Mailing_BAO_Job has been renamed to CRM_Mailing_BAO_MailingJob as of 4.4.
----------------------------------------
* CRM-14286: Contact Mailings tab selector should show Open and Click activity specfic to the currently viewed contact
http://issues.civicrm.org/jira/browse/CRM-14286
Dave Greenberg [Sat, 1 Mar 2014 00:59:08 +0000 (16:59 -0800)]
Merge pull request #2584 from davecivicrm/fixCiviMailSampleLink
Fix deprecated link in sample message template - should go to new hostin...
Dave Greenberg [Sat, 1 Mar 2014 00:58:03 +0000 (16:58 -0800)]
Fix deprecated link in sample message template - should go to new hosting provider page.
dlobo [Fri, 28 Feb 2014 23:07:56 +0000 (15:07 -0800)]
Merge pull request #2583 from northwind2/CRM-14281
CRM-14281 call hook_civicrm_config() in loadbootstrap()
northwind2 [Fri, 28 Feb 2014 21:31:01 +0000 (21:31 +0000)]
CRM-14281 call hook_civicrm_config() in loadbootstrap()
----------------------------------------
* CRM-14281: hook_civicrm_config does not get called when using Joomla bootstrap
http://issues.civicrm.org/jira/browse/CRM-14281
Dave Greenberg [Fri, 28 Feb 2014 19:08:12 +0000 (11:08 -0800)]
Merge pull request #2567 from giant-rabbit/cart_financial_transactions
CRM-14268 - Make CiviCRM's event registration cart record financial tran...
pratik-joshi [Fri, 28 Feb 2014 11:19:39 +0000 (16:49 +0530)]
Merge pull request #2578 from pratik-joshi/CRM-13992
CRM-13992 : minor warning fix
Pratik Joshi [Fri, 28 Feb 2014 11:14:17 +0000 (16:44 +0530)]
CRM-13992 : minor warning fix
Coleman Watts [Thu, 27 Feb 2014 23:51:09 +0000 (18:51 -0500)]
Add lo-dash js to core resources
Dave Greenberg [Thu, 27 Feb 2014 23:04:14 +0000 (15:04 -0800)]
Update Group.php
Clarify and fix typo in formRule message.
Dave Greenberg [Thu, 27 Feb 2014 23:01:25 +0000 (15:01 -0800)]
Merge pull request #2557 from pratik-joshi/CRM-13992
Crm 13992
Dave Greenberg [Thu, 27 Feb 2014 21:37:27 +0000 (13:37 -0800)]
Merge pull request #2575 from lcdservices/CRM-14287
CRM-14287 include contrib ID in post process object
Brian Shaughnessy [Thu, 27 Feb 2014 19:59:34 +0000 (14:59 -0500)]
CRM-14287 include contrib ID in post process object
colemanw [Thu, 27 Feb 2014 17:43:24 +0000 (12:43 -0500)]
Merge pull request #2572 from donordepot/issue_tracker
Add directions on where to report issues.
David Barratt [Thu, 27 Feb 2014 16:40:27 +0000 (11:40 -0500)]
Add directions on where to report issues.
Pratik Joshi [Thu, 27 Feb 2014 16:09:55 +0000 (21:39 +0530)]
CRM-13992 : QA fixes mentioned in #comment-57745
Coleman Watts [Thu, 27 Feb 2014 15:17:48 +0000 (10:17 -0500)]
Cleanup admin form buttons
Pratik Joshi [Tue, 25 Feb 2014 13:11:03 +0000 (18:41 +0530)]
CRM-13992 : COPY action implementation
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
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
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
colemanw [Thu, 27 Feb 2014 02:49:26 +0000 (21:49 -0500)]
Merge pull request #2569 from colemanw/ac
Autocomplete refactoring
Coleman Watts [Thu, 27 Feb 2014 01:45:37 +0000 (20:45 -0500)]
CRM-13966 - Migrate case autocompletes to select2
Coleman Watts [Wed, 26 Feb 2014 21:58:23 +0000 (16:58 -0500)]
Cleanup tpl whitespace and ts
Coleman Watts [Wed, 26 Feb 2014 16:50:31 +0000 (11:50 -0500)]
CiviCase tpl cleanup
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.
Coleman Watts [Wed, 26 Feb 2014 00:37:43 +0000 (19:37 -0500)]
Add hover class to buttons
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
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
Coleman Watts [Tue, 25 Feb 2014 21:40:08 +0000 (16:40 -0500)]
Campaign Query - search form tweaks adding select2
Coleman Watts [Tue, 25 Feb 2014 21:19:45 +0000 (16:19 -0500)]
CRM-13966 - Migrate campaign form autocompletes
Coleman Watts [Tue, 25 Feb 2014 21:02:01 +0000 (16:02 -0500)]
Rename autocomplete term variable for consistency
JoeMurray [Tue, 25 Feb 2014 20:42:29 +0000 (15:42 -0500)]
Added localizable to title and instructions
Coleman Watts [Tue, 25 Feb 2014 20:32:20 +0000 (15:32 -0500)]
Improve tag form and metadata
Coleman Watts [Tue, 25 Feb 2014 19:56:12 +0000 (14:56 -0500)]
CRM-13966 - Migrate mergeTags to use select2
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.
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
Coleman Watts [Tue, 25 Feb 2014 15:58:19 +0000 (10:58 -0500)]
CRM-13966 - Remove another unused autocomplete
Coleman Watts [Tue, 25 Feb 2014 15:53:31 +0000 (10:53 -0500)]
CRM-13966 - Refactor autocomplete from financial acct form
Coleman Watts [Tue, 25 Feb 2014 15:25:38 +0000 (10:25 -0500)]
CRM-13966 - Remove unused autocomplete
Coleman Watts [Tue, 25 Feb 2014 15:23:54 +0000 (10:23 -0500)]
CRM-13966 - Improve entityRef default placeholder
Coleman Watts [Tue, 25 Feb 2014 14:39:31 +0000 (09:39 -0500)]
CRM-12872 - add necessary js to contribution search
colemanw [Tue, 25 Feb 2014 14:32:23 +0000 (09:32 -0500)]
Merge pull request #2558 from colemanw/eventSelect2
Select2 work
Coleman Watts [Tue, 25 Feb 2014 14:25:09 +0000 (09:25 -0500)]
Cleanup Participant.tpl
Coleman Watts [Tue, 25 Feb 2014 14:12:16 +0000 (09:12 -0500)]
CRM-14270 - Fix UX & performance issues on backend participant form
Coleman Watts [Sun, 23 Feb 2014 18:05:02 +0000 (13:05 -0500)]
CRM-13966 - Allow extra data to be returned with autocomplete results
Coleman Watts [Sun, 23 Feb 2014 14:14:47 +0000 (09:14 -0500)]
CRM-13966 - Improve select2 description formatting
Coleman Watts [Sat, 22 Feb 2014 17:13:36 +0000 (12:13 -0500)]
CRM-13966 - Migrate event id to select2
Coleman Watts [Sat, 22 Feb 2014 15:55:33 +0000 (10:55 -0500)]
CRM-13966 - Migrate event type to select2
Coleman Watts [Sat, 22 Feb 2014 15:54:44 +0000 (10:54 -0500)]
CRM-13966 - Fix entityRef/getlist to work with non-id keys
colemanw [Tue, 25 Feb 2014 14:26:22 +0000 (09:26 -0500)]
Merge pull request #2545 from colemanw/tokens
Use select2 for inserting tokens
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
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"
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.
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
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
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.
Anthony Nemirovsky [Tue, 25 Feb 2014 01:11:06 +0000 (17:11 -0800)]
CRM-14268 - Make CiviCRM's event registration cart record financial transactions to conform to the changes beginning in CiviCRM 4.2.
The newer versions of Civi create a civicrm_line_item for every participant
registered for an event. This was happening automatically for cart
registrations, but the records created were not correct as Civi was
autogenerating them with default values. This commit corrects that and
creates accurate civicrm_line_item records for each participant
registered in the cart.
The newer versions of Civi also automatically create records in
civicrm_entity_financial_trxn for each civicrm_contribution and civicrm_financial_item. The cart code manually generated a civicrm_entity_financial_trxn for each contribution, which was causing some extra records to be created with incorrect values. Removing the manual generation of civicrm_entity_financial_trxn records in the cart code fixes this issue. The correct rows now appear in civicrm_entity_financial_trxn.
We also want to prevent the cart from creating an extra civicrm_financial_trxn record. These records are now auto generated and we no longer have to manually create a record. Manually doing this caused an extra record to be created in civicrm_financial_trxn set to the total of all the contributions from the cart, which is incorrect.
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...
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
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"
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
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
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...
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.
Brian Shaughnessy [Mon, 24 Feb 2014 17:49:01 +0000 (12:49 -0500)]
CRM-13319 social media links
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
jitendrapurohit [Mon, 24 Feb 2014 11:21:30 +0000 (16:51 +0530)]
api test for CRM-13833
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
Robert C. Sheets [Sun, 23 Feb 2014 15:49:12 +0000 (07:49 -0800)]
more phpdoc comment cleanup
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.
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.
Coleman Watts [Sat, 22 Feb 2014 01:21:43 +0000 (20:21 -0500)]
CRM-14258 - Use select2 for inserting tokens
Coleman Watts [Sat, 22 Feb 2014 01:11:42 +0000 (20:11 -0500)]
Fix doc link
Coleman Watts [Sat, 22 Feb 2014 00:33:44 +0000 (19:33 -0500)]
Add no-popup class to doc links
Tim Otten [Fri, 21 Feb 2014 22:10:18 +0000 (14:10 -0800)]
CRM_Utils_SQL_Select - Backport
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
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
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
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
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
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
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
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
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
Tim Otten [Thu, 20 Feb 2014 23:46:14 +0000 (15:46 -0800)]
GenCode - Ensure separate temp dirs on multi-user system
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
Tim Otten [Thu, 20 Feb 2014 23:39:01 +0000 (15:39 -0800)]
GenCode - Ensure separate temp dirs on multi-user system
Tim Otten [Thu, 20 Feb 2014 23:22:30 +0000 (15:22 -0800)]
Merge pull request #2540 from eileenmcnaughton/CRM-14235
Crm 14235
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