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
Kurund Jalmi [Sun, 28 Apr 2013 07:36:17 +0000 (00:36 -0700)]
worked on CRM-12370, minor typo
Kurund Jalmi [Sun, 28 Apr 2013 07:32:31 +0000 (00:32 -0700)]
Merge pull request #552 from kurund/CRM-12370
worked on CRM-12370, add civicrm modules after main civicrm drupal modul...
Kurund Jalmi [Sun, 28 Apr 2013 07:30:16 +0000 (00:30 -0700)]
worked on CRM-12370, add civicrm modules after main civicrm drupal module
Kurund Jalmi [Sun, 28 Apr 2013 04:51:00 +0000 (21:51 -0700)]
Merge pull request #549 from dlobo/CRM-12424
CRM-12430
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 04:44:34 +0000 (21:44 -0700)]
Merge pull request #550 from dlobo/CRM-12430
CRM-12430
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
Tim Otten [Sat, 27 Apr 2013 16:18:14 +0000 (09:18 -0700)]
Merge pull request #548 from totten/joomla-fmt
CRM_Utils_Hook_Joomla - Formatting
Tim Otten [Sat, 27 Apr 2013 16:06:41 +0000 (09:06 -0700)]
CRM_Utils_Hook_Joomla - Formatting
Donald A. Lobo [Fri, 26 Apr 2013 19:17:42 +0000 (12:17 -0700)]
CRM-12430
----------------------------------------
* CRM-12430: CRM_Mailing_BAO_Mailing:create changes all mailing settings back to default
http://issues.civicrm.org/jira/browse/CRM-12430
Donald A. Lobo [Fri, 26 Apr 2013 18:08:06 +0000 (11:08 -0700)]
CRM-12430
----------------------------------------
* CRM-12430: CRM_Mailing_BAO_Mailing:create changes all mailing settings back to default
http://issues.civicrm.org/jira/browse/CRM-12430
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
Pratik Joshi [Fri, 26 Apr 2013 15:42:55 +0000 (21:12 +0530)]
fix for CRM-12404 : "Supporter profile is not set for this Personal Campaign Page or the profile is disabled. Please contact the site administrator if you need assistance."
Kurund Jalmi [Fri, 26 Apr 2013 14:10:55 +0000 (07:10 -0700)]
Merge pull request #547 from deepak-srivastava/ninja
CRM-12427 Fixes and patch
Deepak Srivastava [Fri, 26 Apr 2013 10:23:06 +0000 (15:53 +0530)]
CRM-12427 Fixes and patch
Ravish Nair [Fri, 26 Apr 2013 08:11:29 +0000 (13:41 +0530)]
-- fix for CRM-9069
Kurund Jalmi [Fri, 26 Apr 2013 05:44:25 +0000 (22:44 -0700)]
Merge pull request #539 from kurund/CRM-12407
CRM-12407
Kurund Jalmi [Thu, 25 Apr 2013 22:28:03 +0000 (15:28 -0700)]
Merge pull request #531 from colemanw/versionCompare
Use php version_compare function instead of our own
Kurund Jalmi [Thu, 25 Apr 2013 22:27:30 +0000 (15:27 -0700)]
Merge pull request #540 from yashodha/CRM-12401
added test for reminder for the condition(CRM-12401)
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.
yashodha [Wed, 24 Apr 2013 23:36:44 +0000 (05:06 +0530)]
added test for reminder for the condition(CRM-12401)
Kurund Jalmi [Wed, 24 Apr 2013 23:12:32 +0000 (16:12 -0700)]
worked on CRM-12407, ajax events are fired for each of the multiple of
data instance simultaneously this causes race condition and casuses
random breaks, hence changing ajax request to use async mode.
Kurund Jalmi [Wed, 24 Apr 2013 23:00:48 +0000 (16:00 -0700)]
code cleanup
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:34:04 +0000 (15:34 -0700)]
Merge pull request #532 from deepak-srivastava/ninja
Fix for CRM-12409
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
Kurund Jalmi [Wed, 24 Apr 2013 22:29:00 +0000 (15:29 -0700)]
Merge pull request #536 from colemanw/quickFix
Fix undefined variable
Coleman Watts [Wed, 24 Apr 2013 22:26:57 +0000 (15:26 -0700)]
Fix undefined variable
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
Deepak Srivastava [Wed, 24 Apr 2013 07:02:25 +0000 (12:32 +0530)]
Fix for CRM-12409
Coleman Watts [Wed, 24 Apr 2013 04:01:34 +0000 (21:01 -0700)]
Use php version_compare function instead of our own
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:28:07 +0000 (17:28 -0700)]
Merge pull request #529 from kurund/group-cache
code cleanup
Kurund Jalmi [Wed, 24 Apr 2013 00:26:43 +0000 (17:26 -0700)]
code cleanup
Kurund Jalmi [Wed, 24 Apr 2013 00:25:02 +0000 (17:25 -0700)]
Merge pull request #526 from yashodha/CRM-12410
CRM-12410
Kurund Jalmi [Wed, 24 Apr 2013 00:23:30 +0000 (17:23 -0700)]
Merge pull request #528 from lcdservices/joomla-3.0-cli
CRM-12096 joomla 3.0 support cli
Kurund Jalmi [Wed, 24 Apr 2013 00:18:55 +0000 (17:18 -0700)]
Merge pull request #522 from lcdservices/4.3
CRM-12096 support joomla 3.0 ACL config
Brian Shaughnessy [Wed, 24 Apr 2013 00:13:59 +0000 (20:13 -0400)]
CRM-12096 joomla 3.0 support cli
Kurund Jalmi [Tue, 23 Apr 2013 23:49:14 +0000 (16:49 -0700)]
Merge pull request #525 from dlobo/URLFixes
fix url to point to book
yashodha [Tue, 23 Apr 2013 23:48:54 +0000 (05:18 +0530)]
CRM-12410
Donald A. Lobo [Tue, 23 Apr 2013 23:42:23 +0000 (16:42 -0700)]
fix url to point to book
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.
Brian Shaughnessy [Tue, 23 Apr 2013 23:26:57 +0000 (19:26 -0400)]
CRM-12096 joomla 3.0 css tweak
Brian Shaughnessy [Tue, 23 Apr 2013 23:18:08 +0000 (19:18 -0400)]
CRM-12096 support joomla 3.0 ACL config
Kurund Jalmi [Tue, 23 Apr 2013 22:50:26 +0000 (15:50 -0700)]
Merge pull request #518 from totten/merge-forward-mktemp
merge-forward: Fix for OS X mktemp
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
Tim Otten [Tue, 23 Apr 2013 22:11:23 +0000 (15:11 -0700)]
merge-forward: Fix for OS X mktemp
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
projects / civicrm-core.git / log