Kurund Jalmi [Mon, 22 Apr 2013 02:05:58 +0000 (19:05 -0700)]
Merge pull request #497 from yashodha/more-work
clean up(CRM-12274)
yashodha [Mon, 22 Apr 2013 00:38:11 +0000 (06:08 +0530)]
clean up(CRM-12274)
Kurund Jalmi [Sun, 21 Apr 2013 22:45:53 +0000 (15:45 -0700)]
Merge pull request #496 from kurund/gen-data
fixed generated data
kurund [Sun, 21 Apr 2013 22:43:00 +0000 (04:13 +0530)]
fixed generated data
Kurund Jalmi [Sun, 21 Apr 2013 22:34:25 +0000 (15:34 -0700)]
Merge pull request #495 from yashodha/CRM-12357
CRM-12357
Kurund Jalmi [Sun, 21 Apr 2013 22:33:30 +0000 (15:33 -0700)]
Merge pull request #494 from kurund/CRM-12357
updated generated data
yashodha [Sun, 21 Apr 2013 19:21:12 +0000 (00:51 +0530)]
CRM-12357
Kurund Jalmi [Sun, 21 Apr 2013 22:32:02 +0000 (15:32 -0700)]
update generated data
Kurund Jalmi [Sat, 20 Apr 2013 21:55:52 +0000 (14:55 -0700)]
Merge pull request #490 from yashodha/more-CRM-12274
more-CRM-12274
Kurund Jalmi [Sat, 20 Apr 2013 21:55:39 +0000 (14:55 -0700)]
Merge pull request #489 from yashodha/CRM-12274
CRM-12274
yashodha [Sat, 20 Apr 2013 21:00:24 +0000 (02:30 +0530)]
more-CRM-12274
yashodha [Sat, 20 Apr 2013 20:34:37 +0000 (02:04 +0530)]
CRM-12274
yashodha [Sat, 20 Apr 2013 20:10:15 +0000 (01:40 +0530)]
CRM-12274
yashodha [Sat, 20 Apr 2013 18:54:18 +0000 (00:24 +0530)]
more-CRM-12274
yashodha [Sat, 20 Apr 2013 00:46:11 +0000 (06:16 +0530)]
CRM-12274
Kurund Jalmi [Fri, 19 Apr 2013 21:00:15 +0000 (14:00 -0700)]
Merge branch 'master' of github.com:civicrm/civicrm-core
Kurund Jalmi [Fri, 19 Apr 2013 18:05:06 +0000 (11:05 -0700)]
Merge pull request #483 from deepak-srivastava/mastro
scripts for managing demo sites and their pristines
Deepak Srivastava [Fri, 19 Apr 2013 13:55:27 +0000 (19:25 +0530)]
scripts for managing demo sites and their pristines
Kurund Jalmi [Wed, 17 Apr 2013 01:18:17 +0000 (18:18 -0700)]
Merge branch '4.3' of github.com:civicrm/civicrm-core
Tim Otten [Tue, 16 Apr 2013 21:38:27 +0000 (14:38 -0700)]
Merge pull request #417 from colemanw/CRM-12339
CRM-12339 move settings region to html-header
dlobo [Tue, 16 Apr 2013 21:01:35 +0000 (14:01 -0700)]
Merge pull request #449 from pradpnayak/CRM-12333
-- fixed for CRM-12333
Kurund Jalmi [Tue, 16 Apr 2013 20:42:50 +0000 (13:42 -0700)]
Merge pull request #453 from mlutfy/fix-43-actdatetimeformat
Activity followup_date time format should use localization settings.
Kurund Jalmi [Tue, 16 Apr 2013 20:42:08 +0000 (13:42 -0700)]
Merge pull request #451 from dlobo/CRM-12360
CRM-12360
Kurund Jalmi [Tue, 16 Apr 2013 20:40:55 +0000 (13:40 -0700)]
Merge pull request #454 from yashodha/CRM-12272
CRM-12272
yashodha [Tue, 16 Apr 2013 20:37:14 +0000 (02:07 +0530)]
CRM-12272
Kurund Jalmi [Tue, 16 Apr 2013 19:04:00 +0000 (12:04 -0700)]
Merge pull request #447 from deepak-srivastava/crm43
Fix for CRM-12359
yashodha [Tue, 16 Apr 2013 18:36:21 +0000 (00:06 +0530)]
CRM-12272
Yashodha Chaku [Tue, 16 Apr 2013 18:32:02 +0000 (11:32 -0700)]
Merge pull request #443 from davecivicrm/CRM-12272
CRM-12272 Fixed logic so that form rule ensures that EITHER custom_pre O...
Mathieu Lutfy [Tue, 16 Apr 2013 17:56:20 +0000 (13:56 -0400)]
Activity followup_date time format should use localization settings.
Tim Otten [Tue, 16 Apr 2013 17:54:12 +0000 (10:54 -0700)]
Merge pull request #434 from dlobo/CRM-12355
CRM-12355
Tim Otten [Tue, 16 Apr 2013 17:43:57 +0000 (10:43 -0700)]
Update civicrm_generated.mysql
Tim Otten [Tue, 16 Apr 2013 17:40:13 +0000 (10:40 -0700)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-16-10-35-08
Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
dlobo [Tue, 16 Apr 2013 15:27:24 +0000 (08:27 -0700)]
Merge pull request #448 from pradpnayak/CRM-12284
-- notice fixes for CRM-12284
dlobo [Tue, 16 Apr 2013 15:24:54 +0000 (08:24 -0700)]
Merge pull request #446 from pratik-joshi/CRM-12348_qa
fix for notice found while QA of CRM-12348, and added a missing execute ...
dlobo [Tue, 16 Apr 2013 15:21:36 +0000 (08:21 -0700)]
Merge pull request #452 from deepak-srivastava/ninja
marked twilio as stable and community contributed
Donald A. Lobo [Tue, 16 Apr 2013 15:13:40 +0000 (08:13 -0700)]
CRM-12360
----------------------------------------
* CRM-12360: city field not available on address edit if language is NL
http://issues.civicrm.org/jira/browse/CRM-12360
Deepak Srivastava [Tue, 16 Apr 2013 15:12:36 +0000 (20:42 +0530)]
marked twilio as stable and community contributed
Pradeep Dorugade [Tue, 16 Apr 2013 12:59:19 +0000 (18:29 +0530)]
-- fixed for CRM-12333
Pradeep Dorugade [Tue, 16 Apr 2013 12:12:41 +0000 (17:42 +0530)]
-- notice fixes for CRM-12284
Deepak Srivastava [Tue, 16 Apr 2013 11:54:49 +0000 (17:24 +0530)]
Fix for CRM-12359
Pratik Joshi [Tue, 16 Apr 2013 10:04:08 +0000 (15:34 +0530)]
fix for notice found while QA of CRM-12348, and added a missing execute statement
Kurund Jalmi [Tue, 16 Apr 2013 05:59:05 +0000 (22:59 -0700)]
Merge pull request #445 from deepak-srivastava/crm43
Updated info and zip files inorder to upload extensions on civicrm.org
Deepak Srivastava [Tue, 16 Apr 2013 05:41:07 +0000 (11:11 +0530)]
mark clickatell as stable
Deepak Srivastava [Mon, 15 Apr 2013 10:24:34 +0000 (15:54 +0530)]
updated info and zip files inorder to upload extensions on civicrm.org
Deepak Srivastava [Mon, 15 Apr 2013 08:08:27 +0000 (13:38 +0530)]
updated zip files for sms extension
colemanw [Tue, 16 Apr 2013 04:13:46 +0000 (21:13 -0700)]
Merge pull request #444 from totten/givi-review
givi - Allow checking out a pull-request for review
Tim Otten [Tue, 16 Apr 2013 03:14:41 +0000 (20:14 -0700)]
givi - Allow checking out a pull-request for review
Kurund Jalmi [Tue, 16 Apr 2013 00:09:42 +0000 (17:09 -0700)]
Merge pull request #440 from davecivicrm/CRM-12351
CRM-12351 Add .tpl for 4.3.1 upgrade and query to populate civicrm_dedup...
Kurund Jalmi [Tue, 16 Apr 2013 00:09:01 +0000 (17:09 -0700)]
Merge pull request #441 from eileenmcnaughton/4.3
improve debug message to reflect whether a receipt is sent
Kurund Jalmi [Tue, 16 Apr 2013 00:07:39 +0000 (17:07 -0700)]
Merge pull request #442 from yashodha/CRM-12274
Crm 12274
Dave Greenberg [Mon, 15 Apr 2013 23:53:13 +0000 (16:53 -0700)]
CRM-12272 Fixed logic so that form rule ensures that EITHER custom_pre OR custom_post is an individual profile. Previously the code was throwing form rule error when custom_post was NOT type individual even though custom_pre was. However, the complete fix is to check for first + last name profile fields when Allow multiple registrations from same email is checked. Will file issue for that for 4.4.
----------------------------------------
* CRM-12272: Validation for required profile fields in event registration ignores 'extra' profiles
http://issues.civicrm.org/jira/browse/CRM-12272
colemanw [Mon, 15 Apr 2013 23:50:40 +0000 (16:50 -0700)]
Merge pull request #439 from kurund/CRM-12235
worked on CRM-12235, added missing feature of inline edit for multi-valu...
eileen [Mon, 15 Apr 2013 23:37:26 +0000 (11:37 +1200)]
improve logging of progress to reflect whether a receipt is sent
eileen [Mon, 15 Apr 2013 23:35:28 +0000 (11:35 +1200)]
whitespace remove trailing spaces
Donald A. Lobo [Mon, 15 Apr 2013 23:16:04 +0000 (16:16 -0700)]
CRM-12355
----------------------------------------
* CRM-12355: Upgrade fails with "CREATE TEMPORARY TABLE ... A table must have at least 1 column]"
http://issues.civicrm.org/jira/browse/CRM-12355
Donald A. Lobo [Mon, 15 Apr 2013 15:34:04 +0000 (08:34 -0700)]
CRM-12355
----------------------------------------
* CRM-12355: Upgrade fails with "CREATE TEMPORARY TABLE ... A table must have at least 1 column]"
http://issues.civicrm.org/jira/browse/CRM-12355
yashodha [Mon, 15 Apr 2013 22:56:28 +0000 (04:26 +0530)]
CRM-1227
Kurund Jalmi [Mon, 15 Apr 2013 21:48:10 +0000 (14:48 -0700)]
Merge pull request #438 from davecivicrm/CRM-12325
CRM-12325 Corrected erroneous help info on message template page and for...
kurund [Mon, 15 Apr 2013 21:47:21 +0000 (03:17 +0530)]
worked on CRM-12235, added missing feature of inline edit for multi-value custom data
----------------------------------------
* CRM-12235: Inline edit of multi-record custom fields broken
http://issues.civicrm.org/jira/browse/CRM-12235
Dave Greenberg [Mon, 15 Apr 2013 20:07:14 +0000 (13:07 -0700)]
CRM-12325 Corrected erroneous help info on message template page and form, and consolidated the help. Also added help and link to book on Scheduled Reminders page.
----------------------------------------
* CRM-12325: Correct and clarify help regarding use of tokens for events, memberships, and activities in message templates
http://issues.civicrm.org/jira/browse/CRM-12325
yashodha [Mon, 15 Apr 2013 19:25:51 +0000 (00:55 +0530)]
CRM-12274
yashodha [Mon, 15 Apr 2013 18:17:51 +0000 (23:47 +0530)]
CRM-12274
Kurund Jalmi [Mon, 15 Apr 2013 19:15:29 +0000 (12:15 -0700)]
Merge pull request #437 from kurund/updateCMSEmail
worked on CRM-12285, udpate CMS email if primary email of contact is upd...
dlobo [Mon, 15 Apr 2013 18:31:11 +0000 (11:31 -0700)]
Merge pull request #436 from dlobo/CRM-12274
CRM-12274
Donald A. Lobo [Mon, 15 Apr 2013 18:30:17 +0000 (11:30 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
kurund [Mon, 15 Apr 2013 18:21:49 +0000 (23:51 +0530)]
worked on CRM-12285, udpate CMS email if primary email of contact is updated.
----------------------------------------
* CRM-12285: Editing an email using the 'inscreen' edit option does not update the drupal user email, where the email is used for the uf_match
http://issues.civicrm.org/jira/browse/CRM-12285
Kurund Jalmi [Mon, 15 Apr 2013 17:48:13 +0000 (10:48 -0700)]
Merge pull request #429 from colemanw/userEmail
Fix user email CRM-12285
Kurund Jalmi [Mon, 15 Apr 2013 17:41:39 +0000 (10:41 -0700)]
Merge pull request #433 from dlobo/CRM-12356
Give WP more flexibility in layout of WP code vs CiviCRM location
Kurund Jalmi [Mon, 15 Apr 2013 17:39:24 +0000 (10:39 -0700)]
Merge pull request #431 from ravishnair/CRM-12348
-- CRM-12348 Minor Fix
dlobo [Mon, 15 Apr 2013 17:25:22 +0000 (10:25 -0700)]
Merge pull request #435 from dlobo/master
Initial commit of changes for elimination of activities
Donald A. Lobo [Mon, 15 Apr 2013 17:19:16 +0000 (10:19 -0700)]
CRM-12357
----------------------------------------
* CRM-12357: Split Mailings into separate tab if activity creation is disabled
http://issues.civicrm.org/jira/browse/CRM-12357
Dave Greenberg [Mon, 15 Apr 2013 16:18:15 +0000 (09:18 -0700)]
CRM-12351 Add .tpl for 4.3.1 upgrade and query to populate civicrm_dedupe_rule_group.title column if NULL.
----------------------------------------
* CRM-12351:
http://issues.civicrm.org/jira/browse/CRM-12351
Donald A. Lobo [Sun, 14 Apr 2013 23:27:35 +0000 (16:27 -0700)]
Give WP more flexibility in layout of WP code vs CiviCRM location
Ravish Nair [Mon, 15 Apr 2013 09:43:16 +0000 (15:13 +0530)]
-- CRM-12348 Minor Fix
Kurund Jalmi [Mon, 15 Apr 2013 07:37:23 +0000 (00:37 -0700)]
Merge pull request #430 from pratik-joshi/CRM-12344
CRM-12344 fix : this commit fixes the issue mentioned in description as ...
Pratik Joshi [Mon, 15 Apr 2013 07:12:14 +0000 (12:42 +0530)]
CRM-12344 fix : this commit fixes the issue mentioned in description as well as 'pledge for' field valur missing on user dashboard page
Kurund Jalmi [Mon, 15 Apr 2013 06:50:30 +0000 (23:50 -0700)]
Merge pull request #428 from totten/4.3-givi
givi - Add "--setup" which calls setup.sh
Kurund Jalmi [Mon, 15 Apr 2013 06:50:07 +0000 (23:50 -0700)]
Merge pull request #427 from dlobo/CRM-12353
CRM-12353
Kurund Jalmi [Mon, 15 Apr 2013 06:49:38 +0000 (23:49 -0700)]
Merge pull request #424 from yashodha/CRM-12274
CRM-12274
Coleman Watts [Mon, 15 Apr 2013 03:43:38 +0000 (20:43 -0700)]
Fix user email CRM-12285
Tim Otten [Mon, 15 Apr 2013 02:06:40 +0000 (19:06 -0700)]
givi - Add "--setup" and "--gencode" options
Tim Otten [Mon, 15 Apr 2013 01:47:12 +0000 (18:47 -0700)]
givi - Misc improvements:
* When outputting commands, display repo name instead of relative path
* Add --repos option
* Add hidden "push" action
* Add disabled "merge-forward" action. (This was previously drafted but ultimately went with tools/scripts/merge-forward.)
Donald A. Lobo [Mon, 15 Apr 2013 01:37:28 +0000 (18:37 -0700)]
CRM-12353
----------------------------------------
* CRM-12353: installments array value not set
http://issues.civicrm.org/jira/browse/CRM-12353
dlobo [Mon, 15 Apr 2013 01:33:50 +0000 (18:33 -0700)]
Merge pull request #426 from dlobo/CRM-12352
CRM-12352
Tim Otten [Mon, 15 Apr 2013 01:14:53 +0000 (18:14 -0700)]
SyntaxConformanceAllEntitiesTest - Remove debug code
Donald A. Lobo [Mon, 15 Apr 2013 01:00:06 +0000 (18:00 -0700)]
CRM-12352
----------------------------------------
* CRM-12352: missing single quotes around arrayed variable reference
http://issues.civicrm.org/jira/browse/CRM-12352
eileen [Sun, 14 Apr 2013 23:17:08 +0000 (11:17 +1200)]
CRM-12350 remove relevant tests to get full pass-rate
eileen [Sun, 14 Apr 2013 22:55:44 +0000 (10:55 +1200)]
CRM-12350 amend relationship test to pass. Note this could be a regressing but regression is old if so
eileen [Sun, 14 Apr 2013 22:50:07 +0000 (10:50 +1200)]
CRM-12350 skip payment processor, entity tag
yashodha [Sun, 14 Apr 2013 20:55:47 +0000 (02:25 +0530)]
CRM-12274
Kurund Jalmi [Sun, 14 Apr 2013 18:19:41 +0000 (11:19 -0700)]
Merge pull request #423 from dlobo/NoticeFixes
fix notices on save
Kurund Jalmi [Sun, 14 Apr 2013 18:19:09 +0000 (11:19 -0700)]
Merge pull request #422 from colemanw/buildCustomData
Restore buildCustomData to contribution forms CRM-12331
Donald A. Lobo [Sun, 14 Apr 2013 17:29:21 +0000 (10:29 -0700)]
fix notices on save
Coleman Watts [Sun, 14 Apr 2013 16:45:08 +0000 (09:45 -0700)]
Restore buildCustomData to contribution forms CRM-12331
Kurund Jalmi [Sun, 14 Apr 2013 16:41:26 +0000 (09:41 -0700)]
Merge pull request #421 from colemanw/jcss
Fix select height in joomla
Coleman Watts [Sun, 14 Apr 2013 04:04:11 +0000 (21:04 -0700)]
Update unit test CRM-12339
Coleman Watts [Sun, 14 Apr 2013 03:47:05 +0000 (20:47 -0700)]
Fix select height in joomla
Kurund Jalmi [Sun, 14 Apr 2013 02:59:45 +0000 (19:59 -0700)]
Merge pull request #420 from davecivicrm/CRM-12216
CRM-12216 Add help on the Activity form for the option to create separat...
Dave Greenberg [Sun, 14 Apr 2013 01:30:39 +0000 (18:30 -0700)]
CRM-12216 Add help on the Activity form for the option to create separate activity records for each contact during bulk activity creation. (There was no .hpl file for that template, so adding that.)
----------------------------------------
* CRM-12216: add an option to create separate activities for each target contacts
http://issues.civicrm.org/jira/browse/CRM-12216
Kurund Jalmi [Sun, 14 Apr 2013 01:18:39 +0000 (18:18 -0700)]
Merge pull request #419 from kurund/CRM-12096
worked on CRM-12096, fixed the missing navigation menu on joomla 3.x
projects / civicrm-core.git / log