civicrm-core.git
11 years agoCRM-12133 - api/v3/CustomSearch - Fix option_group_id error
CiviCRM [Wed, 20 Mar 2013 12:21:36 +0000 (08:21 -0400)]
CRM-12133 - api/v3/CustomSearch - Fix option_group_id error

11 years agoCRM-12133 per https://github.com/civicrm/civicrm-core/pull/188#discussion_r3442600...
eileen [Thu, 21 Mar 2013 22:56:19 +0000 (11:56 +1300)]
CRM-12133 per https://github.com/civicrm/civicrm-core/pull/188#discussion_r3442600 only set defaults if NULL, NB this is not subject to any unit tests so I have some reservations about changing it from prev behaviour but totten's comment seems reasonable

11 years agofixes to value and weight handling CRM-12133
eileen [Thu, 21 Mar 2013 22:46:51 +0000 (11:46 +1300)]
fixes to value and weight handling CRM-12133

11 years agocomment tweak
eileen [Tue, 19 Mar 2013 20:56:56 +0000 (09:56 +1300)]
comment tweak

11 years agoCRM-12133 option value create value & weight
eileen [Mon, 18 Mar 2013 22:36:43 +0000 (11:36 +1300)]
CRM-12133 option value create value & weight

CRM-12133 fix default handling to be in BAO layer, also add tests on component_id & add to xml

11 years agoMerge pull request #208 from pradpnayak/CRM-12142
Kurund Jalmi [Thu, 21 Mar 2013 17:51:57 +0000 (10:51 -0700)]
Merge pull request #208 from pradpnayak/CRM-12142

-- fixed multi-lingual upgrade script, for CRM-12142

11 years agoMerge pull request #219 from pradpnayak/CRM-12141
Kurund Jalmi [Thu, 21 Mar 2013 17:45:02 +0000 (10:45 -0700)]
Merge pull request #219 from pradpnayak/CRM-12141

--fixed for CRM-12141

11 years agoMerge pull request #220 from kurund/CRM-12155
Kurund Jalmi [Thu, 21 Mar 2013 17:42:07 +0000 (10:42 -0700)]
Merge pull request #220 from kurund/CRM-12155

worked on CRM-12155, delete records from civicrm_financial_item

11 years agoMerge pull request #214 from yashodha/CRM-12014
colemanw [Thu, 21 Mar 2013 17:14:32 +0000 (10:14 -0700)]
Merge pull request #214 from yashodha/CRM-12014

CRM-12014

11 years agoMerge pull request #218 from ravishnair/webtest-fix/improvement
colemanw [Thu, 21 Mar 2013 17:08:36 +0000 (10:08 -0700)]
Merge pull request #218 from ravishnair/webtest-fix/improvement

-- webtest fixes

11 years agoMerge pull request #217 from pratik-joshi/webtest-improvement-fixes
colemanw [Thu, 21 Mar 2013 17:08:27 +0000 (10:08 -0700)]
Merge pull request #217 from pratik-joshi/webtest-improvement-fixes

test fix and improvement

11 years agoMerge pull request #216 from pratik-joshi/webtest-fixes
colemanw [Thu, 21 Mar 2013 17:08:02 +0000 (10:08 -0700)]
Merge pull request #216 from pratik-joshi/webtest-fixes

Webtest fixes

11 years ago--fixed for CRM-12141
Pradeep Nayak [Thu, 21 Mar 2013 15:57:47 +0000 (21:27 +0530)]
--fixed for CRM-12141

11 years agofix for webtest WRT changes done for CRM-12120
Pratik Joshi [Thu, 21 Mar 2013 13:48:28 +0000 (19:18 +0530)]
fix for webtest WRT changes done for CRM-12120

11 years ago-- webtest fixes
Ravish Nair [Thu, 21 Mar 2013 13:24:20 +0000 (18:54 +0530)]
-- webtest fixes

11 years agotest fix and improvement
Pratik Joshi [Thu, 21 Mar 2013 12:31:58 +0000 (18:01 +0530)]
test fix and improvement

11 years agowebtest fix
Pratik Joshi [Thu, 21 Mar 2013 11:54:41 +0000 (17:24 +0530)]
webtest fix

11 years agowebtest fix : fixed broken path building due to wrong argument
Pratik Joshi [Thu, 21 Mar 2013 10:23:30 +0000 (15:53 +0530)]
webtest fix : fixed broken path building due to wrong argument

11 years agowebtest fix : using clickLink for ajax form save results in timeout error as, clickLi...
Pratik Joshi [Thu, 21 Mar 2013 09:52:45 +0000 (15:22 +0530)]
webtest fix : using clickLink for ajax form save results in timeout error as, clickLink waits for page to load which doesn't happen in ajax form save.

11 years agoworked on CRM-12155, delete records from civicrm_financial_item
Kurund Jalmi [Thu, 21 Mar 2013 06:21:42 +0000 (11:51 +0530)]
worked on CRM-12155, delete records from civicrm_financial_item

11 years agoCRM-12014
yashodha [Thu, 21 Mar 2013 05:07:01 +0000 (10:37 +0530)]
CRM-12014

11 years agoMerge pull request #209 from davecivicrm/CRM-12145
colemanw [Thu, 21 Mar 2013 02:26:46 +0000 (19:26 -0700)]
Merge pull request #209 from davecivicrm/CRM-12145

CRM-12145 Updated inline help on membership type form to reflect that me...

11 years agoMerge pull request #213 from dlobo/NoticeFixes
dlobo [Thu, 21 Mar 2013 01:50:43 +0000 (18:50 -0700)]
Merge pull request #213 from dlobo/NoticeFixes

Notice fixes

11 years agofix notices and strict warnings from PHP 5.4 in running webtests
Donald A. Lobo [Thu, 21 Mar 2013 01:34:47 +0000 (18:34 -0700)]
fix notices and strict warnings from PHP 5.4 in running webtests

11 years agofix formatting
Donald A. Lobo [Thu, 21 Mar 2013 00:56:01 +0000 (17:56 -0700)]
fix formatting

11 years agofix strict notices from PHP 5.4
Donald A. Lobo [Wed, 20 Mar 2013 17:49:14 +0000 (10:49 -0700)]
fix strict notices from PHP 5.4

11 years agoMerge pull request #211 from pradpnayak/CRM-12127
Dave Greenberg [Thu, 21 Mar 2013 01:28:08 +0000 (18:28 -0700)]
Merge pull request #211 from pradpnayak/CRM-12127

-- fixed for CRM-12127, for api fixes
-- Pradeep ran the failing tests locally with this fix. I will spot check run a few of the failing tests after merge.

11 years ago-- fixed for CRM-12127, for api fixes
Pradeep Nayak [Thu, 21 Mar 2013 00:58:40 +0000 (06:28 +0530)]
-- fixed for CRM-12127, for api fixes

11 years agoMerge pull request #210 from colemanw/webtest-timing
colemanw [Thu, 21 Mar 2013 00:19:21 +0000 (17:19 -0700)]
Merge pull request #210 from colemanw/webtest-timing

Webtest timing

11 years agoRefactor ad-hoc url parsing to use the new urlArg() method
Coleman Watts [Thu, 21 Mar 2013 00:02:06 +0000 (17:02 -0700)]
Refactor ad-hoc url parsing to use the new urlArg() method

11 years ago-- fixed multi-lingual upgrade script, for CRM-12142
Pradeep Nayak [Wed, 20 Mar 2013 23:49:12 +0000 (05:19 +0530)]
-- fixed multi-lingual upgrade script, for CRM-12142

11 years agoCRM-12145 Updated inline help on membership type form to reflect that membership...
Dave Greenberg [Wed, 20 Mar 2013 23:47:15 +0000 (16:47 -0700)]
CRM-12145 Updated inline help on membership type form to reflect that membership type description is no longer exposed on public facing online contribution pages.

11 years agoChange messages to wait instead of assert
Coleman Watts [Wed, 20 Mar 2013 23:17:38 +0000 (16:17 -0700)]
Change messages to wait instead of assert

11 years agoFix AddressParsingTest
Coleman Watts [Wed, 20 Mar 2013 22:44:03 +0000 (15:44 -0700)]
Fix AddressParsingTest

11 years agoMerge pull request #205 from colemanw/clicklink
colemanw [Wed, 20 Mar 2013 21:26:27 +0000 (14:26 -0700)]
Merge pull request #205 from colemanw/clicklink

Clicklink

11 years agowhitespace cleanup
Coleman Watts [Wed, 20 Mar 2013 21:25:35 +0000 (14:25 -0700)]
whitespace cleanup

11 years agoStart migrating to use clickLink method
Coleman Watts [Wed, 20 Mar 2013 21:12:50 +0000 (14:12 -0700)]
Start migrating to use clickLink method

11 years agoFixed some contribution pages
Coleman Watts [Wed, 20 Mar 2013 20:55:03 +0000 (13:55 -0700)]
Fixed some contribution pages

11 years agoMerge pull request #204 from davecivicrm/CRM-12142
Kurund Jalmi [Wed, 20 Mar 2013 19:13:44 +0000 (12:13 -0700)]
Merge pull request #204 from davecivicrm/CRM-12142

CRM-12142 Need to set default value for new premiums_nothankyou_label co...

11 years agoCRM-12142 Need to set default value for new premiums_nothankyou_label column
Dave Greenberg [Wed, 20 Mar 2013 18:33:58 +0000 (11:33 -0700)]
CRM-12142 Need to set default value for new premiums_nothankyou_label column

11 years agoMerge pull request #203 from mlutfy/CRM-11755
Kurund Jalmi [Wed, 20 Mar 2013 18:11:04 +0000 (11:11 -0700)]
Merge pull request #203 from mlutfy/CRM-11755

CRM-11755 : support option.language for multi-lingual installations.

11 years agoMerge pull request #202 from pratik-joshi/CRM-12153-tag-merge-UI-break-fixes
Kurund Jalmi [Wed, 20 Mar 2013 14:32:29 +0000 (07:32 -0700)]
Merge pull request #202 from pratik-joshi/CRM-12153-tag-merge-UI-break-fixes

minor fix for 'Tag Merge UI break'  found during qa of CRM-12153

11 years agoMerge pull request #197 from pratik-joshi/CRM-12130
Tim Otten [Wed, 20 Mar 2013 13:58:12 +0000 (06:58 -0700)]
Merge pull request #197 from pratik-joshi/CRM-12130

fix for : CRM-12130

11 years agominor fix for CRM-12153 : Tag Merge UI break
Pratik Joshi [Wed, 20 Mar 2013 12:05:58 +0000 (17:35 +0530)]
minor fix for CRM-12153 : Tag Merge UI break

11 years agoMerge pull request #198 from pradpnayak/CRM-12127
Kurund Jalmi [Wed, 20 Mar 2013 09:24:00 +0000 (02:24 -0700)]
Merge pull request #198 from pradpnayak/CRM-12127

-- worked on CRM-12127

11 years agoCRM-12130 adding comment to code for future improvement as suggested by totten in PR
Pratik Joshi [Wed, 20 Mar 2013 07:03:20 +0000 (12:33 +0530)]
CRM-12130 adding comment to code for future improvement as suggested by totten in PR

11 years agoMerge pull request #200 from dlobo/CRM-12151
dlobo [Wed, 20 Mar 2013 02:40:05 +0000 (19:40 -0700)]
Merge pull request #200 from dlobo/CRM-12151

CRM-12151

11 years agoCRM-12151
Donald A. Lobo [Wed, 20 Mar 2013 02:38:11 +0000 (19:38 -0700)]
CRM-12151

11 years agoMerge pull request #199 from colemanw/webtest
Tim Otten [Wed, 20 Mar 2013 00:58:48 +0000 (17:58 -0700)]
Merge pull request #199 from colemanw/webtest

Webtest

11 years agoFix some uses of sleep, comment the rest
Coleman Watts [Wed, 20 Mar 2013 00:40:54 +0000 (17:40 -0700)]
Fix some uses of sleep, comment the rest

11 years ago-- worked on CRM-12127
Pradeep Nayak [Tue, 19 Mar 2013 22:11:13 +0000 (03:41 +0530)]
-- worked on CRM-12127

11 years agoMerge redundant code for mailbox setup to a util fn
Coleman Watts [Tue, 19 Mar 2013 20:39:57 +0000 (13:39 -0700)]
Merge redundant code for mailbox setup to a util fn

11 years agoMass switch to openCiviPage method
Coleman Watts [Tue, 19 Mar 2013 18:50:39 +0000 (11:50 -0700)]
Mass switch to openCiviPage method

11 years agoGlobal webtest cleanup
Coleman Watts [Tue, 19 Mar 2013 05:59:03 +0000 (22:59 -0700)]
Global webtest cleanup

11 years agofix for : CRM-12130
Pratik Joshi [Tue, 19 Mar 2013 16:21:48 +0000 (21:51 +0530)]
fix for : CRM-12130

11 years agoMerge pull request #196 from dlobo/CRM-12151
Kurund Jalmi [Tue, 19 Mar 2013 16:11:09 +0000 (09:11 -0700)]
Merge pull request #196 from dlobo/CRM-12151

CRM-12151

11 years agoMerge pull request #195 from dlobo/CRM-12154
Kurund Jalmi [Tue, 19 Mar 2013 16:09:08 +0000 (09:09 -0700)]
Merge pull request #195 from dlobo/CRM-12154

CRM-12154

11 years agoMerge pull request #194 from yashodha/CRM-12014
Kurund Jalmi [Tue, 19 Mar 2013 16:08:41 +0000 (09:08 -0700)]
Merge pull request #194 from yashodha/CRM-12014

CRM-12014

11 years agoMerge pull request #193 from ravishnair/webtest-improvement
Kurund Jalmi [Tue, 19 Mar 2013 16:08:11 +0000 (09:08 -0700)]
Merge pull request #193 from ravishnair/webtest-improvement

-- webtest fix

11 years agoMerge pull request #192 from lcdservices/master
Kurund Jalmi [Tue, 19 Mar 2013 16:07:47 +0000 (09:07 -0700)]
Merge pull request #192 from lcdservices/master

CRM-12153 work around unique index constraint when merging tags

11 years agoMerge pull request #191 from ravishnair/fix-for-mailingPage-title
Kurund Jalmi [Tue, 19 Mar 2013 16:07:14 +0000 (09:07 -0700)]
Merge pull request #191 from ravishnair/fix-for-mailingPage-title

-- fix for wrong pagetitle getting displayed for mailing pages

11 years agoMerge pull request #190 from pratik-joshi/webtest-cleanup
Kurund Jalmi [Tue, 19 Mar 2013 16:06:41 +0000 (09:06 -0700)]
Merge pull request #190 from pratik-joshi/webtest-cleanup

webtest fix

11 years agoCRM-12151
Donald A. Lobo [Tue, 19 Mar 2013 15:38:24 +0000 (08:38 -0700)]
CRM-12151

11 years agoCRM-12154
Donald A. Lobo [Tue, 19 Mar 2013 14:46:49 +0000 (07:46 -0700)]
CRM-12154

11 years ago-- webtest fix
Ravish Nair [Tue, 19 Mar 2013 14:20:27 +0000 (19:50 +0530)]
-- webtest fix

11 years agoCRM-12014
yashodha [Tue, 19 Mar 2013 14:18:42 +0000 (19:48 +0530)]
CRM-12014

11 years agoCRM-12153 work around unique index constraint when merging tags
Brian Shaughnessy [Tue, 19 Mar 2013 13:50:35 +0000 (09:50 -0400)]
CRM-12153 work around unique index constraint when merging tags

11 years ago-- fix for wrong pagetitle getting displayed for mailing pages
Ravish Nair [Tue, 19 Mar 2013 12:46:02 +0000 (18:16 +0530)]
-- fix for wrong pagetitle getting displayed for mailing pages

11 years agowebtest fix
Pratik Joshi [Tue, 19 Mar 2013 08:50:09 +0000 (14:20 +0530)]
webtest fix

11 years agoMerge pull request #189 from yashodha/issue-9394
Kurund Jalmi [Tue, 19 Mar 2013 08:17:50 +0000 (01:17 -0700)]
Merge pull request #189 from yashodha/issue-9394

Issue 9394

11 years agoMerge pull request #187 from pradpnayak/CRM-12148
Kurund Jalmi [Tue, 19 Mar 2013 05:46:26 +0000 (22:46 -0700)]
Merge pull request #187 from pradpnayak/CRM-12148

--fixed for CRM-12148 and fixed formatting

11 years agoMerge pull request #186 from dlobo/CRM-12147
Tim Otten [Tue, 19 Mar 2013 00:52:40 +0000 (17:52 -0700)]
Merge pull request #186 from dlobo/CRM-12147

CRM-12147

11 years agoCRM-12147
Donald A. Lobo [Tue, 19 Mar 2013 00:46:53 +0000 (17:46 -0700)]
CRM-12147

11 years agoCRM-12147
Donald A. Lobo [Mon, 18 Mar 2013 20:23:54 +0000 (13:23 -0700)]
CRM-12147

11 years ago--fixed for CRM-12148 and fixed formatting
Pradeep Nayak [Mon, 18 Mar 2013 20:43:57 +0000 (02:13 +0530)]
--fixed for CRM-12148 and fixed formatting

11 years agoMerge pull request #185 from eileenmcnaughton/apiUpdateRevert
Tim Otten [Mon, 18 Mar 2013 19:43:29 +0000 (12:43 -0700)]
Merge pull request #185 from eileenmcnaughton/apiUpdateRevert

CRM-12144 don't revert contribution as it causes test regression

11 years agoMerge pull request #183 from mlutfy/CRM-12135
Tim Otten [Mon, 18 Mar 2013 19:38:41 +0000 (12:38 -0700)]
Merge pull request #183 from mlutfy/CRM-12135

CRM-12135: fix localization of menu/page titles

11 years agoadd fixme
eileen [Mon, 18 Mar 2013 19:34:19 +0000 (08:34 +1300)]
add fixme

11 years agofixes for regression on contribution.update
eileen [Mon, 18 Mar 2013 19:32:02 +0000 (08:32 +1300)]
fixes for regression on contribution.update

11 years agoMerge pull request #184 from eileenmcnaughton/apiUpdateRevert
Tim Otten [Mon, 18 Mar 2013 19:11:57 +0000 (12:11 -0700)]
Merge pull request #184 from eileenmcnaughton/apiUpdateRevert

CRM-12144 revert changes to prevent regression (keep the gremlins you kn...

11 years agoCRM-12144 revert changes to prevent regression (keep the gremlins you know
eileen [Mon, 18 Mar 2013 18:51:26 +0000 (07:51 +1300)]
CRM-12144 revert changes to prevent regression (keep the gremlins you know

11 years agofixes CRM-12135: translation of title links, must provide gettext 'context'.
Mathieu Lutfy [Mon, 18 Mar 2013 15:21:03 +0000 (11:21 -0400)]
fixes CRM-12135: translation of title links, must provide gettext 'context'.

11 years agoCRM-12135 rollback test
Mathieu Lutfy [Mon, 18 Mar 2013 15:20:13 +0000 (11:20 -0400)]
CRM-12135 rollback test

11 years agoMerge pull request #181 from ravishnair/webtest-improvement
Kurund Jalmi [Mon, 18 Mar 2013 15:18:48 +0000 (08:18 -0700)]
Merge pull request #181 from ravishnair/webtest-improvement

-- webtest fixes and improvement

11 years agoMerge pull request #182 from pratik-joshi/CRM-7802
Kurund Jalmi [Mon, 18 Mar 2013 15:17:56 +0000 (08:17 -0700)]
Merge pull request #182 from pratik-joshi/CRM-7802

fix for : CRM-7802 applied patch

11 years agoMerge pull request #180 from tttp/bugfix
Tim Otten [Mon, 18 Mar 2013 15:07:15 +0000 (08:07 -0700)]
Merge pull request #180 from tttp/bugfix

CRM-12140 api explorer doesn't suggest action update

11 years ago-- webtest fixes and improvement
Ravish Nair [Mon, 18 Mar 2013 14:47:48 +0000 (20:17 +0530)]
-- webtest fixes and improvement

11 years agofix for : CRM-7802 applied patch
Pratik Joshi [Mon, 18 Mar 2013 14:42:19 +0000 (20:12 +0530)]
fix for : CRM-7802 applied patch

11 years agoCRM-12140 api explorer doesn't suggest action update
Xavier Dutoit [Mon, 18 Mar 2013 14:35:43 +0000 (15:35 +0100)]
CRM-12140 api explorer doesn't suggest action update

11 years agoMerge pull request #179 from mlutfy/minifixes
Tim Otten [Mon, 18 Mar 2013 14:26:36 +0000 (07:26 -0700)]
Merge pull request #179 from mlutfy/minifixes

Trivial fix: Fix case subject class name.

11 years agoFix case subject class name.
Mathieu Lutfy [Mon, 18 Mar 2013 14:20:35 +0000 (10:20 -0400)]
Fix case subject class name.

11 years agoMerge pull request #178 from pratik-joshi/wordpress-install-break
Kurund Jalmi [Mon, 18 Mar 2013 13:54:13 +0000 (06:54 -0700)]
Merge pull request #178 from pratik-joshi/wordpress-install-break

fix for : during wordpress installation, while populating civi_table wit...

11 years agofix for : during wordpress installation, while populating civi_table with generated...
Pratik Joshi [Mon, 18 Mar 2013 13:42:11 +0000 (19:12 +0530)]
fix for : during wordpress installation, while populating civi_table with generated data a DB :: Cannot execute query error is thrown

11 years agoMerge pull request #177 from pradpnayak/CRM-12142
Kurund Jalmi [Mon, 18 Mar 2013 13:38:29 +0000 (06:38 -0700)]
Merge pull request #177 from pradpnayak/CRM-12142

-- fixed for CRM-12142

11 years ago-- fixed for CRM-12142
Pradeep Nayak [Mon, 18 Mar 2013 13:21:14 +0000 (18:51 +0530)]
-- fixed for CRM-12142

11 years agoCRM-9394
yashodha [Mon, 18 Mar 2013 09:59:39 +0000 (15:29 +0530)]
CRM-9394

11 years agoCRM-9394
yashodha [Mon, 18 Mar 2013 08:38:32 +0000 (14:08 +0530)]
CRM-9394

11 years agoCRM-9394
yashodha [Mon, 18 Mar 2013 07:08:33 +0000 (12:38 +0530)]
CRM-9394

11 years agoMerge pull request #176 from yashodha/issue-9394
Kurund Jalmi [Mon, 18 Mar 2013 10:40:15 +0000 (03:40 -0700)]
Merge pull request #176 from yashodha/issue-9394

CRM-9394

11 years agoMerge pull request #175 from tttp/bugfix
Kurund Jalmi [Mon, 18 Mar 2013 09:02:58 +0000 (02:02 -0700)]
Merge pull request #175 from tttp/bugfix

CRM-11637 edit in place data-field=xx as an alternative for crmf-xx