Kurund Jalmi [Wed, 1 May 2013 20:27:03 +0000 (13:27 -0700)]
Merge pull request #604 from yashodha/CRM-12463
clean up (CRM-12463)
Kurund Jalmi [Wed, 1 May 2013 20:00:12 +0000 (13:00 -0700)]
Merge pull request #603 from TobiasLounsbury/mailer-contact-api
Mailing contact api
yashodha [Wed, 1 May 2013 19:58:06 +0000 (01:28 +0530)]
CRM-12463 - Clean up
Kurund Jalmi [Wed, 1 May 2013 18:12:10 +0000 (11:12 -0700)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-01-11-04-54
Conflicts:
sql/civicrm_generated.mysql
Kurund Jalmi [Wed, 1 May 2013 17:53:16 +0000 (10:53 -0700)]
Merge pull request #602 from yashodha/CRM-12463
more BAO work(CRM-12463)
yashodha [Wed, 1 May 2013 17:50:37 +0000 (23:20 +0530)]
CRM-12463
yashodha [Wed, 1 May 2013 17:19:47 +0000 (22:49 +0530)]
CRM-12463
tobiaslounsbury [Wed, 1 May 2013 17:03:53 +0000 (10:03 -0700)]
Added for testing MailingContact_get
tobiaslounsbury [Wed, 1 May 2013 17:03:33 +0000 (10:03 -0700)]
Added for mailingcontact_get testing
tobiaslounsbury [Wed, 1 May 2013 17:03:09 +0000 (10:03 -0700)]
Added for mailing tests
tobiaslounsbury [Wed, 1 May 2013 17:01:53 +0000 (10:01 -0700)]
Added unit tests for MailingContact_get
yashodha [Wed, 1 May 2013 01:19:41 +0000 (06:49 +0530)]
more BAO work(CRM-12463)
Kurund Jalmi [Wed, 1 May 2013 07:41:48 +0000 (00:41 -0700)]
Merge pull request #592 from yashodha/CRM-12463
CRM-12463
Kurund Jalmi [Wed, 1 May 2013 07:28:31 +0000 (00:28 -0700)]
Merge pull request #600 from kurund/CRM-12357
worked CRM-12357, added stats to mailing tab and removed it from activit...
Kurund Jalmi [Wed, 1 May 2013 07:27:21 +0000 (00:27 -0700)]
worked CRM-12357, added stats to mailing tab and removed it from activity selector
Kurund Jalmi [Wed, 1 May 2013 07:15:56 +0000 (00:15 -0700)]
Merge pull request #599 from kurund/CRM-12357
CRM-12357
Kurund Jalmi [Wed, 1 May 2013 07:13:36 +0000 (00:13 -0700)]
CRM-12357, added dialog for view mailing
Kurund Jalmi [Wed, 1 May 2013 05:47:32 +0000 (22:47 -0700)]
whitespace fixes
Kurund Jalmi [Wed, 1 May 2013 02:20:04 +0000 (19:20 -0700)]
Merge pull request #597 from kurund/CRM-12357
fixed context for mailing report, CRM-12357
Kurund Jalmi [Wed, 1 May 2013 02:13:06 +0000 (19:13 -0700)]
fixed context for mailing report, CRM-12357
Kurund Jalmi [Wed, 1 May 2013 02:01:24 +0000 (19:01 -0700)]
Merge pull request #596 from kurund/CRM-12357
add more columns and links to selector, CRM-12357
Kurund Jalmi [Wed, 1 May 2013 01:58:33 +0000 (18:58 -0700)]
add more columns and links to selector, CRM-12357
Dave Greenberg [Wed, 1 May 2013 00:44:54 +0000 (17:44 -0700)]
Merge pull request #595 from Stoob/CRM-12483
CRM 12483 my first patch
Stoob [Wed, 1 May 2013 00:41:10 +0000 (17:41 -0700)]
CRM 12483 my first patch
Kurund Jalmi [Wed, 1 May 2013 00:29:08 +0000 (17:29 -0700)]
Merge pull request #593 from kurund/CRM-12463
worked on CRM-12463, fixed add more
Kurund Jalmi [Wed, 1 May 2013 00:26:41 +0000 (17:26 -0700)]
worked on CRM-12463, fixed add more
Kurund Jalmi [Wed, 1 May 2013 00:08:48 +0000 (17:08 -0700)]
Merge pull request #591 from davecivicrm/CRM-12482
CRM-12482 add call to crmSetting to get autocomplete result limit to all...
Dave Greenberg [Wed, 1 May 2013 00:00:28 +0000 (17:00 -0700)]
CRM-12482 add call to crmSetting to get autocomplete result limit to all relevant tpls.
----------------------------------------
* CRM-12482: Autocomplete Search Results limit setting should be used for all autocomplete widgets
http://issues.civicrm.org/jira/browse/CRM-12482
yashodha [Tue, 30 Apr 2013 23:55:20 +0000 (05:25 +0530)]
CRM-12463
Kurund Jalmi [Tue, 30 Apr 2013 23:51:41 +0000 (16:51 -0700)]
Merge pull request #589 from kurund/CRM-12463
worked on CRM-12463, fixed add more
Kurund Jalmi [Tue, 30 Apr 2013 23:50:23 +0000 (16:50 -0700)]
worked on CRM-12463, fixed add more
Kurund Jalmi [Tue, 30 Apr 2013 23:26:12 +0000 (16:26 -0700)]
Merge pull request #588 from kurund/CRM-12463
worked on CRM-12463 restructured code and fixes
Kurund Jalmi [Tue, 30 Apr 2013 23:24:39 +0000 (16:24 -0700)]
worked on CRM-12463 restructured code and fixes
dlobo [Tue, 30 Apr 2013 22:25:57 +0000 (15:25 -0700)]
Merge pull request #587 from dlobo/FormattingFixes
formatting fixes
Donald A. Lobo [Tue, 30 Apr 2013 22:19:30 +0000 (15:19 -0700)]
formatting fixes
Kurund Jalmi [Tue, 30 Apr 2013 18:58:36 +0000 (11:58 -0700)]
Merge pull request #584 from yashodha/CRM-12463
CRM-12463
yashodha [Tue, 30 Apr 2013 18:39:09 +0000 (00:09 +0530)]
CRM-12463
Kurund Jalmi [Tue, 30 Apr 2013 18:26:24 +0000 (11:26 -0700)]
Merge pull request #583 from yashodha/CRM-12463
CRM-12463
yashodha [Tue, 30 Apr 2013 18:20:22 +0000 (23:50 +0530)]
CRM-12463
yashodha [Tue, 30 Apr 2013 18:09:38 +0000 (23:39 +0530)]
CRM-12463
Kurund Jalmi [Tue, 30 Apr 2013 17:44:14 +0000 (10:44 -0700)]
Merge pull request #567 from dlobo/CRM-12452
CRM-12452
dlobo [Tue, 30 Apr 2013 17:41:28 +0000 (10:41 -0700)]
Merge pull request #582 from agh1/financial-types-message-4.3
clarify help text for financial accounts and types (CRM-12473)
dlobo [Tue, 30 Apr 2013 17:41:06 +0000 (10:41 -0700)]
Merge pull request #559 from agh1/2nd-membership-warning
Clarify warning for creating duplicate membership
Andrew Hunt [Tue, 30 Apr 2013 17:19:17 +0000 (13:19 -0400)]
clarify help text for fin accts and types
agh1 [Tue, 30 Apr 2013 17:12:01 +0000 (14:12 -0300)]
minor style changes
agh1 [Tue, 30 Apr 2013 17:10:25 +0000 (14:10 -0300)]
Style changes
dlobo [Tue, 30 Apr 2013 17:01:09 +0000 (10:01 -0700)]
Merge pull request #571 from agh1/bring-back-edit-petition
Edit Petition restored to as it was in 4.2
dlobo [Tue, 30 Apr 2013 16:59:52 +0000 (09:59 -0700)]
Merge pull request #575 from eileenmcnaughton/4.3
CRM-12468 preliminary tidy up - whitespace, missing ts
Tim Otten [Tue, 30 Apr 2013 16:54:02 +0000 (09:54 -0700)]
Merge pull request #579 from kurund/CRM-12357-final
CRM-12357
Kurund Jalmi [Tue, 30 Apr 2013 06:12:33 +0000 (23:12 -0700)]
fixed conflict
Kurund Jalmi [Tue, 30 Apr 2013 05:43:02 +0000 (22:43 -0700)]
worked on CRM-12357, added contact view option for mailings tab
eileen [Tue, 30 Apr 2013 04:26:13 +0000 (16:26 +1200)]
CRM-12468 add pledge next scheduled date filter
eileen [Tue, 30 Apr 2013 03:34:30 +0000 (15:34 +1200)]
CRM-12468 whitespace
eileen [Tue, 30 Apr 2013 01:07:33 +0000 (13:07 +1200)]
CRM-12468 preliminary tidy up - whitespace, missing ts
Kurund Jalmi [Tue, 30 Apr 2013 00:41:14 +0000 (17:41 -0700)]
whitespace fixes
Kurund Jalmi [Tue, 30 Apr 2013 00:17:27 +0000 (17:17 -0700)]
worked on CRM-12357, implemented getcount api
Kurund Jalmi [Mon, 29 Apr 2013 22:13:52 +0000 (15:13 -0700)]
Merge pull request #574 from twomice/CRM-12460
CRM-12460
Kurund Jalmi [Mon, 29 Apr 2013 22:12:58 +0000 (15:12 -0700)]
Merge pull request #573 from dlobo/CRM-12457
CRM-12457
Kurund Jalmi [Mon, 29 Apr 2013 22:11:00 +0000 (15:11 -0700)]
worked on CRM-12357, fixed sorting of columns
AS [Mon, 29 Apr 2013 21:56:33 +0000 (14:56 -0700)]
CRM-12460
Fixed: phpunit doesn't get mysql password from civicrm.settings.local.php
----------------------------------------
* CRM-12460: phpunit doesn't get mysql password from civicrm.settings.local.php
http://issues.civicrm.org/jira/browse/CRM-12460
Donald A. Lobo [Mon, 29 Apr 2013 21:44:58 +0000 (14:44 -0700)]
CRM-12457
----------------------------------------
* CRM-12457: Typo - 'Succesful' is spelled 'Successful'
http://issues.civicrm.org/jira/browse/CRM-12457
colemanw [Mon, 29 Apr 2013 21:30:24 +0000 (14:30 -0700)]
Merge pull request #561 from totten/upgrade-finish-reload
CRM-12371 - Don't show errors if admin refreshes post-upgrade screen.
Kurund Jalmi [Mon, 29 Apr 2013 21:08:35 +0000 (14:08 -0700)]
worked on CRM-12357, fixed pager for mailing listing in mailing tab
Tim Otten [Mon, 29 Apr 2013 20:57:39 +0000 (13:57 -0700)]
Merge pull request #572 from totten/hook-errors-redux
CRM-12370 - Fix another regression from new hook code
Tim Otten [Mon, 29 Apr 2013 20:52:39 +0000 (13:52 -0700)]
CRM-12370 - Code style
----------------------------------------
* CRM-12370: CRM_Utils_Hook::requireCiviModules() assigns infinite weight to extensions
http://issues.civicrm.org/jira/browse/CRM-12370
Tim Otten [Mon, 29 Apr 2013 20:50:50 +0000 (13:50 -0700)]
CRM-12370 - Reapply
2991458
See also: #552, #560, #570
----------------------------------------
* CRM-12370: CRM_Utils_Hook::requireCiviModules() assigns infinite weight to extensions
http://issues.civicrm.org/jira/browse/CRM-12370
Kurund Jalmi [Mon, 29 Apr 2013 20:46:15 +0000 (13:46 -0700)]
worked on CRM-12357, show bulk mailing activities if they are created.
Kurund Jalmi [Mon, 29 Apr 2013 20:39:54 +0000 (13:39 -0700)]
worked on CRM-12357, fixed generated data
Andrew Hunt [Mon, 29 Apr 2013 20:38:00 +0000 (16:38 -0400)]
Edit Petition restored to as it was in 4.2
Kurund Jalmi [Mon, 29 Apr 2013 19:44:44 +0000 (12:44 -0700)]
Merge pull request #555 from totten/givi-review-urls
givi - When pasting in PR URLs for review, accept more URLs
Kurund Jalmi [Mon, 29 Apr 2013 19:44:12 +0000 (12:44 -0700)]
Merge pull request #557 from colemanw/caseCustom
Fix custom data popup CRM-12403
Kurund Jalmi [Mon, 29 Apr 2013 19:06:59 +0000 (12:06 -0700)]
Merge pull request #563 from pratik-joshi/CRM-12404-part-1-fix
fix for CRM-12404 : "Supporter profile is not set for this Personal Camp...
Kurund Jalmi [Mon, 29 Apr 2013 18:36:37 +0000 (11:36 -0700)]
Merge pull request #564 from deepak-srivastava/hulk
Fix for CRM-12428
Kurund Jalmi [Mon, 29 Apr 2013 18:35:55 +0000 (11:35 -0700)]
Merge pull request #565 from deepak-srivastava/ninja
Fix for CRM-12431
Kurund Jalmi [Mon, 29 Apr 2013 18:35:19 +0000 (11:35 -0700)]
Merge pull request #566 from dlobo/CRM-12449
CRM-12449
Kurund Jalmi [Mon, 29 Apr 2013 18:33:18 +0000 (11:33 -0700)]
Merge pull request #569 from yashodha/4.3
CRM-12426
Kurund Jalmi [Mon, 29 Apr 2013 18:32:26 +0000 (11:32 -0700)]
Merge pull request #570 from dlobo/CRM-12416
CRM-12416 also fix warnings when running regen
Donald A. Lobo [Mon, 29 Apr 2013 18:24:35 +0000 (11:24 -0700)]
CRM-12416 also fix warnings when running regen
----------------------------------------
* CRM-12416: Database problems when installing Danish language as basic data set
http://issues.civicrm.org/jira/browse/CRM-12416
Donald A. Lobo [Mon, 29 Apr 2013 18:14:39 +0000 (11:14 -0700)]
create new generated data
yashodha [Mon, 29 Apr 2013 17:52:09 +0000 (23:22 +0530)]
CRM-12426
Donald A. Lobo [Mon, 29 Apr 2013 17:32:00 +0000 (10:32 -0700)]
CRM-12452
----------------------------------------
* CRM-12452: Cannot record activities for individuals with an apostrophe in their last name
http://issues.civicrm.org/jira/browse/CRM-12452
Donald A. Lobo [Mon, 29 Apr 2013 15:29:15 +0000 (08:29 -0700)]
CRM-12449
----------------------------------------
* CRM-12449: On the import page, the dedupe rules select isn't using the rules' names
http://issues.civicrm.org/jira/browse/CRM-12449
Deepak Srivastava [Mon, 29 Apr 2013 14:51:29 +0000 (20:21 +0530)]
Fix for CRM-12431 urls not showing up
Deepak Srivastava [Mon, 29 Apr 2013 12:47:30 +0000 (18:17 +0530)]
Fix for CRM-12428
Deepak Srivastava [Mon, 29 Apr 2013 10:51:37 +0000 (16:21 +0530)]
Fix for CRM-12431
Kurund Jalmi [Mon, 29 Apr 2013 07:54:11 +0000 (00:54 -0700)]
Merge pull request #562 from totten/allcoretables-ignore
gitignore - Hide CRM/Core/AllCoreTables.php under 4.3. (The file isn't u...
Andrew Hunt [Mon, 29 Apr 2013 06:25:33 +0000 (02:25 -0400)]
add warning on standalone add membership form
Tim Otten [Mon, 29 Apr 2013 04:54:49 +0000 (21:54 -0700)]
gitignore - Hide CRM/Core/AllCoreTables.php under 4.3. (The file isn't used in 4.3, but it comes up when switching back and forth between the 4.3 and 4.4 codebases.)
Tim Otten [Mon, 29 Apr 2013 04:44:44 +0000 (21:44 -0700)]
CRM-12371 - Don't show errors if admin refreshes post-upgrade screen.
Note: It's not possible to display the exact same messages because the session is destroyed as part of the upgrade process.
----------------------------------------
* CRM-12371: Refreshing upgrade finish page causes errors
http://issues.civicrm.org/jira/browse/CRM-12371
Andrew Hunt [Mon, 29 Apr 2013 03:30:44 +0000 (23:30 -0400)]
pop up warning when selecting member org
Tim Otten [Mon, 29 Apr 2013 02:05:32 +0000 (19:05 -0700)]
Merge pull request #558 from colemanw/comments
Update code comments
Tim Otten [Mon, 29 Apr 2013 01:46:29 +0000 (18:46 -0700)]
Merge pull request #554 from agh1/advmultiselect-narrow-clarify
add and remove labels for report role advmultiselect buttons
Coleman Watts [Mon, 29 Apr 2013 01:22:46 +0000 (18:22 -0700)]
Fn comment
Coleman Watts [Mon, 29 Apr 2013 01:14:20 +0000 (18:14 -0700)]
Update code comments
Andrew Hunt [Mon, 29 Apr 2013 00:55:38 +0000 (20:55 -0400)]
rewrite membership warning text
Coleman Watts [Sun, 28 Apr 2013 23:38:05 +0000 (16:38 -0700)]
Fix custom data popup CRM-12403
Tim Otten [Sun, 28 Apr 2013 23:23:15 +0000 (16:23 -0700)]
givi - When pasting in PR URLs for review, accept URLs from the "Commits" and "Files Changed" tabs
Tim Otten [Sun, 28 Apr 2013 22:22:40 +0000 (15:22 -0700)]
Merge pull request #538 from adamwight/list_fks
Metadata for foreign key and generic references
Andrew Hunt [Sun, 28 Apr 2013 19:14:45 +0000 (15:14 -0400)]
add and remove labels for report role advmultiselect buttons
Kurund Jalmi [Sun, 28 Apr 2013 07:37:27 +0000 (00:37 -0700)]
Merge pull request #553 from kurund/CRM-12370
worked on CRM-12370, minor typo
projects / civicrm-core.git / log