Tim Otten [Mon, 15 Jun 2015 19:48:56 +0000 (12:48 -0700)]
CRM-16387 - JobProcessMailingTest - Add comments about brokenness of mailerJobsMax/lockHold
With the current MySQL-based lock-implementation, mailerJobsMax cannot be
enforced because the job locks (```data.mailing.job.*```) trample the worker
locks (```worker.mailing.*```).
The relevant tests are hacked (```lockHold```) so that they pass and loosely
approximate what *would* happen if the lock implementation were less
bonkers.
Tim Otten [Mon, 15 Jun 2015 19:11:35 +0000 (12:11 -0700)]
CRM-16387 - CRM_Core_Lock - Only use `static` hacking on locks that are acquired.
Tim Otten [Thu, 14 May 2015 23:26:44 +0000 (16:26 -0700)]
LockInterface - Code style
Tim Otten [Thu, 14 May 2015 00:54:51 +0000 (17:54 -0700)]
CRM-16387 - Locks - Use LockManager. Cleanup names.
Tim Otten [Thu, 14 May 2015 00:29:28 +0000 (17:29 -0700)]
CRM-16387 - LockManager, LockInterface
Tim Otten [Wed, 13 May 2015 04:12:14 +0000 (21:12 -0700)]
CRM-16387 - JobProcessMailingTest - Test for concurrency and throttling behavior
Tim Otten [Wed, 13 May 2015 04:09:04 +0000 (21:09 -0700)]
CRM-16387 - CRM_Core_Lock - Fix release of $jobLog. Improve logging.
The code used $jobLog as a hack to avoid acquiring a second lock (without
releasing the first lock). However, it never detected the release of the
first lock.
Tim Otten [Tue, 12 May 2015 04:11:39 +0000 (21:11 -0700)]
CRM-16387 - Civi\API\ExternalBatch - Add helper for testing concurrent cron jobs
Tim Otten [Tue, 12 May 2015 04:07:35 +0000 (21:07 -0700)]
CiviMailUtils::assertRecipients - Fix sorting of recipients
Tim Otten [Tue, 12 May 2015 04:02:33 +0000 (21:02 -0700)]
CRM_Mailing_BAO_Mailing::processQueue - Allow tests to prolong the critical section
Tim Otten [Tue, 12 May 2015 04:01:57 +0000 (21:01 -0700)]
CRM_Mailing_BAO_Mailing::processQueue - Fix for mailerJobsMax==1
Tim Otten [Tue, 12 May 2015 02:44:56 +0000 (19:44 -0700)]
CRM/Mailing/BAO/MailingJob.php - Comment
Tim Otten [Tue, 12 May 2015 02:44:13 +0000 (19:44 -0700)]
CRM-16387 - Job.process_mailing - Return #processed messages
Tim Otten [Tue, 12 May 2015 01:04:19 +0000 (18:04 -0700)]
CRM-16387 - composer.json - Add symfony/process
Tim Otten [Mon, 11 May 2015 21:35:32 +0000 (14:35 -0700)]
bin/cli.php - Add --json output option
Tim Otten [Mon, 11 May 2015 20:44:10 +0000 (13:44 -0700)]
CRM-16387 - bin/cli.php - Allow calls against the test database
Example:
```bash
env CIVICRM_SETTINGS=/path/to/civicrm/tests/phpunit/CiviTest/civicrm.settings.cli.php \
php bin/cli.php -e Contact -a getfields --output
```
This will assist in creating tests for multi-process cron behavior.
Monish Deb [Mon, 15 Jun 2015 05:48:18 +0000 (11:18 +0530)]
Merge pull request #5989 from sudhabisht/BrokenTest
Fix for broken test
Yashodha Chaku [Mon, 15 Jun 2015 05:34:06 +0000 (11:04 +0530)]
Merge pull request #6002 from sudhabisht/CRM-16659
Fix for custom field edit issue
colemanw [Sun, 14 Jun 2015 00:37:56 +0000 (20:37 -0400)]
Merge pull request #6007 from colemanw/CRM-16645
CRM-16645 - Add scrolling to pcp autocomplete
Coleman Watts [Sat, 13 Jun 2015 17:48:23 +0000 (13:48 -0400)]
CRM-16645 - More consistently use PCP autocomplete field
Coleman Watts [Sat, 13 Jun 2015 14:02:56 +0000 (10:02 -0400)]
CRM-16645 - Add scrolling to pcp autocomplete
Dave Greenberg [Fri, 12 Jun 2015 22:54:47 +0000 (15:54 -0700)]
Merge pull request #6003 from yashodha/CRM-16661
CRM-16661 : Custom PDF page format margin bug
Dave Greenberg [Fri, 12 Jun 2015 22:16:12 +0000 (15:16 -0700)]
Merge pull request #5914 from monishdeb/CRM-16476
CRM-16476, CRM-16286 and CRM-14041 fix
colemanw [Fri, 12 Jun 2015 21:54:16 +0000 (17:54 -0400)]
Merge pull request #6004 from colemanw/CRM-16310
CRM-16310 - Sortable table refinements
Coleman Watts [Fri, 12 Jun 2015 21:51:11 +0000 (17:51 -0400)]
CRM-16310 - Sortable table refinements
colemanw [Fri, 12 Jun 2015 21:50:23 +0000 (17:50 -0400)]
Merge pull request #5957 from jitendrapurohit/CRM-16310_fix_46
CRM-16310 fix for implementing pagination on custom field option list page
Dave Greenberg [Fri, 12 Jun 2015 16:43:10 +0000 (09:43 -0700)]
Merge pull request #5993 from monishdeb/4.6
CRM-16588 fix - Changes to contacts not saving when "Use another cont…
Sudha Bisht [Fri, 12 Jun 2015 13:24:42 +0000 (18:54 +0530)]
Test Fix
monishdeb [Fri, 12 Jun 2015 13:03:23 +0000 (18:33 +0530)]
additional fixes
monishdeb [Thu, 11 Jun 2015 15:48:30 +0000 (21:18 +0530)]
CRM-16588 fix - Changes to contacts not saving when "Use another contact's address" is checked
https://issues.civicrm.org/jira/browse/CRM-16588
jitendrapurohit [Fri, 12 Jun 2015 12:40:03 +0000 (18:10 +0530)]
additional fixes for CRM-16310
jitendrapurohit [Thu, 4 Jun 2015 12:51:51 +0000 (18:21 +0530)]
warning fix
jitendrapurohit [Thu, 4 Jun 2015 12:27:35 +0000 (17:57 +0530)]
CRM-16310 - fix ordering of options in dataTable
jitendrapurohit [Wed, 27 May 2015 07:16:00 +0000 (12:46 +0530)]
CRM-16310 - implement pagination on custom field option list page
yashodha [Fri, 12 Jun 2015 10:04:01 +0000 (15:34 +0530)]
CRM-16661 : Custom PDF page format margin bug
----------------------------------------
* CRM-16661: Custom PDF page format margin bug
https://issues.civicrm.org/jira/browse/CRM-16661
Sudha Bisht [Fri, 12 Jun 2015 09:50:35 +0000 (15:20 +0530)]
Fix for custom field edit
Monish Deb [Fri, 12 Jun 2015 08:29:45 +0000 (13:59 +0530)]
Merge pull request #5990 from jitendrapurohit/CRM-16646_46
CRM-16646 - Protection against multiple submits on contributions page
Monish Deb [Fri, 12 Jun 2015 08:29:26 +0000 (13:59 +0530)]
Merge pull request #5994 from rohankatkar/CRM-16652
CRM-16652 Undefined index formatting_*
colemanw [Thu, 11 Jun 2015 23:46:05 +0000 (19:46 -0400)]
Merge pull request #5995 from colemanw/CRM-16570
CRM-16570 - Fix nesting one menu item into another
Coleman Watts [Thu, 11 Jun 2015 16:25:21 +0000 (12:25 -0400)]
CRM-16570 - Fix nesting one menu item into another
Web Access [Thu, 11 Jun 2015 16:11:08 +0000 (21:41 +0530)]
CRM-16652 Undefined index formatting_*
colemanw [Thu, 11 Jun 2015 14:09:37 +0000 (10:09 -0400)]
Merge pull request #5992 from colemanw/CRM-16306
CRM-16306 - Fix js typo
Coleman Watts [Thu, 11 Jun 2015 14:08:35 +0000 (10:08 -0400)]
CRM-16306 - Fix js typo
Monish Deb [Thu, 11 Jun 2015 13:30:36 +0000 (19:00 +0530)]
Merge pull request #5991 from monishdeb/4.6
CRM-16653 fix - Database error when searching for certain relationshi…
monishdeb [Thu, 11 Jun 2015 11:38:22 +0000 (17:08 +0530)]
CRM-16653 fix - Database error when searching for certain relationship types
https://issues.civicrm.org/jira/browse/CRM-16653
Monish Deb [Thu, 11 Jun 2015 08:22:30 +0000 (13:52 +0530)]
Merge pull request #5984 from jitendrapurohit/CRM-16648
CRM-16648 - Notice: Undefined index: label/description in CRM_Core_Op…
jitendrapurohit [Thu, 11 Jun 2015 07:21:55 +0000 (12:51 +0530)]
CRM-16646 - Protection against multiple submits on contributions page
Sudha Bisht [Thu, 11 Jun 2015 06:56:31 +0000 (12:26 +0530)]
Fix for test
colemanw [Thu, 11 Jun 2015 02:37:55 +0000 (22:37 -0400)]
Merge pull request #5719 from PalanteJon/CRM-16403
CRM-16403 - CiviCRM API - Allow GET requests to make a 'check' API call
Dave Greenberg [Wed, 10 Jun 2015 20:30:47 +0000 (13:30 -0700)]
Merge pull request #5980 from marcov4lente/CRM-15829+CRM15881-for-4.6
CRM-15829 and CRM-15881 for 4.6
colemanw [Wed, 10 Jun 2015 19:50:00 +0000 (15:50 -0400)]
Merge pull request #5837 from mlutfy/46-crm16505
CRM-16505: Fix 'other amount' translation for multilingual/non-english contribution forms.
colemanw [Wed, 10 Jun 2015 19:46:45 +0000 (15:46 -0400)]
Merge pull request #5983 from relldoesphp/CRM-16544
CRM-16544 - CiviMail automatically attaches CiviGrant files to Mailing
Marco Valente [Wed, 10 Jun 2015 10:05:06 +0000 (11:05 +0100)]
Code updated to fetch record id's using built in civi methods, namely:
- CRM_Core_DAO::getFieldValue()
- CRM_Member_PseudoConstant::membershipStatus()
As record ids may differ from system to system.
jitendrapurohit [Wed, 10 Jun 2015 06:04:41 +0000 (11:34 +0530)]
CRM-16648 - Notice: Undefined index: label/description in CRM_Core_OptionGroup
Monish Deb [Wed, 10 Jun 2015 05:38:21 +0000 (11:08 +0530)]
Merge pull request #5965 from sudhabisht/CRM-16542
Fix for PayPal Express payment gateway issue
relldoesphp [Tue, 9 Jun 2015 20:48:50 +0000 (16:48 -0400)]
CRM-16544 - CiviMail automatically attaches CiviGrant files to Mailing
https://issues.civicrm.org/jira/browse/CRM-16544
Monish Deb [Tue, 9 Jun 2015 20:21:41 +0000 (01:51 +0530)]
Merge pull request #5982 from monishdeb/CRM-16609
CRM-16609 fix - Strict warning variables should be passed by referenc…
Dave Greenberg [Tue, 9 Jun 2015 16:29:26 +0000 (09:29 -0700)]
Merge pull request #5967 from colemanw/CRM-16632
CRM-16632 - Fix calculation of contribution fees
monishdeb [Tue, 9 Jun 2015 14:29:13 +0000 (19:59 +0530)]
CRM-16609 fix - Strict warning variables should be passed by reference in civicrm/CRM/Mailing/MailStore.php
https://issues.civicrm.org/jira/browse/CRM-16609
Monish Deb [Tue, 9 Jun 2015 14:08:07 +0000 (19:38 +0530)]
Merge pull request #5981 from jitendrapurohit/CRM-16572
CRM-16572 - CiviMail sending to primary instead of bulk email account…
colemanw [Tue, 9 Jun 2015 12:05:19 +0000 (08:05 -0400)]
Merge pull request #5978 from colemanw/CRM-16521
CRM-16521 - Nicer UX for downloading files from a dialog
Monish Deb [Tue, 9 Jun 2015 11:46:40 +0000 (17:16 +0530)]
Merge pull request #5979 from pratikshad/16614
CRM-16614 Fix-Email Invoice: 500 Error in AJAX response
jitendrapurohit [Tue, 9 Jun 2015 11:43:32 +0000 (17:13 +0530)]
CRM-16572 - CiviMail sending to primary instead of bulk email account for smart groups
Marco Valente [Tue, 9 Jun 2015 09:53:45 +0000 (10:53 +0100)]
CRM-15829 and CRM-15881 for CiviCRM 4.6
-----------------------------------
CRM-15829 (Relationships and inherited pending memberships)
Add pending memberships to new members of an organisation that has pending memberships
CRM/Contact/BAO/Relationship -> line ~1458
CRM/Contact/BAO/Relationship -> line ~1479
CRM/Contact/BAO/Relationship -> line ~1483
Ensure these new pending memberships for an organisation's employees are not set to active
CRM/Member/BAO/Membership -> line 265
-----------------------------------
CRM-15881 (Contact relationships (employee of))
Clear current employee when deleting a relationship that is the employer
CRM/Contact/BAO/Relationship -> line ~623
Reload the tab ajax views to reflect removed employer display when deleting a relationship that is the employer
CRM/Contact/Form/Relationship -> line ~399
If disabling an employer relationship (via the popup modal), unset the is_current_employer, please see comments in code
CRM/Contact/Form/Relationship -> line ~444
Yashodha Chaku [Tue, 9 Jun 2015 08:30:28 +0000 (14:00 +0530)]
Merge pull request #5971 from PalanteJon/activityreportfix
CRM-16640 - CiviReport - fix error when selecting email addresses on …
Yashodha Chaku [Tue, 9 Jun 2015 08:20:58 +0000 (13:50 +0530)]
Merge pull request #5972 from PalanteJon/premiumfulfillment
CRM-16641 - CiviReport - allow reporting on premium fulfillment date
pratikshad [Tue, 9 Jun 2015 07:34:05 +0000 (13:04 +0530)]
CRM-16614 Fix-Email Invoice: 500 Error in AJAX response
----------------------------------------
* CRM-16614: Email Invoice: 500 Error in AJAX response
https://issues.civicrm.org/jira/browse/CRM-16614
Coleman Watts [Tue, 9 Jun 2015 02:04:15 +0000 (22:04 -0400)]
CRM-16521 - Nicer UX for downloading files from a dialog
colemanw [Mon, 8 Jun 2015 22:17:04 +0000 (18:17 -0400)]
Merge pull request #5976 from colemanw/CRM-16521
CRM-16521 - Fix name badge download from popup
Dave Greenberg [Mon, 8 Jun 2015 22:03:00 +0000 (15:03 -0700)]
Merge pull request #5819 from guanhuan/batch-export
CSV Batch export hooks and extra fields
Coleman Watts [Mon, 8 Jun 2015 20:25:16 +0000 (16:25 -0400)]
CRM-16521 - Fix name badge download from popup
Marco Valente [Mon, 8 Jun 2015 17:16:48 +0000 (18:16 +0100)]
CRM-15829 and CRM-15881 for CiviCRM 4.6
-----------------------------------
CRM-15829 (Relationships and inherited pending memberships)
Add pending memberships to new members of an organisation that has pending memberships
CRM/Contact/BAO/Relationship -> line ~1458
CRM/Contact/BAO/Relationship -> line ~1479
CRM/Contact/BAO/Relationship -> line ~1483
Ensure these new pending memberships for an organisation's employees are not set to active
CRM/Member/BAO/Membership -> line 265
-----------------------------------
CRM-15881 (Contact relationships (employee of))
Clear current employee when deleting a relationship that is the employer
CRM/Contact/BAO/Relationship -> line ~623
Reload the tab ajax views to reflect removed employer display when deleting a relationship that is the employer
CRM/Contact/Form/Relationship -> line ~399
If disabling an employer relationship (via the popup modal), unset the is_current_employer, please see comments in code
CRM/Contact/Form/Relationship -> line ~444
Monish Deb [Mon, 8 Jun 2015 13:29:37 +0000 (18:59 +0530)]
Merge pull request #5975 from rohankatkar/CRM-16425
CRM-16425 Added CiviCRM Licensing Exception in header
Web Access [Wed, 10 Jun 2015 11:34:49 +0000 (17:04 +0530)]
Warning fixes
Web Access [Wed, 10 Jun 2015 10:58:55 +0000 (16:28 +0530)]
CRM-16425 Added CiviCRM Licensing Exception in header
colemanw [Mon, 8 Jun 2015 01:38:16 +0000 (21:38 -0400)]
Merge pull request #5974 from colemanw/Add
Add clearfix class to caseSummary hook content
Coleman Watts [Mon, 8 Jun 2015 01:37:07 +0000 (21:37 -0400)]
Add clearfix class to caseSummary hook content
colemanw [Sun, 7 Jun 2015 18:54:06 +0000 (14:54 -0400)]
Merge pull request #5970 from colemanw/explorer
Fix basePath in APIExplorer examples
Jon goldberg [Sun, 7 Jun 2015 18:15:48 +0000 (14:15 -0400)]
CRM-16641 - CiviReport - allow reporting on premium fulfillment date - add'l fix
Jon goldberg [Sun, 7 Jun 2015 18:10:17 +0000 (14:10 -0400)]
CRM-16641 - CiviReport - Allow reporting on premium fulfillment
Jon goldberg [Sun, 7 Jun 2015 18:04:26 +0000 (14:04 -0400)]
CRM-16640 - CiviReport - fix error when selecting email addresses on activity report
colemanw [Sat, 6 Jun 2015 15:36:25 +0000 (11:36 -0400)]
Merge pull request #5968 from colemanw/Static
Static function fixes
Coleman Watts [Sat, 6 Jun 2015 15:35:57 +0000 (11:35 -0400)]
Fix basePath in APIExplorer examples
Coleman Watts [Sat, 6 Jun 2015 02:19:36 +0000 (22:19 -0400)]
Static function fixes
Coleman Watts [Fri, 5 Jun 2015 15:41:00 +0000 (11:41 -0400)]
CRM-16632 - Fix calculation of contribution fees
colemanw [Fri, 5 Jun 2015 15:03:50 +0000 (11:03 -0400)]
Merge pull request #5966 from colemanw/CRM-16631
CRM-16631 - Show unlimited case types
Coleman Watts [Fri, 5 Jun 2015 15:02:14 +0000 (11:02 -0400)]
CRM-16631 - Show unlimited case types
Sudha Bisht [Fri, 5 Jun 2015 13:17:24 +0000 (18:47 +0530)]
Test Fix
Monish Deb [Fri, 5 Jun 2015 13:14:29 +0000 (18:44 +0530)]
Merge pull request #5956 from rohankatkar/CRM-16451
Layout issues when recording back-office priceset contributions
Monish Deb [Fri, 5 Jun 2015 13:09:17 +0000 (18:39 +0530)]
Merge pull request #5959 from futurefirst/crm-16625-4.6
CRM-16625 fix formatting of dates to be passed to contact creation during import
Sudha Bisht [Fri, 5 Jun 2015 12:49:24 +0000 (18:19 +0530)]
Fix for paypal button
monishdeb [Fri, 5 Jun 2015 00:16:49 +0000 (05:46 +0530)]
QA fixes
monishdeb [Thu, 4 Jun 2015 13:42:19 +0000 (19:12 +0530)]
CRM-16542 fix - PayPal Express woes on 4.6
https://issues.civicrm.org/jira/browse/CRM-16542
Monish Deb [Fri, 5 Jun 2015 11:26:03 +0000 (16:56 +0530)]
Merge pull request #5964 from monishdeb/CRM-16574_Contribution_Summary_Report_grouping
Crm 16574 contribution summary report grouping
monishdeb [Fri, 5 Jun 2015 11:23:54 +0000 (16:53 +0530)]
notice fix
monishdeb [Fri, 5 Jun 2015 08:11:57 +0000 (13:41 +0530)]
Formatting fixes
monishdeb [Thu, 4 Jun 2015 22:29:51 +0000 (03:59 +0530)]
api tests fix
monishdeb [Wed, 3 Jun 2015 08:07:50 +0000 (13:37 +0530)]
QA changes
monishdeb [Thu, 28 May 2015 09:24:57 +0000 (14:54 +0530)]
formatting fix
monishdeb [Thu, 28 May 2015 09:10:32 +0000 (14:40 +0530)]
formatting fix
projects / civicrm-core.git / log