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
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
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
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
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:11:00 +0000 (15:11 -0700)]
worked on CRM-12357, fixed sorting of columns
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
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
Donald A. Lobo [Mon, 29 Apr 2013 18:14:39 +0000 (11:14 -0700)]
create new generated data
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
Kurund Jalmi [Sun, 28 Apr 2013 04:50:30 +0000 (21:50 -0700)]
Merge pull request #551 from kurund/CRM-11583
fixed generated data
kurund [Sun, 28 Apr 2013 04:45:45 +0000 (10:15 +0530)]
fixed generated data
Kurund Jalmi [Sun, 28 Apr 2013 01:40:00 +0000 (18:40 -0700)]
Merge pull request #512 from adamwight/annotate_codegen/CRM-11583
Annotate generated files with the source file
Kurund Jalmi [Fri, 26 Apr 2013 16:47:04 +0000 (09:47 -0700)]
Merge pull request #537 from adamwight/dedupe_apis
Minor cleanup in Dedupe
Kurund Jalmi [Fri, 26 Apr 2013 16:31:04 +0000 (09:31 -0700)]
Merge pull request #545 from ravishnair/CRM-9069
-- fix for CRM-9069
Ravish Nair [Fri, 26 Apr 2013 08:11:29 +0000 (13:41 +0530)]
-- fix for CRM-9069
Adam Roses Wight [Wed, 24 Apr 2013 23:16:40 +0000 (16:16 -0700)]
DAO function to list all foreign key references to a table
This patch also begins to formally describe the entity_id/entity_table
references, introducing a new first-class object CRM_Core_EntityReference.
We still need some way to describe the restrictions on the possible values of
entity_table for each DAO, so that findReferences() doesn't have to scan
all tables using a generic pointer.
Note that I've broken compatibility with PEAR links(), this would be
easy to reimplement if we need, but it was not being unused in core.
Adam Roses Wight [Tue, 23 Apr 2013 23:56:57 +0000 (16:56 -0700)]
Maintain a list of core DAOs
This is an improvement on CRM/Core/DAO/listAll.php, wrapping in a class
and making the table names available as well.
Adam Roses Wight [Wed, 24 Apr 2013 22:36:18 +0000 (15:36 -0700)]
Test should have been named DedupeFinderTest
Adam Roses Wight [Wed, 24 Apr 2013 22:21:14 +0000 (15:21 -0700)]
Get contact fields from the schema
Kurund Jalmi [Wed, 24 Apr 2013 22:31:42 +0000 (15:31 -0700)]
Merge pull request #534 from yashodha/CRM-12410
Crm 12410
Kurund Jalmi [Wed, 24 Apr 2013 22:29:58 +0000 (15:29 -0700)]
Merge pull request #535 from yashodha/activity-migration
Activity migration
yashodha [Wed, 24 Apr 2013 18:27:03 +0000 (23:57 +0530)]
fix test for activity
yashodha [Tue, 23 Apr 2013 23:10:46 +0000 (04:40 +0530)]
notice fix
yashodha [Wed, 24 Apr 2013 17:23:57 +0000 (22:53 +0530)]
more cleanup
yashodha [Wed, 24 Apr 2013 17:08:19 +0000 (22:38 +0530)]
more activity clean up
dlobo [Wed, 24 Apr 2013 00:35:54 +0000 (17:35 -0700)]
Merge pull request #530 from dlobo/CRM-12274
CRM-12274
Donald A. Lobo [Wed, 24 Apr 2013 00:32:44 +0000 (17:32 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
Kurund Jalmi [Wed, 24 Apr 2013 00:25:02 +0000 (17:25 -0700)]
Merge pull request #526 from yashodha/CRM-12410
CRM-12410
yashodha [Tue, 23 Apr 2013 23:48:54 +0000 (05:18 +0530)]
CRM-12410
Tim Otten [Tue, 23 Apr 2013 23:40:52 +0000 (16:40 -0700)]
Merge pull request #519 from colbyw/fixBootstrap
CRM-10360 - REST API will now bootstrap when call submitted with entity/action params.
dlobo [Tue, 23 Apr 2013 22:43:14 +0000 (15:43 -0700)]
Merge pull request #521 from yashodha/activity-migration
update fix for source
dlobo [Tue, 23 Apr 2013 22:38:59 +0000 (15:38 -0700)]
Merge pull request #520 from dlobo/CRM-12274
CRM-12274
Donald A. Lobo [Tue, 23 Apr 2013 22:37:43 +0000 (15:37 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
Donald A. Lobo [Tue, 23 Apr 2013 22:36:20 +0000 (15:36 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
yashodha [Tue, 23 Apr 2013 22:35:22 +0000 (04:05 +0530)]
update fix for source
Colby Warkentin [Tue, 23 Apr 2013 22:23:49 +0000 (15:23 -0700)]
CRM-10360 - REST API will now bootstrap when call submitted with entity/action params.
----------------------------------------
* CRM-10360: Hook doesn't run with v3 API extern REST interface
http://issues.civicrm.org/jira/browse/CRM-10360
Tim Otten [Tue, 23 Apr 2013 22:20:45 +0000 (15:20 -0700)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-23-15-17-29
Conflicts:
CRM/Core/BAO/ActionSchedule.php
sql/civicrm_generated.mysql
xml/version.xml
dlobo [Tue, 23 Apr 2013 22:04:50 +0000 (15:04 -0700)]
Merge pull request #517 from dlobo/CRM-12274
CRM-12274
Donald A. Lobo [Tue, 23 Apr 2013 22:03:50 +0000 (15:03 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
Kurund Jalmi [Tue, 23 Apr 2013 22:02:17 +0000 (15:02 -0700)]
Merge pull request #516 from yashodha/activity-migration
Activity migration
yashodha [Tue, 23 Apr 2013 22:00:38 +0000 (03:30 +0530)]
api fixes
yashodha [Tue, 23 Apr 2013 21:00:05 +0000 (02:30 +0530)]
CRM-12274
Kurund Jalmi [Tue, 23 Apr 2013 21:51:46 +0000 (14:51 -0700)]
Merge pull request #515 from kurund/CRM-12395
verified the work on CRM-12395
Kurund Jalmi [Tue, 23 Apr 2013 21:48:56 +0000 (14:48 -0700)]
verified the work on CRM-12395
dlobo [Tue, 23 Apr 2013 21:28:16 +0000 (14:28 -0700)]
Merge pull request #513 from dlobo/master
Get CRM tests working with activity changes
Donald A. Lobo [Tue, 23 Apr 2013 21:26:28 +0000 (14:26 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
Donald A. Lobo [Tue, 23 Apr 2013 21:25:01 +0000 (14:25 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
Adam Roses Wight [Tue, 23 Apr 2013 19:18:47 +0000 (12:18 -0700)]
Annotate generated files with the source filename
Also renamed some schema files which did not match their classnames--
there might be others.
CRM-11583
dlobo [Tue, 23 Apr 2013 20:28:57 +0000 (13:28 -0700)]
Merge pull request #510 from adamwight/respect_includeOrderByClause
Respect includeOrderByClause in quicksearch
dlobo [Tue, 23 Apr 2013 19:36:07 +0000 (12:36 -0700)]
Merge pull request #511 from dlobo/CRM-12274
CRM-12274
Donald A. Lobo [Tue, 23 Apr 2013 19:35:04 +0000 (12:35 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
Kurund Jalmi [Tue, 23 Apr 2013 19:28:57 +0000 (12:28 -0700)]
Merge pull request #481 from dlobo/CRM-12368
CRM-12368
Adam Roses Wight [Thu, 11 Apr 2013 23:30:03 +0000 (16:30 -0700)]
Respect includeOrderByClause in quicksearch
CRM-12326 Name search is not using indexes correctly
Kurund Jalmi [Tue, 23 Apr 2013 18:06:01 +0000 (11:06 -0700)]
Merge pull request #509 from yashodha/CRM-12401
CRM-12401
yashodha [Tue, 23 Apr 2013 17:37:20 +0000 (23:07 +0530)]
CRM-12401
yashodha [Tue, 23 Apr 2013 17:25:34 +0000 (22:55 +0530)]
CRM-12401
Kurund Jalmi [Tue, 23 Apr 2013 16:01:34 +0000 (09:01 -0700)]
Merge pull request #506 from ravishnair/CRM-12292
-- fix for CRM-12292
Kurund Jalmi [Tue, 23 Apr 2013 15:58:01 +0000 (08:58 -0700)]
Merge pull request #507 from deepak-srivastava/mastro
Improvments in demo management scripts
dlobo [Tue, 23 Apr 2013 15:50:59 +0000 (08:50 -0700)]
Merge pull request #508 from dlobo/CRM-12274
CRM-12274
Donald A. Lobo [Tue, 23 Apr 2013 15:49:01 +0000 (08:49 -0700)]
CRM-12274
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
Deepak Srivastava [Tue, 23 Apr 2013 15:41:54 +0000 (21:11 +0530)]
Improvments in demo management scripts
Ravish Nair [Tue, 23 Apr 2013 06:55:25 +0000 (12:25 +0530)]
-- fix for CRM-12292
Kurund Jalmi [Tue, 23 Apr 2013 05:21:53 +0000 (22:21 -0700)]
Merge pull request #504 from yashodha/more-work
CRM-12274
yashodha [Tue, 23 Apr 2013 05:16:44 +0000 (10:46 +0530)]
CRM-12274
Kurund Jalmi [Tue, 23 Apr 2013 05:08:20 +0000 (22:08 -0700)]
Merge pull request #505 from eileenmcnaughton/4.3
CRM-12405 - patch for additional logging on failed IPN calls
yashodha [Tue, 23 Apr 2013 04:58:14 +0000 (10:28 +0530)]
CRM-12274
eileen [Tue, 23 Apr 2013 00:43:33 +0000 (12:43 +1200)]
CRM-12405 - patch for additional logging on failed IPN calls
yashodha [Tue, 23 Apr 2013 00:58:43 +0000 (06:28 +0530)]
CRM-12274
Kurund Jalmi [Mon, 22 Apr 2013 22:35:21 +0000 (15:35 -0700)]
Merge pull request #500 from yashodha/more-work
CRM-12357
Kurund Jalmi [Mon, 22 Apr 2013 22:34:41 +0000 (15:34 -0700)]
Merge pull request #501 from totten/selenium-remote
CRM-11948 - Apply patch for running with a remote Selenium server.
Kurund Jalmi [Mon, 22 Apr 2013 22:34:14 +0000 (15:34 -0700)]
Merge pull request #502 from colemanw/versionCheck
Shorter cache duration for versionCheck
Kurund Jalmi [Mon, 22 Apr 2013 22:33:48 +0000 (15:33 -0700)]
Merge pull request #503 from dlobo/CRM-12396
CRM-12396
Kurund Jalmi [Mon, 22 Apr 2013 22:33:08 +0000 (15:33 -0700)]
Merge pull request #499 from deepak-srivastava/ninja
Fix for CRM-12391
Donald A. Lobo [Mon, 22 Apr 2013 21:55:38 +0000 (14:55 -0700)]
CRM-12396
----------------------------------------
* CRM-12396: tokens in html not transformed
http://issues.civicrm.org/jira/browse/CRM-12396
Coleman Watts [Mon, 22 Apr 2013 17:20:08 +0000 (10:20 -0700)]
Shorter cache duration for versionCheck
Tim Otten [Mon, 22 Apr 2013 17:06:25 +0000 (10:06 -0700)]
CRM-11948 - Apply patch for running with a remote Selenium server. (This isn't currently/strictly needed for CRM-11948 but was previously written for it -- and it's come up in other contexts.)
----------------------------------------
* CRM-11948: Run WebTests under Jenkins
http://issues.civicrm.org/jira/browse/CRM-11948
projects / civicrm-core.git / log