Tim Otten [Fri, 30 Aug 2013 20:34:07 +0000 (13:34 -0700)]
Revert "Added missing menu row in edit profile"
This reverts commit
a6bf231033983407abd6d60054af559c9bf32d4f.
Kurund Jalmi [Fri, 30 Aug 2013 18:39:41 +0000 (11:39 -0700)]
Merge pull request #1554 from ravishnair/webtest-fix
-- webtest fix
Ravish Nair [Fri, 30 Aug 2013 14:03:39 +0000 (19:33 +0530)]
-- webtest fix
Kurund Jalmi [Fri, 30 Aug 2013 12:43:43 +0000 (05:43 -0700)]
Merge pull request #1553 from ravishnair/webtest-fix
Webtest fixes
Kurund Jalmi [Fri, 30 Aug 2013 11:49:56 +0000 (04:49 -0700)]
Merge pull request #1550 from yashodha/webtest-fixes
Import webtest fix
Kurund Jalmi [Fri, 30 Aug 2013 11:46:53 +0000 (04:46 -0700)]
Merge pull request #1552 from kurund/CRM-12638
CRM-12638, prev/next optimization issues
kurund [Fri, 30 Aug 2013 11:45:58 +0000 (17:15 +0530)]
CRM-12638, fatal error fixes due to
66ceb5d9
----------------------------------------
* CRM-12638: Optimize Prev/Next Cache and search interaction
http://issues.civicrm.org/jira/browse/CRM-12638
Ravish Nair [Fri, 30 Aug 2013 11:28:13 +0000 (16:58 +0530)]
-- petition webtest fix
kurund [Fri, 30 Aug 2013 11:19:45 +0000 (16:49 +0530)]
code cleanup
kurund [Fri, 30 Aug 2013 11:19:07 +0000 (16:49 +0530)]
code cleanup
Ravish Nair [Fri, 30 Aug 2013 11:11:33 +0000 (16:41 +0530)]
-- webtest fix
deepak-srivastava [Fri, 30 Aug 2013 10:15:34 +0000 (03:15 -0700)]
Merge pull request #1551 from deepak-srivastava/master
CRM-12399, remove twilio ext from core.
Deepak Srivastava [Fri, 30 Aug 2013 10:13:17 +0000 (15:43 +0530)]
CRM-12399, remove twilio ext from core.
Kurund Jalmi [Fri, 30 Aug 2013 10:06:14 +0000 (03:06 -0700)]
Merge pull request #1549 from pratik-joshi/crm-mailing-boa-query-test-fixes
added civicrm_mailing_recipients entries
yashodha [Fri, 30 Aug 2013 10:04:36 +0000 (15:34 +0530)]
Import webbtest fix
Kurund Jalmi [Fri, 30 Aug 2013 09:16:57 +0000 (02:16 -0700)]
Merge pull request #1546 from yashodha/webtest-fixes
fix webtest
Kurund Jalmi [Fri, 30 Aug 2013 09:12:17 +0000 (02:12 -0700)]
Merge pull request #1548 from kurund/CRM-13066
CRM-13066, move alter to php from template
kurund [Fri, 30 Aug 2013 08:58:31 +0000 (14:28 +0530)]
CRM-13066, move alter to php from template
----------------------------------------
* CRM-13066: 'Clean up Caches' deletes in progress batches
http://issues.civicrm.org/jira/browse/CRM-13066
Pratik Joshi [Fri, 30 Aug 2013 08:58:24 +0000 (14:28 +0530)]
added civicrm_mailing_recipients entries
Kurund Jalmi [Fri, 30 Aug 2013 08:53:19 +0000 (01:53 -0700)]
Merge pull request #1545 from kurund/CRM-13066
CRM-13066, move data from civicrm_cache to civicrm_batch during upgrade
Kurund Jalmi [Fri, 30 Aug 2013 08:41:12 +0000 (01:41 -0700)]
Merge pull request #1547 from kurund/CRM-9493
Revert "Merge pull request #1544 from eileenmcnaughton/master"
kurund [Fri, 30 Aug 2013 08:39:49 +0000 (14:09 +0530)]
Revert "Merge pull request #1544 from eileenmcnaughton/master"
This reverts commit
008240e2a4a0a3957d58c891604656a679fbf0c6, reversing
changes made to
f1951871b75764859fd45e23aff8933bf955de36.
yashodha [Fri, 30 Aug 2013 06:31:33 +0000 (12:01 +0530)]
fix webtest
kurund [Fri, 30 Aug 2013 06:21:56 +0000 (11:51 +0530)]
CRM-13066, minor cleanup
----------------------------------------
* CRM-13066: 'Clean up Caches' deletes in progress batches
http://issues.civicrm.org/jira/browse/CRM-13066
kurund [Fri, 30 Aug 2013 06:20:01 +0000 (11:50 +0530)]
CRM-13066, move data from civicrm_cache to civicrm_batch table
----------------------------------------
* CRM-13066: 'Clean up Caches' deletes in progress batches
http://issues.civicrm.org/jira/browse/CRM-13066
Kurund Jalmi [Fri, 30 Aug 2013 04:37:11 +0000 (21:37 -0700)]
Merge pull request #1544 from eileenmcnaughton/master
CRM-9493 - fix for group contact cache hanging.
eileen [Thu, 29 Aug 2013 05:29:33 +0000 (17:29 +1200)]
changes to group contact cache behaviour that worked on AUG to fix performance bottleneck
Conflicts:
CRM/Contact/BAO/GroupContactCache.php
eileen [Fri, 30 Aug 2013 02:20:33 +0000 (14:20 +1200)]
CRM-13234 make profile.submit transactional
Dave Greenberg [Thu, 29 Aug 2013 22:08:40 +0000 (15:08 -0700)]
Merge pull request #1543 from kurund/CRM-13066
CRM-13066, cache batch entry data in civicrm_batch table in "data" column
kurund [Thu, 29 Aug 2013 13:43:26 +0000 (19:13 +0530)]
CRM-13066, code cleanup
----------------------------------------
* CRM-13066: 'Clean up Caches' deletes in progress batches
http://issues.civicrm.org/jira/browse/CRM-13066
Kurund Jalmi [Thu, 29 Aug 2013 13:36:24 +0000 (06:36 -0700)]
Merge pull request #1542 from monishdeb/CRM-13292
CRM-13292 fix
kurund [Thu, 29 Aug 2013 13:35:08 +0000 (19:05 +0530)]
CRM-13066, code cleanup
----------------------------------------
* CRM-13066: 'Clean up Caches' deletes in progress batches
http://issues.civicrm.org/jira/browse/CRM-13066
monishdeb [Thu, 29 Aug 2013 13:34:21 +0000 (19:04 +0530)]
CRM-13292 fix
----------------------------------------
* CRM-13292: wkhtmltopdf setting should allow use of xvfb-run
http://issues.civicrm.org/jira/browse/CRM-13292
deepak-srivastava [Thu, 29 Aug 2013 13:30:47 +0000 (06:30 -0700)]
Merge pull request #1541 from deepak-srivastava/reports
CRM-13193
kurund [Thu, 29 Aug 2013 13:25:34 +0000 (18:55 +0530)]
CRM-13066, update the code accord to schema changes
----------------------------------------
* CRM-13066: 'Clean up Caches' deletes in progress batches
http://issues.civicrm.org/jira/browse/CRM-13066
kurund [Thu, 29 Aug 2013 13:00:15 +0000 (18:30 +0530)]
CRM-13066, db structure and upgrade changes
----------------------------------------
* CRM-13066: 'Clean up Caches' deletes in progress batches
http://issues.civicrm.org/jira/browse/CRM-13066
Kurund Jalmi [Thu, 29 Aug 2013 12:04:26 +0000 (05:04 -0700)]
Merge pull request #1540 from kurund/notices-fixes
notice fixes
kurund [Thu, 29 Aug 2013 12:03:41 +0000 (17:33 +0530)]
notice fixes
Kurund Jalmi [Thu, 29 Aug 2013 09:57:06 +0000 (02:57 -0700)]
Merge pull request #1539 from yashodha/priceset-fixes
fixed check for event Full
yashodha [Thu, 29 Aug 2013 09:56:24 +0000 (15:26 +0530)]
fixed check for event Full
Kurund Jalmi [Thu, 29 Aug 2013 09:47:15 +0000 (02:47 -0700)]
Merge pull request #1538 from monishdeb/CRM-13309
CRM-13309 fix
monishdeb [Thu, 29 Aug 2013 09:37:19 +0000 (15:07 +0530)]
CRM-13309 fix
----------------------------------------
* CRM-13309: Participant Role on Event's Schedule Reminder form does not populate
http://issues.civicrm.org/jira/browse/CRM-13309
Kurund Jalmi [Thu, 29 Aug 2013 09:33:18 +0000 (02:33 -0700)]
Merge pull request #1533 from dlobo/CRM-13307
CRM-13307
Kurund Jalmi [Thu, 29 Aug 2013 09:32:40 +0000 (02:32 -0700)]
Merge pull request #1537 from pratik-joshi/CRM-13248
CRM-13248 fix
Kurund Jalmi [Thu, 29 Aug 2013 09:27:02 +0000 (02:27 -0700)]
Merge pull request #1535 from yashodha/CRM-13291
patched CRM-13291
Kurund Jalmi [Thu, 29 Aug 2013 09:26:43 +0000 (02:26 -0700)]
Merge pull request #1536 from yashodha/priceset-fixes
fix the references PriceFieldValue BAO
Pratik Joshi [Thu, 29 Aug 2013 07:27:32 +0000 (12:57 +0530)]
CRM-13248 fix
yashodha [Thu, 29 Aug 2013 07:06:24 +0000 (12:36 +0530)]
fix the references PriceFieldValue BAO
Deepak Srivastava [Thu, 29 Aug 2013 06:57:41 +0000 (12:27 +0530)]
CRM-13193
yashodha [Thu, 29 Aug 2013 05:31:07 +0000 (11:01 +0530)]
patched CRM-13291
Donald A. Lobo [Wed, 28 Aug 2013 21:06:02 +0000 (14:06 -0700)]
CRM-13307
----------------------------------------
* CRM-13307: allow for additional fonts to be used when making mailing labels
http://issues.civicrm.org/jira/browse/CRM-13307
Coleman Watts [Wed, 28 Aug 2013 19:29:18 +0000 (15:29 -0400)]
Update version
kurund [Wed, 28 Aug 2013 14:56:49 +0000 (20:26 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-28-20-20-34
Conflicts:
sql/civicrm_generated.mysql
tests/phpunit/WebTest/Contact/RelationshipAddTest.php
Kurund Jalmi [Wed, 28 Aug 2013 14:36:44 +0000 (07:36 -0700)]
Merge pull request #1465 from colemanw/CRM-12840
DO NOT MERGE patch for CRM-12840 by Jamie McClelland
Kurund Jalmi [Wed, 28 Aug 2013 14:33:46 +0000 (07:33 -0700)]
Merge pull request #1520 from kurund/CRM-13282
CRM-13282, fixed state default for membership billing block and code cle...
Kurund Jalmi [Wed, 28 Aug 2013 14:31:17 +0000 (07:31 -0700)]
Merge pull request #1522 from pratik-joshi/CRM-13026-handling-of-showing-scheduled-recipients-as-well
CRM-13026 : handling of showing scheduled recipients as well, also added a new filter for mailing job status
Kurund Jalmi [Wed, 28 Aug 2013 14:30:59 +0000 (07:30 -0700)]
Merge pull request #1523 from kurund/CRM-13209
CRM-13209, image url should not be required if already set
Kurund Jalmi [Wed, 28 Aug 2013 14:30:35 +0000 (07:30 -0700)]
Merge pull request #1525 from totten/master-defaults-regressions
api_v3_MessageTemplatesTest - Fix regression
Kurund Jalmi [Wed, 28 Aug 2013 14:29:40 +0000 (07:29 -0700)]
Merge pull request #1528 from eileenmcnaughton/master
CRM-13284 fix empty billing profile for autofill
Kurund Jalmi [Wed, 28 Aug 2013 14:28:33 +0000 (07:28 -0700)]
Merge pull request #1531 from yashodha/forum
rename Job DAO to MailingJob
Kurund Jalmi [Wed, 28 Aug 2013 14:27:45 +0000 (07:27 -0700)]
Merge pull request #1532 from yashodha/CRM-13290
patch for CRM-13290
yashodha [Wed, 28 Aug 2013 14:14:38 +0000 (19:44 +0530)]
patch for CRM-13290
yashodha [Wed, 28 Aug 2013 13:48:24 +0000 (19:18 +0530)]
rename Job DAO to MailingJob
Kurund Jalmi [Wed, 28 Aug 2013 13:42:54 +0000 (06:42 -0700)]
Merge pull request #1521 from yashodha/4.4.CRM-13212
more fixes for CRM-13212
Tim Otten [Wed, 28 Aug 2013 13:03:38 +0000 (06:03 -0700)]
Merge pull request #1530 from vivekarora/CRM-13114-Fixed
CRM-13114 - Added missing menu row in edit profile
vivekarora [Wed, 28 Aug 2013 12:39:29 +0000 (18:09 +0530)]
Added missing menu row in edit profile
deepak-srivastava [Wed, 28 Aug 2013 11:12:43 +0000 (04:12 -0700)]
Merge pull request #1529 from deepak-srivastava/reports
CRM-13263 - notice fix, CRM-13125 - url filter support for type float
Deepak Srivastava [Wed, 28 Aug 2013 10:53:08 +0000 (16:23 +0530)]
CRM-13125 - url filter support for type float
Deepak Srivastava [Wed, 28 Aug 2013 10:50:37 +0000 (16:20 +0530)]
Merge branch 'master' into reports
eileen [Wed, 28 Aug 2013 09:23:31 +0000 (21:23 +1200)]
CRM-13284 fix autofill for event page for anon users
eileen [Wed, 28 Aug 2013 09:12:59 +0000 (21:12 +1200)]
CRM-13284 fix empty billing profile for autofill
Tim Otten [Wed, 28 Aug 2013 06:30:14 +0000 (23:30 -0700)]
Merge pull request #1527 from eileenmcnaughton/master
fix git code mgmt mistake
eileen [Wed, 28 Aug 2013 06:21:02 +0000 (18:21 +1200)]
fix git code mgmt mistake
Tim Otten [Wed, 28 Aug 2013 04:58:50 +0000 (21:58 -0700)]
Merge pull request #1526 from eileenmcnaughton/master
CRM-13294 - extra fix + test fix
eileen [Wed, 28 Aug 2013 03:40:11 +0000 (15:40 +1200)]
test fix on api_v3_ContributionTest.testCompleteTransaction api_v3_ContributionTest.testCompleteTransaction
eileen [Wed, 28 Aug 2013 04:13:28 +0000 (16:13 +1200)]
CRM-13294 fix membership to support IN format on contact_id
Conflicts:
tests/phpunit/api/v3/MembershipTest.php
Tim Otten [Wed, 28 Aug 2013 03:35:41 +0000 (20:35 -0700)]
Merge pull request #1505 from sfe-ev/disable_mandatory_tokens
Add config setting to disable mandatory tokens check in mailings
Olaf Buddenhagen [Sat, 24 Aug 2013 03:38:27 +0000 (05:38 +0200)]
Add config setting to disable mandatory tokens check in mailings
As per a previous discussion (with Lobo IIRC), add a configuration
setting to disable the check for presence of mandatory tokens when
sending mailings.
This setting is implemented as a negative option, i.e. ticking the
option disables the check. We could also reverse the logic, so that
ticking the option enables the check instead; and set it to on by
default... Not sure which is preferable -- I guess that's mostly a
matter of taste.
Tim Otten [Wed, 28 Aug 2013 01:00:16 +0000 (18:00 -0700)]
api_v3_MessageTemplatesTest - Fix regression
Note that the test called createTestObject() (once in setup(), once in the
testGet()) but expected only one object to get created. This doesn't make
sense to me -- sounds more like a bug.
Tim Otten [Tue, 27 Aug 2013 23:56:40 +0000 (16:56 -0700)]
Merge pull request #1524 from totten/master-contactget-in
CRM-13294 - Support for array style input on id for contact.get (resubmit)
eileen [Tue, 27 Aug 2013 07:27:52 +0000 (19:27 +1200)]
CRM-13294 test to see if membership.get accepts arrays for 'id' (it does - not changes made
eileen [Tue, 27 Aug 2013 07:24:28 +0000 (19:24 +1200)]
CRM-13294 tweaks to comments & code readability
eileen [Tue, 27 Aug 2013 02:20:14 +0000 (14:20 +1200)]
Add test for exising is_deceased behaviour on contact.get
eileen [Tue, 27 Aug 2013 02:19:29 +0000 (14:19 +1200)]
CRM-13294 support for api style array of ids as a param for contact_get
Kurund Jalmi [Tue, 27 Aug 2013 20:40:43 +0000 (13:40 -0700)]
Merge pull request #1519 from kurund/CRM-12638
CRM-12638, prev/next optimization issues
kurund [Tue, 27 Aug 2013 20:10:10 +0000 (01:40 +0530)]
CRM-13209, image url should not be required if already set
----------------------------------------
* CRM-13209: Mandatory custom fields, on edit, always require a new upload (regression)
http://issues.civicrm.org/jira/browse/CRM-13209
Pratik Joshi [Tue, 27 Aug 2013 13:32:29 +0000 (19:02 +0530)]
CRM-13026-handling-of-showing-scheduled-recipients-as-well, also added a new filter for mailing job status
Deepak Srivastava [Tue, 27 Aug 2013 13:12:22 +0000 (18:42 +0530)]
CRM-13263
yashodha [Tue, 27 Aug 2013 12:54:23 +0000 (18:24 +0530)]
more fixes for CRM-13212
kurund [Tue, 27 Aug 2013 12:27:45 +0000 (17:57 +0530)]
CRM-13282, fixed state default for membership billing block and code cleanup for offline event registration via CC
----------------------------------------
* CRM-13282: Prefill billing address on back-office contribution via credit card and membership via credit card using profile.get api
http://issues.civicrm.org/jira/browse/CRM-13282
Kurund Jalmi [Tue, 27 Aug 2013 12:00:58 +0000 (05:00 -0700)]
Merge pull request #1504 from davecivicrm/CRM-13282
CRM-13282
kurund [Tue, 27 Aug 2013 09:25:43 +0000 (14:55 +0530)]
CRM-12638, fixed group status
----------------------------------------
* CRM-12638: Optimize Prev/Next Cache and search interaction
http://issues.civicrm.org/jira/browse/CRM-12638
kurund [Tue, 27 Aug 2013 09:05:13 +0000 (14:35 +0530)]
CRM-12638, use query instead of cache table if 'select all' option is uses
----------------------------------------
* CRM-12638: Optimize Prev/Next Cache and search interaction
http://issues.civicrm.org/jira/browse/CRM-12638
Kurund Jalmi [Tue, 27 Aug 2013 08:05:08 +0000 (01:05 -0700)]
Merge pull request #1518 from yashodha/activity-restructure-fixes
fix for activity restructure
yashodha [Tue, 27 Aug 2013 07:59:19 +0000 (13:29 +0530)]
fix for activity restructure
Kurund Jalmi [Tue, 27 Aug 2013 06:44:31 +0000 (23:44 -0700)]
Merge pull request #1515 from pdelbar/fixgencode
Modified dao.tpl to fix Gencode's DAO generation
Kurund Jalmi [Tue, 27 Aug 2013 06:43:37 +0000 (23:43 -0700)]
Merge pull request #1514 from dlobo/CRM-12466
CRM-12466
Tim Otten [Mon, 26 Aug 2013 19:50:42 +0000 (12:50 -0700)]
Merge pull request #1510 from ravishnair/CRM-13250
-- CRM-13012 changes as per comment in the issue
Paul Delbar [Mon, 26 Aug 2013 18:42:26 +0000 (20:42 +0200)]
Modified dao.tpl to fix Gencode's DAOP generation
GenCode was creating bad default values if the default xas not
surrounded by a string delimiter (CRM-13289)
Donald A. Lobo [Mon, 26 Aug 2013 17:15:46 +0000 (10:15 -0700)]
CRM-12466
----------------------------------------
* CRM-12466: Group listings don't load
http://issues.civicrm.org/jira/browse/CRM-12466
projects / civicrm-core.git / log