Yashodha Chaku [Sun, 28 Jun 2015 14:32:50 +0000 (20:02 +0530)]
Merge pull request #6100 from yashodha/webtest
skipping webtests that are working locally and not on Jenkins
yashodha [Sun, 28 Jun 2015 06:59:42 +0000 (12:29 +0530)]
skipping webtests that are working locally and not on Jenkins
colemanw [Sat, 27 Jun 2015 17:20:21 +0000 (13:20 -0400)]
Merge pull request #6097 from colemanw/image
Better sizing of image popups
Coleman Watts [Fri, 26 Jun 2015 19:39:40 +0000 (15:39 -0400)]
Better sizing of image popups
Monish Deb [Thu, 25 Jun 2015 10:33:58 +0000 (16:03 +0530)]
Merge pull request #6064 from sfe-ev/fix-dompdf-reinvoke
Fix CRM_Utils_PDF_Utils::_html2pdf_dompdf() when invoked more than once
Tim Otten [Thu, 25 Jun 2015 04:16:44 +0000 (21:16 -0700)]
Merge pull request #5840 from totten/4.6-cron-lock-2
CiviMail locks - Tests, fixes, and cleanups
Tim Otten [Wed, 24 Jun 2015 21:09:24 +0000 (14:09 -0700)]
bin/cli.php - Accept `-J` as alias for `--json`
colemanw [Tue, 23 Jun 2015 19:41:21 +0000 (15:41 -0400)]
Merge pull request #6069 from eileenmcnaughton/CRM-16627
CRM-16627 add invoice id to contribution search
Eileen McNaughton [Tue, 23 Jun 2015 01:17:35 +0000 (13:17 +1200)]
CRM-16627 add br tag per dggs advice
Dave Greenberg [Tue, 23 Jun 2015 01:07:28 +0000 (18:07 -0700)]
Merge pull request #6068 from eileenmcnaughton/4.6
fixes to comments
Eileen McNaughton [Mon, 22 Jun 2015 23:49:57 +0000 (11:49 +1200)]
CRM-16627 add invoice id to contribution search
Eileen McNaughton [Mon, 22 Jun 2015 23:00:17 +0000 (11:00 +1200)]
phpcs fixes
Eileen McNaughton [Mon, 22 Jun 2015 22:40:15 +0000 (10:40 +1200)]
phpcs fixes
Dave Greenberg [Mon, 22 Jun 2015 18:17:13 +0000 (11:17 -0700)]
Merge pull request #6062 from eileenmcnaughton/CRM-16417-46
CRM-16417 add failed payment activity type
Olaf Buddenhagen [Sat, 20 Jun 2015 22:49:12 +0000 (00:49 +0200)]
Fix CRM_Utils_PDF_Utils::_html2pdf_dompdf() when invoked more than once
Constants are like functions: they are always global; and they cannot
be redefined. Thus, move the defines to a context that doesn't get
re-evaluated on each invocation.
colemanw [Sat, 20 Jun 2015 18:20:11 +0000 (14:20 -0400)]
Merge pull request #6063 from colemanw/editable
Fix caching of multi-custom options
Coleman Watts [Sat, 20 Jun 2015 18:06:22 +0000 (14:06 -0400)]
Fix caching of multi-custom options
Eileen McNaughton [Sat, 20 Jun 2015 08:54:00 +0000 (20:54 +1200)]
CRM-16417 add failed payment activity type
colemanw [Fri, 19 Jun 2015 18:29:40 +0000 (14:29 -0400)]
Merge pull request #5961 from colemanw/CRM-16577
CRM-16577 - Clear caches more thoroughly from UpdateConfigBackend
colemanw [Fri, 19 Jun 2015 16:36:00 +0000 (12:36 -0400)]
Merge pull request #5962 from colemanw/CRM-16556
CRM-16556 - Clear caches more thoroughly from config->cleanupCaches
colemanw [Fri, 19 Jun 2015 01:58:19 +0000 (21:58 -0400)]
Merge pull request #5998 from seamuslee001/CRM-16600-4.6
Crm 16600 4.6
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.
Dave Greenberg [Wed, 17 Jun 2015 23:29:05 +0000 (16:29 -0700)]
Merge pull request #6048 from davecivicrm/CRM-16708
CRM-16708 - Fix link from event/info configure menu to Schedule Remin…
Dave Greenberg [Wed, 17 Jun 2015 23:28:46 +0000 (16:28 -0700)]
Merge pull request #6047 from davecivicrm/CRM-16700
CRM-16700 - Fix notice on Print PDF Letters from search task.
CiviCRM [Wed, 17 Jun 2015 20:16:20 +0000 (13:16 -0700)]
Update version to 4.6.5
Dave Greenberg [Wed, 17 Jun 2015 18:36:48 +0000 (11:36 -0700)]
CRM-16708 - Fix link from event/info configure menu to Schedule Reminders.
----------------------------------------
* CRM-16708: Link from Event Info page "Configure" menu to Schedule Reminders is incorrect
https://issues.civicrm.org/jira/browse/CRM-16708
Dave Greenberg [Wed, 17 Jun 2015 18:13:30 +0000 (11:13 -0700)]
CRM-16700 - Fix notice on Print PDF Letters from search task.
----------------------------------------
* CRM-16700: Notice pdfformat when creating pdf letters
https://issues.civicrm.org/jira/browse/CRM-16700
Dave Greenberg [Tue, 16 Jun 2015 17:50:28 +0000 (10:50 -0700)]
Merge pull request #6033 from monishdeb/4.6
CRM-16398 fix - Block editing of recurring contribution total when mo…
Monish Deb [Tue, 16 Jun 2015 14:12:34 +0000 (19:42 +0530)]
Merge pull request #6035 from sudhabisht/CRM-16694
Fix for change selection edit field issue
Sudha Bisht [Tue, 16 Jun 2015 13:35:59 +0000 (19:05 +0530)]
Fix for change selection edit field issue
monishdeb [Tue, 16 Jun 2015 12:59:16 +0000 (18:29 +0530)]
CRM-16398 fix - Block editing of recurring contribution total when more than one line item exists
https://issues.civicrm.org/jira/browse/CRM-16398
Monish Deb [Tue, 16 Jun 2015 09:31:53 +0000 (15:01 +0530)]
Merge pull request #6030 from monishdeb/4.6
CRM-16611 fix - Fatal error on batch processing membership when Payme…
Monish Deb [Tue, 16 Jun 2015 07:39:57 +0000 (13:09 +0530)]
Merge pull request #6023 from rohankatkar/CRM-16636
CRM-16636 duplicate primary addresses causes error in report
monishdeb [Tue, 16 Jun 2015 07:19:39 +0000 (12:49 +0530)]
CRM-16611 fix - Fatal error on batch processing membership when Payment status = Pending
https://issues.civicrm.org/jira/browse/CRM-16611
Web Access [Tue, 16 Jun 2015 05:10:27 +0000 (10:40 +0530)]
minor changes
Web Access [Tue, 16 Jun 2015 05:07:39 +0000 (10:37 +0530)]
Minor fixes for CRM-16636
colemanw [Tue, 16 Jun 2015 00:30:40 +0000 (20:30 -0400)]
Merge pull request #6025 from colemanw/caseManager
Fix missing case manager in sample case type
Dave Greenberg [Mon, 15 Jun 2015 23:20:26 +0000 (16:20 -0700)]
Merge pull request #6024 from davecivicrm/CRM-15775
CRM-15775 - upgrade logic to fix uf.group_type on on_behalf_organizat…
Eileen McNaughton [Mon, 15 Jun 2015 21:47:45 +0000 (09:47 +1200)]
Merge pull request #6027 from eileenmcnaughton/CRM-16682-46
CRM-16682 add price-set-1 region
Eileen McNaughton [Mon, 15 Jun 2015 21:46:23 +0000 (09:46 +1200)]
Merge pull request #6026 from civicrm/revert-6018-CRM-16682-46
Revert "CRM-16682 add price-set region & placement option"
Eileen McNaughton [Mon, 15 Jun 2015 21:45:39 +0000 (09:45 +1200)]
Revert "CRM-16682 add price-set region & placement option"
Eileen McNaughton [Mon, 15 Jun 2015 21:43:47 +0000 (09:43 +1200)]
CRM-16682 add price-set-1 region
Coleman Watts [Mon, 15 Jun 2015 21:42:51 +0000 (17:42 -0400)]
Fix missing case manager in sample case type
colemanw [Mon, 15 Jun 2015 21:14:53 +0000 (17:14 -0400)]
Merge pull request #6018 from eileenmcnaughton/CRM-16682-46
CRM-16682 add price-set region & placement option
Dave Greenberg [Mon, 15 Jun 2015 20:35:59 +0000 (13:35 -0700)]
CRM-15775 - upgrade logic to fix uf.group_type on on_behalf_organization for 4.4 and older upgraded sites
----------------------------------------
* CRM-15775: core profile "On Behalf Of Organization" has invalid settings.
https://issues.civicrm.org/jira/browse/CRM-15775
Dave Greenberg [Mon, 15 Jun 2015 18:48:44 +0000 (11:48 -0700)]
Merge pull request #5910 from eileenmcnaughton/CRM-16573
CRM-16573 Back office supress back office cvn
Dave Greenberg [Mon, 15 Jun 2015 18:29:17 +0000 (11:29 -0700)]
Merge pull request #6017 from eileenmcnaughton/CRM-16680-46
CRM-16680 prevent overriding existing payment amount
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.
Web Access [Mon, 15 Jun 2015 14:26:48 +0000 (19:56 +0530)]
CRM-16636 duplicate primary addresses causes error in report
Eileen McNaughton [Mon, 15 Jun 2015 02:24:50 +0000 (14:24 +1200)]
add price-set region & placement option
Eileen McNaughton [Mon, 15 Jun 2015 06:00:54 +0000 (18:00 +1200)]
CRM-16680 prevent overriding existing payment amount
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_*
Seamus Lee [Fri, 12 Jun 2015 00:18:04 +0000 (00:18 +0000)]
Remove the call to list smart groups as no longer needed
Seamus Lee [Fri, 12 Jun 2015 00:00:26 +0000 (00:00 +0000)]
CRM-16600 Include Smart Groups in unsubscribe group select
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
projects / civicrm-core.git / log