unknown [Fri, 5 Sep 2014 14:53:57 +0000 (15:53 +0100)]
Ajax validation where ocurrences should not be more than 30, help text for help icons
unknown [Fri, 5 Sep 2014 11:47:12 +0000 (12:47 +0100)]
validation on ajax request-show error in dialog, setdefaults correction and moved the function to BAO/RecurringEntity
unknown [Thu, 4 Sep 2014 17:42:48 +0000 (18:42 +0100)]
Update cascade type for all the events option
unknown [Thu, 4 Sep 2014 17:17:04 +0000 (18:17 +0100)]
Allow submit for cascade type popup box
priyankakaran26 [Thu, 4 Sep 2014 17:05:01 +0000 (18:05 +0100)]
cascade update based on mode / cascade-type
unknown [Thu, 4 Sep 2014 16:35:39 +0000 (17:35 +0100)]
Redirection correction to advanced search
priyankakaran26 [Thu, 4 Sep 2014 14:58:04 +0000 (15:58 +0100)]
fix ajax errors for diff php ver
unknown [Thu, 4 Sep 2014 13:59:28 +0000 (14:59 +0100)]
Highlight repeat tab event details page, removed unwanted code from recurringentity, removed loading image from preview confirmbox
priyankakaran26 [Thu, 4 Sep 2014 11:49:52 +0000 (12:49 +0100)]
parent / child indication on manage events page
priyankakaran26 [Thu, 4 Sep 2014 11:32:11 +0000 (12:32 +0100)]
recurring form template
unknown [Thu, 4 Sep 2014 11:06:20 +0000 (12:06 +0100)]
added default to cascade_type in recurring_entiy table
unknown [Thu, 4 Sep 2014 10:41:45 +0000 (11:41 +0100)]
DAO changes
priyankakaran26 [Wed, 3 Sep 2014 21:13:51 +0000 (22:13 +0100)]
event recurring patch for v4.6
kurund [Thu, 2 Oct 2014 09:35:36 +0000 (10:35 +0100)]
Merge branch 'master' of github.com:webaccess/civicrm-core into sales-tax
Conflicts:
api/v3/Contribution.php
Tim Otten [Thu, 2 Oct 2014 06:54:01 +0000 (07:54 +0100)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-02-07-53-58
kurund [Thu, 2 Oct 2014 00:15:56 +0000 (05:45 +0530)]
fixed the version, generated data and version for new fields
Kurund Jalmi [Wed, 1 Oct 2014 22:12:27 +0000 (23:12 +0100)]
Merge pull request #72 from dpradeep/upgrade-handling
Migrated update code from 4.5.beta5 to 4.6.alpha1
Tim Otten [Wed, 1 Oct 2014 18:08:27 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-10-01-19-08-00
Tim Otten [Wed, 1 Oct 2014 16:55:24 +0000 (17:55 +0100)]
Merge pull request #4288 from totten/4.4-setupsh-port
setup.sh - Fix support mysqld on alternative ports
Tim Otten [Wed, 1 Oct 2014 16:20:37 +0000 (17:20 +0100)]
setup.sh - Fix support mysqld on alternative ports
Kurund Jalmi [Wed, 1 Oct 2014 14:15:14 +0000 (15:15 +0100)]
Merge pull request #4285 from jitendrapurohit/CRM-15396
CRM-15396
Tim Otten [Wed, 1 Oct 2014 13:02:28 +0000 (14:02 +0100)]
Merge pull request #4286 from totten/4.5-entity-ref-bc
CRM-15198 - EntityReference - Provide backward compatibility with CiviVolunteer's DAOs
Tim Otten [Wed, 1 Oct 2014 11:24:18 +0000 (12:24 +0100)]
CRM-15198 - EntityReference - Provide backward compatibility with CiviVolunteer's DAOs
jitendrapurohit [Wed, 1 Oct 2014 10:04:31 +0000 (15:34 +0530)]
CRM-15396
Kurund Jalmi [Wed, 1 Oct 2014 09:39:58 +0000 (10:39 +0100)]
Merge pull request #4280 from mrpaulc/CRM-15383
CRM-15383 - fix template loading for PDF letter
Coleman Watts [Wed, 1 Oct 2014 01:09:33 +0000 (21:09 -0400)]
Webtest fixes
Kurund Jalmi [Wed, 1 Oct 2014 00:12:56 +0000 (01:12 +0100)]
Merge pull request #4246 from crusonweb/CRM-15310
CRM-15310
Kurund Jalmi [Wed, 1 Oct 2014 00:02:11 +0000 (01:02 +0100)]
Merge pull request #4277 from rohankatkar/webtest_4.5.0
Webtest fix
Dave Greenberg [Tue, 30 Sep 2014 23:08:21 +0000 (16:08 -0700)]
Merge pull request #4281 from colemanw/CRM-15394
CRM-15394 - Fix credit card contribution link
Dave Greenberg [Tue, 30 Sep 2014 22:36:41 +0000 (15:36 -0700)]
Merge pull request #4283 from davecivicrm/CRM-15380
CRM-15380 - Replaces PR 4273.
Dave Greenberg [Tue, 30 Sep 2014 22:33:19 +0000 (15:33 -0700)]
CRM-15380 - Replaces PR 4273.
----------------------------------------
* CRM-15380:
https://issues.civicrm.org/jira/browse/CRM-15380
Dave Greenberg [Tue, 30 Sep 2014 20:11:18 +0000 (13:11 -0700)]
Merge pull request #4271 from JohnFF/patch-1
Say which extension being operated on
Coleman Watts [Tue, 30 Sep 2014 19:37:44 +0000 (15:37 -0400)]
CRM-15394 - Fix credit card contribution link
colemanw [Tue, 30 Sep 2014 17:44:47 +0000 (13:44 -0400)]
Merge pull request #4275 from mrpaulc/CRM-15389
CRM-15389 - js error in communication prefs
Tim Otten [Tue, 30 Sep 2014 15:43:22 +0000 (16:43 +0100)]
Merge pull request #4279 from totten/monishdeb-CRM-15343
CRM-15343 - CiviCase - Fix corruption of soft FKs (case-type-id)
Paul Campbell [Tue, 30 Sep 2014 15:41:06 +0000 (16:41 +0100)]
CRM-15383 - fix template loading for PDF letter
----------------------------------------
* CRM-15383: Can't load template when creating PDF letter
https://issues.civicrm.org/jira/browse/CRM-15383
dpradeep [Tue, 30 Sep 2014 14:34:25 +0000 (20:04 +0530)]
Migrated update code from 4.5.beta5 to 4.6.alpha1
Kurund Jalmi [Tue, 30 Sep 2014 13:59:31 +0000 (14:59 +0100)]
Merge pull request #4278 from pradpnayak/CRM-15391
--CRM-15391, Fixed typo error
Tim Otten [Tue, 30 Sep 2014 13:38:31 +0000 (14:38 +0100)]
Upgrade...FourFive.php - Tweak message
Tim Otten [Tue, 30 Sep 2014 13:38:15 +0000 (14:38 +0100)]
sql/4.5.alpha1.mysql.tpl - Fix syntax error
Pradeep Nayak [Tue, 30 Sep 2014 13:09:33 +0000 (18:39 +0530)]
--CRM-15391, Fixed typo error
Rohan Katkar [Tue, 30 Sep 2014 12:35:09 +0000 (18:05 +0530)]
Webtest fix
Yashodha Chaku [Tue, 30 Sep 2014 12:27:57 +0000 (17:57 +0530)]
Merge pull request #4276 from yashodha/CRM-10206
CRM-10206
CiviCRM [Tue, 30 Sep 2014 12:03:36 +0000 (17:33 +0530)]
CRM-10206
Paul Campbell [Tue, 30 Sep 2014 11:27:20 +0000 (12:27 +0100)]
CRM-15389 - js error in communication prefs
----------------------------------------
* CRM-15389: Cannot change contact greetings due to Javascript error
https://issues.civicrm.org/jira/browse/CRM-15389
Kurund Jalmi [Tue, 30 Sep 2014 10:02:31 +0000 (11:02 +0100)]
Merge pull request #71 from dpradeep/merge-
20140930
merging civicrm canonical master into master
Eileen McNaughton [Tue, 30 Sep 2014 09:14:45 +0000 (22:14 +1300)]
Merge pull request #4270 from eileenmcnaughton/CRM-15296-test-harness
CRM-5296 test harness
John E Prescott [Tue, 30 Sep 2014 09:12:59 +0000 (10:12 +0100)]
Say which extension being operated on
This changes the title of the extension form to include the name of the extension being disabled. This makes it clear if users are batch disabling extensions.
Yashodha Chaku [Tue, 30 Sep 2014 08:24:51 +0000 (13:54 +0530)]
Merge pull request #4268 from jitendrapurohit/webtestfixes
ParticipantMaxCountTest fix
eileenmcnaughton [Tue, 30 Sep 2014 07:57:27 +0000 (07:57 +0000)]
CRM-15296 make test committable so we can merge it in prior to merging fix
ie we mark the unfixed bits incomplete
dpradeep [Tue, 30 Sep 2014 07:43:26 +0000 (13:13 +0530)]
Merge remote branch 'canonical/master' into merge-
20140930
Conflicts:
CRM/Event/BAO/Participant.php
CRM/Member/BAO/Membership.php
CRM/Price/BAO/PriceSet.php
sql/civicrm_generated.mysql
templates/CRM/Price/Page/Field.tpl
templates/CRM/Price/Page/Option.tpl
Eileen McNaughton [Tue, 30 Sep 2014 07:35:27 +0000 (20:35 +1300)]
CRM-15296 test updates
Yashodha Chaku [Tue, 30 Sep 2014 07:39:49 +0000 (13:09 +0530)]
Merge pull request #4269 from rohankatkar/webtest_4.5.0
Webtest Fix
Eileen McNaughton [Tue, 30 Sep 2014 06:58:44 +0000 (19:58 +1300)]
Merge pull request #4267 from eileenmcnaughton/CRM-15296-e-notice
CRM-15296 enotice fix
jitendrapurohit [Tue, 30 Sep 2014 06:55:23 +0000 (12:25 +0530)]
ParticipantMaxCountTest fix
Rohan Katkar [Tue, 30 Sep 2014 06:54:19 +0000 (12:24 +0530)]
Webtest Fix
Eileen McNaughton [Tue, 30 Sep 2014 02:59:32 +0000 (15:59 +1300)]
CRM-15296 enotice fix
Eileen McNaughton [Tue, 30 Sep 2014 00:03:47 +0000 (13:03 +1300)]
Merge pull request #4257 from eileenmcnaughton/CRM-15299-master
CRM-15299 stdise behaviour on search (as tested via api)
Dave Greenberg [Mon, 29 Sep 2014 23:41:27 +0000 (16:41 -0700)]
Merge pull request #4266 from davecivicrm/CRM-15387a
CRM-15387 - Add legacy support for honor_contact_id in contribution crea...
Dave Greenberg [Mon, 29 Sep 2014 23:40:41 +0000 (16:40 -0700)]
CRM-15387 - Add legacy support for honor_contact_id in contribution create api, fix legacy support for soft_credit_to so that soft_credit_type is set to default. Add tests for both.
----------------------------------------
* CRM-15387:
https://issues.civicrm.org/jira/browse/CRM-15387
Yashodha Chaku [Mon, 29 Sep 2014 22:26:57 +0000 (03:56 +0530)]
Merge pull request #4261 from rohankatkar/webtest_4.5.0
Webtest fix
colemanw [Mon, 29 Sep 2014 19:46:10 +0000 (15:46 -0400)]
Merge pull request #4264 from colemanw/css_sort
Fix weird color added to some datatables' sort column
Coleman Watts [Mon, 29 Sep 2014 19:44:42 +0000 (15:44 -0400)]
Fix weird color added to some datatables' sort column
Eileen McNaughton [Mon, 29 Sep 2014 19:17:58 +0000 (08:17 +1300)]
Merge pull request #4089 from jaapjansma/CRM-15268
Case update API doesn't return the correct values
colemanw [Mon, 29 Sep 2014 18:46:17 +0000 (14:46 -0400)]
Merge pull request #4263 from colemanw/More
More related data to refresh on contact summary tab
Coleman Watts [Mon, 29 Sep 2014 18:42:49 +0000 (14:42 -0400)]
More related data to refresh on contact summary tab
Dave Greenberg [Mon, 29 Sep 2014 18:11:38 +0000 (11:11 -0700)]
Merge pull request #4262 from JohnFF/master
Minor fix to incorrect HTML
colemanw [Mon, 29 Sep 2014 17:54:20 +0000 (13:54 -0400)]
Merge pull request #4258 from jitendrapurohit/CRM-15368
CRM-15368
John E Prescott [Mon, 29 Sep 2014 16:12:56 +0000 (17:12 +0100)]
Minor fix to incorrect HTML
DOM Class declaration should have closed inverted commas
Tim Otten [Mon, 29 Sep 2014 13:51:44 +0000 (14:51 +0100)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-09-29-14-51-41
Tim Otten [Mon, 29 Sep 2014 13:51:25 +0000 (14:51 +0100)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-29-14-51-22
Tim Otten [Mon, 29 Sep 2014 13:48:31 +0000 (14:48 +0100)]
Merge pull request #4260 from futurefirst/4.4-gencode-fix
Added command-line switches to PHP in setup.sh to provide the DB credentials as defaults for mysql_real_escape_string
Rohan Katkar [Mon, 29 Sep 2014 13:04:29 +0000 (18:34 +0530)]
Webtest fix
kurund [Mon, 29 Sep 2014 12:19:58 +0000 (13:19 +0100)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-09-29-13-19-52
kurund [Mon, 29 Sep 2014 12:17:27 +0000 (13:17 +0100)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-29-13-10-47
Conflicts:
CRM/Core/Payment.php
Kurund Jalmi [Mon, 29 Sep 2014 12:07:10 +0000 (13:07 +0100)]
Merge pull request #70 from dpradeep/fixApiTests
Unit test failure fixes
dpradeep [Mon, 29 Sep 2014 12:12:08 +0000 (17:42 +0530)]
Unit test failure fixes
David Knoll [Mon, 29 Sep 2014 11:51:45 +0000 (12:51 +0100)]
Added command-line switches to PHP in setup.sh to provide the DB credentials as defaults for mysql_real_escape_string
Kurund Jalmi [Mon, 29 Sep 2014 11:38:50 +0000 (12:38 +0100)]
Merge pull request #69 from dpradeep/taxApiTest
create api test for contributions for sales tax
Eileen McNaughton [Mon, 29 Sep 2014 10:18:58 +0000 (23:18 +1300)]
Merge pull request #4071 from eileenmcnaughton/CRM-15259
CRM-15259 use same method to determine whether to show updateBilling lin...
jitendrapurohit [Mon, 29 Sep 2014 09:07:04 +0000 (14:37 +0530)]
is_numeric check on CRM-15368
Eileen McNaughton [Mon, 15 Sep 2014 04:29:02 +0000 (16:29 +1200)]
fix event handling of is_template (now cannot be NULL)
Eileen McNaughton [Mon, 15 Sep 2014 04:26:51 +0000 (16:26 +1200)]
CRM-15299 use buildClause function as often as possible so same params are supported
Eileen McNaughton [Mon, 29 Sep 2014 02:54:11 +0000 (15:54 +1300)]
Merge pull request #4256 from eileenmcnaughton/api-examples
Updated api examples
eileenmcnaughton [Mon, 29 Sep 2014 01:05:21 +0000 (01:05 +0000)]
fix don't document config
eileenmcnaughton [Sun, 28 Sep 2014 23:53:19 +0000 (23:53 +0000)]
updated examples
Eileen McNaughton [Sun, 28 Sep 2014 23:29:13 +0000 (12:29 +1300)]
Merge pull request #4255 from eileenmcnaughton/CRM-15296-unittest
Crm 15296 unittest
eileenmcnaughton [Sun, 28 Sep 2014 22:10:15 +0000 (22:10 +0000)]
CRM-15296 test for behaviour on renew with recurring
CRM-15296 mark incomplete portion of this test as incomplete so as not to commit failing tests
note that the incomplete part can be enabled when th issue is fixed
Alter Dummy processor to be test-friendly
Conflicts:
tests/phpunit/api/v3/ContributionPageTest.php
wq!
Coleman Watts [Sun, 28 Sep 2014 12:10:39 +0000 (08:10 -0400)]
Webtest fixes
Coleman Watts [Sun, 28 Sep 2014 02:28:29 +0000 (22:28 -0400)]
Additional webtest error check
colemanw [Sun, 28 Sep 2014 02:17:09 +0000 (22:17 -0400)]
Merge pull request #4254 from colemanw/checkForErrorsOnPage
Attempt to get better error messages from webtests
Coleman Watts [Sun, 28 Sep 2014 02:15:34 +0000 (22:15 -0400)]
Attempt to get better error messages from webtests
Coleman Watts [Sun, 28 Sep 2014 01:40:47 +0000 (21:40 -0400)]
Webtest cleanup
Coleman Watts [Sun, 28 Sep 2014 01:13:20 +0000 (21:13 -0400)]
Remove old unnecessary hack from upgrade script
colemanw [Sun, 28 Sep 2014 01:08:28 +0000 (21:08 -0400)]
Merge pull request #4253 from civicrm/4.5
Merge branch 4.5 into master
colemanw [Sun, 28 Sep 2014 01:07:17 +0000 (21:07 -0400)]
Merge pull request #4252 from civicrm/4.4
Merge branch 4.4 into 4.5
colemanw [Sun, 28 Sep 2014 01:04:15 +0000 (21:04 -0400)]
Merge pull request #4251 from colemanw/CRM-15156
CRM-15156 - Flush js cache before upgrade
Coleman Watts [Sun, 28 Sep 2014 01:03:45 +0000 (21:03 -0400)]
CRM-15156 - Flush js cache before upgrade
colemanw [Sun, 28 Sep 2014 00:48:53 +0000 (20:48 -0400)]
Merge pull request #4250 from colemanw/CRM-15382
CRM-15382 - Ensure dynamic resources are rebuilt after flushing
Coleman Watts [Sun, 28 Sep 2014 00:26:15 +0000 (20:26 -0400)]
Docblock additions
projects / civicrm-core.git / log