civicrm-core.git
11 years ago--fixed CRM test, for CRM-12192
Pradeep Nayak [Mon, 25 Mar 2013 20:25:20 +0000 (01:55 +0530)]
--fixed CRM test, for CRM-12192

11 years agoMerge pull request #248 from pradpnayak/CRM-12155
Kurund Jalmi [Mon, 25 Mar 2013 16:24:13 +0000 (09:24 -0700)]
Merge pull request #248 from pradpnayak/CRM-12155

-- fixed upgrade script for CRM-12155

11 years agoMerge pull request #247 from pradpnayak/CRM-12192
Kurund Jalmi [Mon, 25 Mar 2013 16:23:28 +0000 (09:23 -0700)]
Merge pull request #247 from pradpnayak/CRM-12192

--fixed filtering for CRM-12192

11 years ago-- fixed upgrade script for CRM-12155
Pradeep Nayak [Mon, 25 Mar 2013 16:15:39 +0000 (21:45 +0530)]
-- fixed upgrade script for CRM-12155

11 years ago--fixed filtering for CRM-12192
Pradeep Nayak [Mon, 25 Mar 2013 16:03:56 +0000 (21:33 +0530)]
--fixed filtering for CRM-12192

11 years agoMerge pull request #243 from kurund/CRM-12178
colemanw [Mon, 25 Mar 2013 15:40:33 +0000 (08:40 -0700)]
Merge pull request #243 from kurund/CRM-12178

worked on CRM-12178, added overflow:auto, which shows scroll bar for fix...

11 years agoMerge pull request #242 from pradpnayak/CRM-12155
Kurund Jalmi [Mon, 25 Mar 2013 15:15:34 +0000 (08:15 -0700)]
Merge pull request #242 from pradpnayak/CRM-12155

--fixed for CRM-12155

11 years agoMerge pull request #246 from davecivicrm/profileName
Kurund Jalmi [Mon, 25 Mar 2013 15:15:09 +0000 (08:15 -0700)]
Merge pull request #246 from davecivicrm/profileName

CRM-12173 Add profile name (uf_group.name) to profile fieldset class.

11 years agoMerge pull request #245 from ravishnair/CRM-12191
Kurund Jalmi [Mon, 25 Mar 2013 15:13:29 +0000 (08:13 -0700)]
Merge pull request #245 from ravishnair/CRM-12191

-- more fixes for CRM-12191

11 years ago-- more fixes for CRM-12191
Ravish Nair [Mon, 25 Mar 2013 14:22:46 +0000 (19:52 +0530)]
-- more fixes for CRM-12191

11 years agoMerge pull request #244 from yashodha/CRM-7564
Kurund Jalmi [Mon, 25 Mar 2013 13:38:17 +0000 (06:38 -0700)]
Merge pull request #244 from yashodha/CRM-7564

CRM-7564

11 years agoCRM-7564
yashodha [Mon, 25 Mar 2013 13:16:06 +0000 (18:46 +0530)]
CRM-7564

11 years agoworked on CRM-12178, added overflow:auto, which shows scroll bar for fixed width...
Kurund Jalmi [Mon, 25 Mar 2013 11:55:52 +0000 (17:25 +0530)]
worked on CRM-12178, added overflow:auto, which shows scroll bar for fixed width themes

11 years ago--fixed for CRM-12155
Pradeep Nayak [Mon, 25 Mar 2013 11:33:16 +0000 (17:03 +0530)]
--fixed for CRM-12155

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

CRM-12124 in place edit option value

11 years agoMerge pull request #241 from ravishnair/CRM-12191
Kurund Jalmi [Mon, 25 Mar 2013 09:59:00 +0000 (02:59 -0700)]
Merge pull request #241 from ravishnair/CRM-12191

-- fix for CRM-12191

11 years ago-- fix for CRM-12191
Ravish Nair [Mon, 25 Mar 2013 08:47:37 +0000 (14:17 +0530)]
-- fix for CRM-12191

11 years agoMerge pull request #239 from colemanw/CRM-12188
Kurund Jalmi [Mon, 25 Mar 2013 06:49:45 +0000 (23:49 -0700)]
Merge pull request #239 from colemanw/CRM-12188

Temp fix for duplicate dom ids CRM-12188

11 years agoMerge pull request #240 from dlobo/CRM-12205
dlobo [Mon, 25 Mar 2013 02:58:14 +0000 (19:58 -0700)]
Merge pull request #240 from dlobo/CRM-12205

CRM-12205

11 years agoCRM-12205
Donald A. Lobo [Mon, 25 Mar 2013 02:54:21 +0000 (19:54 -0700)]
CRM-12205

11 years agoCRM-12173 Add profile name (uf_group.name) to profile fieldset class.
Dave Greenberg [Mon, 25 Mar 2013 02:14:35 +0000 (19:14 -0700)]
CRM-12173 Add profile name (uf_group.name) to profile fieldset class.

11 years agoTemp fix for duplicate dom ids CRM-12188
Coleman Watts [Sat, 23 Mar 2013 22:53:10 +0000 (15:53 -0700)]
Temp fix for duplicate dom ids CRM-12188

11 years agoMerge pull request #234 from colemanw/CRM-12194
Kurund Jalmi [Sat, 23 Mar 2013 19:35:09 +0000 (12:35 -0700)]
Merge pull request #234 from colemanw/CRM-12194

Fix custom field help CRM-12194

11 years agoMerge pull request #235 from dlobo/CRM-12195
Kurund Jalmi [Sat, 23 Mar 2013 19:34:51 +0000 (12:34 -0700)]
Merge pull request #235 from dlobo/CRM-12195

CRM-12195

11 years agoMerge pull request #236 from dlobo/CRM-12196
Kurund Jalmi [Sat, 23 Mar 2013 19:34:32 +0000 (12:34 -0700)]
Merge pull request #236 from dlobo/CRM-12196

CRM-12196

11 years agoMerge pull request #237 from colemanw/CRM-12157
Kurund Jalmi [Sat, 23 Mar 2013 19:34:05 +0000 (12:34 -0700)]
Merge pull request #237 from colemanw/CRM-12157

Fix default location type CRM-12157

11 years agoMerge pull request #238 from colemanw/CRM-12198
Kurund Jalmi [Sat, 23 Mar 2013 19:33:40 +0000 (12:33 -0700)]
Merge pull request #238 from colemanw/CRM-12198

Disable save button if profile unchanged CRM-12198

11 years agoDisable save button if profile unchanged CRM-12198
Coleman Watts [Sat, 23 Mar 2013 04:46:29 +0000 (21:46 -0700)]
Disable save button if profile unchanged CRM-12198

11 years agoMerge pull request #233 from mlutfy/minifixes
colemanw [Sat, 23 Mar 2013 04:15:44 +0000 (21:15 -0700)]
Merge pull request #233 from mlutfy/minifixes

Add crm-case-activity-form-block classes on the table row (templates/CRM...

11 years agoFix default location type CRM-12157
Coleman Watts [Sat, 23 Mar 2013 04:12:40 +0000 (21:12 -0700)]
Fix default location type CRM-12157

11 years agoCRM-12196
Donald A. Lobo [Sat, 23 Mar 2013 00:18:07 +0000 (17:18 -0700)]
CRM-12196

11 years agoCRM-12195
Donald A. Lobo [Sat, 23 Mar 2013 00:11:20 +0000 (17:11 -0700)]
CRM-12195

11 years agoFix custom field help CRM-12194
Coleman Watts [Fri, 22 Mar 2013 23:24:28 +0000 (16:24 -0700)]
Fix custom field help CRM-12194

11 years agoAdd crm-case-activity-form-block classes on the table row (templates/CRM/ActivityForm...
Mathieu Lutfy [Fri, 22 Mar 2013 21:56:15 +0000 (17:56 -0400)]
Add crm-case-activity-form-block classes on the table row (templates/CRM/ActivityForm/Activity.tpl already has these).

11 years agoMerge pull request #232 from davecivicrm/CRM-12173
colemanw [Fri, 22 Mar 2013 20:15:37 +0000 (13:15 -0700)]
Merge pull request #232 from davecivicrm/CRM-12173

CRM-12173 Modified approach to use profile ID instead of title to avoid ...

11 years agoCRM-12173 Modified approach to use profile ID instead of title to avoid possible...
Dave Greenberg [Fri, 22 Mar 2013 19:36:02 +0000 (12:36 -0700)]
CRM-12173 Modified approach to use profile ID instead of title to avoid possible issues w/ special and non-latin characters in profile title string. Also ID is likely more stable than title.

11 years agoMerge pull request #229 from dlobo/CRM-12183
Kurund Jalmi [Fri, 22 Mar 2013 17:45:22 +0000 (10:45 -0700)]
Merge pull request #229 from dlobo/CRM-12183

CRM-12183

11 years agoMerge pull request #230 from dlobo/CRM-12185
Kurund Jalmi [Fri, 22 Mar 2013 17:44:43 +0000 (10:44 -0700)]
Merge pull request #230 from dlobo/CRM-12185

CRM-12185

11 years agoMerge pull request #231 from pratik-joshi/CRM-12170
Kurund Jalmi [Fri, 22 Mar 2013 16:57:59 +0000 (09:57 -0700)]
Merge pull request #231 from pratik-joshi/CRM-12170

CRM-12170 : fix for header shift and incorrect showing of contact type i...

11 years agoCRM-12185
Donald A. Lobo [Fri, 22 Mar 2013 16:51:45 +0000 (09:51 -0700)]
CRM-12185

11 years agoCRM-12170 : fix for header shift and incorrect showing of contact type in listing
Pratik Joshi [Fri, 22 Mar 2013 16:48:02 +0000 (22:18 +0530)]
CRM-12170 : fix for header shift and incorrect showing of contact type in listing

11 years agoCRM-12183
Donald A. Lobo [Fri, 22 Mar 2013 16:36:49 +0000 (09:36 -0700)]
CRM-12183

11 years agoMerge pull request #221 from colemanw/navigation
Kurund Jalmi [Fri, 22 Mar 2013 15:50:01 +0000 (08:50 -0700)]
Merge pull request #221 from colemanw/navigation

Fix quicksearch redirect

11 years agoMerge pull request #223 from colemanw/webtest2
Kurund Jalmi [Fri, 22 Mar 2013 15:49:13 +0000 (08:49 -0700)]
Merge pull request #223 from colemanw/webtest2

A couple webtest fixes

11 years agoMerge pull request #225 from yashodha/webtests
Kurund Jalmi [Fri, 22 Mar 2013 15:48:45 +0000 (08:48 -0700)]
Merge pull request #225 from yashodha/webtests

Webtests

11 years agoMerge pull request #226 from ravishnair/webtest-fix/improvement
Kurund Jalmi [Fri, 22 Mar 2013 15:48:30 +0000 (08:48 -0700)]
Merge pull request #226 from ravishnair/webtest-fix/improvement

-- webtest fixes

11 years agoMerge pull request #227 from deepak-srivastava/crm
Kurund Jalmi [Fri, 22 Mar 2013 15:48:07 +0000 (08:48 -0700)]
Merge pull request #227 from deepak-srivastava/crm

- fixed log enable timeout, contact not being deleted & relationship timeout

11 years agoMerge pull request #228 from pradpnayak/CRM-12155
Kurund Jalmi [Fri, 22 Mar 2013 15:47:46 +0000 (08:47 -0700)]
Merge pull request #228 from pradpnayak/CRM-12155

--fixed for CRM-12155

11 years ago--fixed for CRM-12155
Pradeep Nayak [Fri, 22 Mar 2013 12:11:12 +0000 (17:41 +0530)]
--fixed for CRM-12155

11 years ago-- webtest fixes
Ravish Nair [Fri, 22 Mar 2013 10:28:43 +0000 (15:58 +0530)]
-- webtest fixes

11 years ago- fixed log enable timeout, contact not being deleted & relationship timeout
Deepak Srivastava [Fri, 22 Mar 2013 08:16:22 +0000 (13:46 +0530)]
- fixed log enable timeout, contact not being deleted & relationship timeout

11 years agofix webtest
yashodha [Fri, 22 Mar 2013 07:28:27 +0000 (12:58 +0530)]
fix webtest

11 years agowebtest fix
yashodha [Fri, 22 Mar 2013 06:58:34 +0000 (12:28 +0530)]
webtest fix

11 years agonotice fix
yashodha [Fri, 22 Mar 2013 06:32:49 +0000 (12:02 +0530)]
notice fix

11 years agoPartial fix for WebTest_Contact_AdvancedSearchTest
Coleman Watts [Fri, 22 Mar 2013 03:57:39 +0000 (20:57 -0700)]
Partial fix for WebTest_Contact_AdvancedSearchTest

11 years agoMerge pull request #224 from dlobo/NoticeFixes
colemanw [Fri, 22 Mar 2013 03:47:26 +0000 (20:47 -0700)]
Merge pull request #224 from dlobo/NoticeFixes

fix notices and PHP 5.4 warnings

11 years agofix notices and PHP 5.4 warnings
Donald A. Lobo [Fri, 22 Mar 2013 03:43:41 +0000 (20:43 -0700)]
fix notices and PHP 5.4 warnings

11 years agoA couple webtest fixes
Coleman Watts [Fri, 22 Mar 2013 00:43:29 +0000 (17:43 -0700)]
A couple webtest fixes

11 years agoFix quicksearch redirect
Coleman Watts [Thu, 21 Mar 2013 23:50:03 +0000 (16:50 -0700)]
Fix quicksearch redirect

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 agoCRM-12124 temporarly disabling edit in place for value, until the BAO handles the...
Xavier Dutoit [Wed, 20 Mar 2013 23:21:34 +0000 (00:21 +0100)]
CRM-12124 temporarly disabling edit in place for value, until the BAO handles the relevant civicrm_value_%

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 agoCRM-12124 in place edit option value, prepare being able to use action=create
Xavier Dutoit [Wed, 20 Mar 2013 23:08:09 +0000 (00:08 +0100)]
CRM-12124 in place edit option value, prepare being able to use action=create

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 agoMerge branch 'CRM-12133' into master-CRM-12133
CiviCRM [Wed, 20 Mar 2013 12:45:48 +0000 (08:45 -0400)]
Merge branch 'CRM-12133' into master-CRM-12133