Ravish Nair [Mon, 25 Mar 2013 08:47:37 +0000 (14:17 +0530)]
-- fix for CRM-12191
dlobo [Mon, 25 Mar 2013 02:58:14 +0000 (19:58 -0700)]
Merge pull request #240 from dlobo/CRM-12205
CRM-12205
Donald A. Lobo [Mon, 25 Mar 2013 02:54:21 +0000 (19:54 -0700)]
CRM-12205
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
Kurund Jalmi [Sat, 23 Mar 2013 19:34:51 +0000 (12:34 -0700)]
Merge pull request #235 from dlobo/CRM-12195
CRM-12195
Kurund Jalmi [Sat, 23 Mar 2013 19:34:32 +0000 (12:34 -0700)]
Merge pull request #236 from dlobo/CRM-12196
CRM-12196
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
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
Coleman Watts [Sat, 23 Mar 2013 04:46:29 +0000 (21:46 -0700)]
Disable save button if profile unchanged CRM-12198
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...
Coleman Watts [Sat, 23 Mar 2013 04:12:40 +0000 (21:12 -0700)]
Fix default location type CRM-12157
Donald A. Lobo [Sat, 23 Mar 2013 00:18:07 +0000 (17:18 -0700)]
CRM-12196
Donald A. Lobo [Sat, 23 Mar 2013 00:11:20 +0000 (17:11 -0700)]
CRM-12195
Coleman Watts [Fri, 22 Mar 2013 23:24:28 +0000 (16:24 -0700)]
Fix custom field help CRM-12194
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).
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 ...
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.
Kurund Jalmi [Fri, 22 Mar 2013 17:45:22 +0000 (10:45 -0700)]
Merge pull request #229 from dlobo/CRM-12183
CRM-12183
Kurund Jalmi [Fri, 22 Mar 2013 17:44:43 +0000 (10:44 -0700)]
Merge pull request #230 from dlobo/CRM-12185
CRM-12185
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...
Donald A. Lobo [Fri, 22 Mar 2013 16:51:45 +0000 (09:51 -0700)]
CRM-12185
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
Donald A. Lobo [Fri, 22 Mar 2013 16:36:49 +0000 (09:36 -0700)]
CRM-12183
Kurund Jalmi [Fri, 22 Mar 2013 15:50:01 +0000 (08:50 -0700)]
Merge pull request #221 from colemanw/navigation
Fix quicksearch redirect
Kurund Jalmi [Fri, 22 Mar 2013 15:49:13 +0000 (08:49 -0700)]
Merge pull request #223 from colemanw/webtest2
A couple webtest fixes
Kurund Jalmi [Fri, 22 Mar 2013 15:48:45 +0000 (08:48 -0700)]
Merge pull request #225 from yashodha/webtests
Webtests
Kurund Jalmi [Fri, 22 Mar 2013 15:48:30 +0000 (08:48 -0700)]
Merge pull request #226 from ravishnair/webtest-fix/improvement
-- webtest fixes
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
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
Pradeep Nayak [Fri, 22 Mar 2013 12:11:12 +0000 (17:41 +0530)]
--fixed for CRM-12155
Ravish Nair [Fri, 22 Mar 2013 10:28:43 +0000 (15:58 +0530)]
-- webtest fixes
Deepak Srivastava [Fri, 22 Mar 2013 08:16:22 +0000 (13:46 +0530)]
- fixed log enable timeout, contact not being deleted & relationship timeout
yashodha [Fri, 22 Mar 2013 07:28:27 +0000 (12:58 +0530)]
fix webtest
yashodha [Fri, 22 Mar 2013 06:58:34 +0000 (12:28 +0530)]
webtest fix
yashodha [Fri, 22 Mar 2013 06:32:49 +0000 (12:02 +0530)]
notice fix
Coleman Watts [Fri, 22 Mar 2013 03:57:39 +0000 (20:57 -0700)]
Partial fix for WebTest_Contact_AdvancedSearchTest
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
Donald A. Lobo [Fri, 22 Mar 2013 03:43:41 +0000 (20:43 -0700)]
fix notices and PHP 5.4 warnings
Coleman Watts [Fri, 22 Mar 2013 00:43:29 +0000 (17:43 -0700)]
A couple webtest fixes
Coleman Watts [Thu, 21 Mar 2013 23:50:03 +0000 (16:50 -0700)]
Fix quicksearch redirect
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
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
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
colemanw [Thu, 21 Mar 2013 17:14:32 +0000 (10:14 -0700)]
Merge pull request #214 from yashodha/CRM-12014
CRM-12014
colemanw [Thu, 21 Mar 2013 17:08:36 +0000 (10:08 -0700)]
Merge pull request #218 from ravishnair/webtest-fix/improvement
-- webtest 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
colemanw [Thu, 21 Mar 2013 17:08:02 +0000 (10:08 -0700)]
Merge pull request #216 from pratik-joshi/webtest-fixes
Webtest fixes
Pradeep Nayak [Thu, 21 Mar 2013 15:57:47 +0000 (21:27 +0530)]
--fixed for CRM-12141
Pratik Joshi [Thu, 21 Mar 2013 13:48:28 +0000 (19:18 +0530)]
fix for webtest WRT changes done for CRM-12120
Ravish Nair [Thu, 21 Mar 2013 13:24:20 +0000 (18:54 +0530)]
-- webtest fixes
Pratik Joshi [Thu, 21 Mar 2013 12:31:58 +0000 (18:01 +0530)]
test fix and improvement
Pratik Joshi [Thu, 21 Mar 2013 11:54:41 +0000 (17:24 +0530)]
webtest fix
Pratik Joshi [Thu, 21 Mar 2013 10:23:30 +0000 (15:53 +0530)]
webtest fix : fixed broken path building due to wrong argument
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.
Kurund Jalmi [Thu, 21 Mar 2013 06:21:42 +0000 (11:51 +0530)]
worked on CRM-12155, delete records from civicrm_financial_item
yashodha [Thu, 21 Mar 2013 05:07:01 +0000 (10:37 +0530)]
CRM-12014
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...
dlobo [Thu, 21 Mar 2013 01:50:43 +0000 (18:50 -0700)]
Merge pull request #213 from dlobo/NoticeFixes
Notice fixes
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
Donald A. Lobo [Thu, 21 Mar 2013 00:56:01 +0000 (17:56 -0700)]
fix formatting
Donald A. Lobo [Wed, 20 Mar 2013 17:49:14 +0000 (10:49 -0700)]
fix strict notices from PHP 5.4
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.
Pradeep Nayak [Thu, 21 Mar 2013 00:58:40 +0000 (06:28 +0530)]
-- fixed for CRM-12127, for api fixes
colemanw [Thu, 21 Mar 2013 00:19:21 +0000 (17:19 -0700)]
Merge pull request #210 from colemanw/webtest-timing
Webtest timing
Coleman Watts [Thu, 21 Mar 2013 00:02:06 +0000 (17:02 -0700)]
Refactor ad-hoc url parsing to use the new urlArg() method
Pradeep Nayak [Wed, 20 Mar 2013 23:49:12 +0000 (05:19 +0530)]
-- fixed multi-lingual upgrade script, for CRM-12142
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.
Coleman Watts [Wed, 20 Mar 2013 23:17:38 +0000 (16:17 -0700)]
Change messages to wait instead of assert
Coleman Watts [Wed, 20 Mar 2013 22:44:03 +0000 (15:44 -0700)]
Fix AddressParsingTest
colemanw [Wed, 20 Mar 2013 21:26:27 +0000 (14:26 -0700)]
Merge pull request #205 from colemanw/clicklink
Clicklink
Coleman Watts [Wed, 20 Mar 2013 21:25:35 +0000 (14:25 -0700)]
whitespace cleanup
Coleman Watts [Wed, 20 Mar 2013 21:12:50 +0000 (14:12 -0700)]
Start migrating to use clickLink method
Coleman Watts [Wed, 20 Mar 2013 20:55:03 +0000 (13:55 -0700)]
Fixed some contribution pages
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...
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
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.
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
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
CiviCRM [Wed, 20 Mar 2013 12:45:48 +0000 (08:45 -0400)]
Merge branch 'CRM-12133' into master-CRM-12133
CiviCRM [Wed, 20 Mar 2013 12:43:04 +0000 (08:43 -0400)]
CRM-12133 - CRM_Core_BAO_OptionValue - Fix copy-paste error
CiviCRM [Wed, 20 Mar 2013 12:42:25 +0000 (08:42 -0400)]
CRM-12133 - api/v3/ReportTemplate - Fix option_group_id and component_id errors
CiviCRM [Wed, 20 Mar 2013 12:21:36 +0000 (08:21 -0400)]
CRM-12133 - api/v3/CustomSearch - Fix option_group_id error
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
eileen [Thu, 21 Mar 2013 22:46:51 +0000 (11:46 +1300)]
fixes to value and weight handling CRM-12133
eileen [Tue, 19 Mar 2013 20:56:56 +0000 (09:56 +1300)]
comment tweak
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
Pratik Joshi [Wed, 20 Mar 2013 12:05:58 +0000 (17:35 +0530)]
minor fix for CRM-12153 : Tag Merge UI break
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
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
dlobo [Wed, 20 Mar 2013 02:40:05 +0000 (19:40 -0700)]
Merge pull request #200 from dlobo/CRM-12151
CRM-12151
Donald A. Lobo [Wed, 20 Mar 2013 02:38:11 +0000 (19:38 -0700)]
CRM-12151
Tim Otten [Wed, 20 Mar 2013 00:58:48 +0000 (17:58 -0700)]
Merge pull request #199 from colemanw/webtest
Webtest
Coleman Watts [Wed, 20 Mar 2013 00:40:54 +0000 (17:40 -0700)]
Fix some uses of sleep, comment the rest
Pradeep Nayak [Tue, 19 Mar 2013 22:11:13 +0000 (03:41 +0530)]
-- worked on CRM-12127
Coleman Watts [Tue, 19 Mar 2013 20:39:57 +0000 (13:39 -0700)]
Merge redundant code for mailbox setup to a util fn
Coleman Watts [Tue, 19 Mar 2013 18:50:39 +0000 (11:50 -0700)]
Mass switch to openCiviPage method
Coleman Watts [Tue, 19 Mar 2013 05:59:03 +0000 (22:59 -0700)]
Global webtest cleanup
Pratik Joshi [Tue, 19 Mar 2013 16:21:48 +0000 (21:51 +0530)]
fix for : CRM-12130
Kurund Jalmi [Tue, 19 Mar 2013 16:11:09 +0000 (09:11 -0700)]
Merge pull request #196 from dlobo/CRM-12151
CRM-12151
Kurund Jalmi [Tue, 19 Mar 2013 16:09:08 +0000 (09:09 -0700)]
Merge pull request #195 from dlobo/CRM-12154
CRM-12154
projects / civicrm-core.git / log