Eileen McNaughton [Mon, 16 Jun 2014 22:47:59 +0000 (10:47 +1200)]
Merge pull request #3503 from eileenmcnaughton/CRM-14866
test fix - set globals in main setup function rather than ad hoc
Eileen McNaughton [Mon, 16 Jun 2014 22:47:36 +0000 (10:47 +1200)]
test fix - set globals in main setup function rather than ad hoc
Dave Greenberg [Mon, 16 Jun 2014 18:59:17 +0000 (11:59 -0700)]
Merge pull request #3491 from fuzionnz/CRM-14854
CRM-14854. Highlight the selected price, not everything in that row.
Yashodha Chaku [Mon, 16 Jun 2014 14:41:23 +0000 (20:11 +0530)]
Merge pull request #3497 from crusonweb/patch-1
CRM-14843 fix - 3 Missing Regions in Chile
Yashodha Chaku [Mon, 16 Jun 2014 11:58:29 +0000 (17:28 +0530)]
Merge pull request #3499 from yashodha/CRM-14847
CRM-14847: notice fix
CiviCRM [Mon, 16 Jun 2014 10:39:32 +0000 (16:09 +0530)]
CRM-14847: notice fix
Dave Greenberg [Mon, 16 Jun 2014 01:47:37 +0000 (18:47 -0700)]
Merge pull request #3493 from jimyhuang/CRM-14817
CRM-14817 - Core CiviCRM - Relationship field mapping option disappear
crusonweb [Sat, 14 Jun 2014 13:31:44 +0000 (09:31 -0400)]
Update 4.5.alpha2.mysql.tpl
CRM-14843 - Add two missing regions for Chile (Los Rios and Arica y Parinacota) and update the name for Region Metropolitana de Santiago to Santiago Matropolitan for consistency.
crusonweb [Sat, 14 Jun 2014 13:24:52 +0000 (09:24 -0400)]
Update civicrm_state_province.tpl
CRM-14843 - Add two missing regions for Chile (Los Rios and Arica y Parinacota) and update the name for Region Metropolitana de Santiago to Santiago Matropolitan for consistency.
Dave Greenberg [Fri, 13 Jun 2014 17:59:40 +0000 (10:59 -0700)]
Merge pull request #3488 from colemanw/ajax
First stab at handling form-post+reload in a popup
Jimmy Huang [Fri, 13 Jun 2014 15:38:50 +0000 (23:38 +0800)]
CRM-14817 - Core CiviCRM - Relationship field mapping option disappear
----------------------------------------
* CRM-14817: Relationship field mapping option disappear after select more field
https://issues.civicrm.org/jira/browse/CRM-14817
Kurund Jalmi [Fri, 13 Jun 2014 10:27:23 +0000 (15:57 +0530)]
Merge pull request #3466 from eileenmcnaughton/code-tidies
grant xml fixes, make grant_type exportable so it's available to api, ad...
Chris Burgess [Fri, 13 Jun 2014 04:39:12 +0000 (16:39 +1200)]
CRM-14854. Highlight the selected price, not everything in that row.
Dave Greenberg [Thu, 12 Jun 2014 22:36:09 +0000 (15:36 -0700)]
Merge pull request #3489 from davecivicrm/CRM-14851
CRM-14851 - Validation of profile type for on behalf of profiles was che...
Dave Greenberg [Thu, 12 Jun 2014 22:34:49 +0000 (15:34 -0700)]
CRM-14851 - Validation of profile type for on behalf of profiles was checking the wrong profile.
----------------------------------------
* CRM-14851:
https://issues.civicrm.org/jira/browse/CRM-14851
Coleman Watts [Thu, 12 Jun 2014 20:57:41 +0000 (21:57 +0100)]
crm.ajax.js - Alow a button to prevent ajax submit
Coleman Watts [Thu, 12 Jun 2014 20:10:41 +0000 (21:10 +0100)]
First stab at handling multi-step forms in a popup
Kurund Jalmi [Thu, 12 Jun 2014 17:14:35 +0000 (22:44 +0530)]
Merge pull request #3485 from jitendrapurohit/CRM_14627
CRM-14627
Dave Greenberg [Thu, 12 Jun 2014 15:36:38 +0000 (08:36 -0700)]
Merge pull request #3486 from davecivicrm/CRM-14755
Crm 14755 - use INSERT IGNORE for state_province additions
Dave Greenberg [Thu, 12 Jun 2014 15:35:26 +0000 (08:35 -0700)]
CRM-14755 typo correcion.
----------------------------------------
* CRM-14755:
https://issues.civicrm.org/jira/browse/CRM-14755
CiviCRM [Thu, 12 Jun 2014 14:13:58 +0000 (19:43 +0530)]
CRM-14627
CiviCRM [Thu, 12 Jun 2014 14:08:13 +0000 (19:38 +0530)]
fullscreen_url updation
CiviCRM [Thu, 12 Jun 2014 13:31:54 +0000 (19:01 +0530)]
Revert "CRM-14627"
This reverts commit
f696833b2a680edb260974adb1439c1c00f2714e.
CiviCRM [Thu, 12 Jun 2014 13:17:02 +0000 (18:47 +0530)]
CRM-14627
Tim Otten [Thu, 12 Jun 2014 07:48:35 +0000 (00:48 -0700)]
Merge pull request #3483 from totten/master-sequence-postcase
CRM-14727 - Allow SequenceListener to work (even if there is no standard timeline).
totten@civicrm.org [Thu, 12 Jun 2014 07:10:44 +0000 (00:10 -0700)]
CRM-14727 - Allow SequenceListener to work (even if there is no standard timeline).
Tim Otten [Thu, 12 Jun 2014 02:31:15 +0000 (19:31 -0700)]
Merge pull request #3482 from totten/master-fts-bool
CRM-14811 - FullText - Use boolean mode with InnoDB FTS
Tim Otten [Thu, 12 Jun 2014 02:19:44 +0000 (19:19 -0700)]
CRM-14811 - FullText - Use boolean mode with InnoDB FTS
Tim Otten [Thu, 12 Jun 2014 01:36:41 +0000 (18:36 -0700)]
Merge pull request #3481 from totten/master-query-fmt-setting
CRM-14811 - FullText - Register setting ("fts_query_mode")
Tim Otten [Thu, 12 Jun 2014 01:35:36 +0000 (18:35 -0700)]
CRM-14811 - FullText - Register setting ("fts_query_mode")
Tim Otten [Thu, 12 Jun 2014 00:54:14 +0000 (17:54 -0700)]
Merge pull request #3464 from totten/master-file-search
CRM-14765 - FullText - Display file matches as paperclip icons
Tim Otten [Thu, 12 Jun 2014 00:28:52 +0000 (17:28 -0700)]
CRM-14765, CRM14811 - FullText QueryFormatter - Attempt to normalize query text
This introduces a class, CRM_Utils_QueryFormatter, which takes an inputted
query string and converts it to a more specialized query dialect (such as
SQL LIKE, MySQL FTS, or Solr). The exact conversion logic determined
by a setting ("fts_query_mode").
Dave Greenberg [Thu, 12 Jun 2014 00:13:08 +0000 (17:13 -0700)]
CRM-14755 - apply INSERT IGNORE for the state_province inserts in 4.5.
----------------------------------------
* CRM-14755:
https://issues.civicrm.org/jira/browse/CRM-14755
Dave Greenberg [Thu, 12 Jun 2014 00:02:55 +0000 (17:02 -0700)]
Merge pull request #3453 from kenwest/CRM-14813
CRM-14813 Online event rego receipt - no credit card details shown
Dave Greenberg [Wed, 11 Jun 2014 21:57:09 +0000 (14:57 -0700)]
Merge pull request #3480 from davecivicrm/CRM-14826
CRM-14826 - Add no-popup class for Custom Search links (prevents contact...
Dave Greenberg [Wed, 11 Jun 2014 21:56:26 +0000 (14:56 -0700)]
CRM-14826 - Add no-popup class for Custom Search links (prevents contact summary and edit form from loading in a popup).
----------------------------------------
* CRM-14826:
https://issues.civicrm.org/jira/browse/CRM-14826
Dave Greenberg [Wed, 11 Jun 2014 18:00:08 +0000 (11:00 -0700)]
Merge pull request #3479 from monishdeb/CRM-14627
CRM-14653 notice fix
CiviCRM [Wed, 11 Jun 2014 17:13:21 +0000 (22:43 +0530)]
CRM-14653 notice fix
----------------------------------------
* CRM-14653: Upgrade Discount Listing page for new enableDisable method
https://issues.civicrm.org/jira/browse/CRM-14653
Monish Deb [Wed, 11 Jun 2014 13:35:53 +0000 (19:05 +0530)]
Merge pull request #3465 from monishdeb/CRM-14627
This PR is partial and will submit the other half changes in my next PR. For sake of stale I am merging the PR.
Eileen McNaughton [Wed, 11 Jun 2014 08:49:48 +0000 (20:49 +1200)]
Merge pull request #3467 from jaapjansma/CRM-14832
CRM-14832 added permission check for entity relationship
Dave Greenberg [Tue, 10 Jun 2014 22:53:32 +0000 (15:53 -0700)]
civicrm.css-increase crm-hover-button.action-item font size
Action item lists under > more, and in Manage Events and Manage Contrib page selectors are too small to be readable.
Dave Greenberg [Tue, 10 Jun 2014 21:13:53 +0000 (14:13 -0700)]
Merge pull request #3473 from davecivicrm/CRM-14802
CRM-14802 - Use correct approach to localize an array of values.
Dave Greenberg [Tue, 10 Jun 2014 21:13:09 +0000 (14:13 -0700)]
CRM-14802 - Use correct approach to localize an array of values.
----------------------------------------
* CRM-14802:
https://issues.civicrm.org/jira/browse/CRM-14802
Dave Greenberg [Tue, 10 Jun 2014 21:06:01 +0000 (14:06 -0700)]
Merge pull request #3462 from lcdservices/CRM-14831
CRM-14831 check if membership type is present on contrib page to display...
Dave Greenberg [Tue, 10 Jun 2014 20:51:48 +0000 (13:51 -0700)]
Merge pull request #3472 from davecivicrm/CRM-14837
CRM-14837 - Fix CiviMember Component Preferences form.
Dave Greenberg [Tue, 10 Jun 2014 20:51:00 +0000 (13:51 -0700)]
CRM-14837 - Fix CiviMember Component Preferences form.
----------------------------------------
* CRM-14837:
https://issues.civicrm.org/jira/browse/CRM-14837
Coleman Watts [Tue, 10 Jun 2014 20:37:40 +0000 (21:37 +0100)]
API explorer tweaks
Eileen McNaughton [Tue, 10 Jun 2014 20:36:59 +0000 (08:36 +1200)]
Merge pull request #3469 from jmcclelland/paypal-ipn-test
CRM-12679 - fixing paypal ipn test so it works with latest pp code.
(causing tests to fail when you make changes is actually a good thing - it shows they care :-)
colemanw [Tue, 10 Jun 2014 19:37:48 +0000 (20:37 +0100)]
Merge pull request #3471 from colemanw/master
Fix CRM-14353 and CRM-14697
Coleman Watts [Tue, 10 Jun 2014 19:16:40 +0000 (20:16 +0100)]
CRM-14697 - Fix to make 'Add Discount Set to Fee Table' button not use ajax
Coleman Watts [Tue, 10 Jun 2014 18:56:57 +0000 (19:56 +0100)]
CRM-14353 - More accurately target visible form elements
Jamie McClelland [Tue, 10 Jun 2014 18:36:40 +0000 (14:36 -0400)]
CRM-12679 - fixing paypal ipn test so it works with latest pp code.
----------------------------------------
* CRM-12679: Paypal Express Recurring IPN not working?
https://issues.civicrm.org/jira/browse/CRM-12679
colemanw [Tue, 10 Jun 2014 17:03:42 +0000 (18:03 +0100)]
Merge pull request #3468 from colemanw/optout
JS tweaks and fixes
Coleman Watts [Tue, 10 Jun 2014 15:49:28 +0000 (16:49 +0100)]
Individual.tpl code cleanup
Coleman Watts [Tue, 10 Jun 2014 14:46:41 +0000 (15:46 +0100)]
CRM-14353 - Opt out of warnings entirely upon submit
Coleman Watts [Tue, 10 Jun 2014 14:30:24 +0000 (15:30 +0100)]
CRM-12872 - Revert next action redirect
Coleman Watts [Tue, 10 Jun 2014 13:45:05 +0000 (14:45 +0100)]
CRM-14353 - Remove references to global_formNavigate
Coleman Watts [Tue, 10 Jun 2014 13:30:40 +0000 (14:30 +0100)]
Individual.tpl code cleanup
Coleman Watts [Tue, 10 Jun 2014 13:02:42 +0000 (14:02 +0100)]
CRM-14353 - Comments and code cleanup
Coleman Watts [Tue, 10 Jun 2014 13:01:48 +0000 (14:01 +0100)]
CRM-14353 - Allow forms to opt-out of warnings
Jaap Jansma [Tue, 10 Jun 2014 10:30:29 +0000 (12:30 +0200)]
CRM-14832 added permission check for entity relationship
Eileen McNaughton [Tue, 10 Jun 2014 10:07:57 +0000 (22:07 +1200)]
grant xml fixes, make grant_type exportable so it's available to api, add unique name for grant_money_transfer_date
CiviCRM [Tue, 10 Jun 2014 07:52:11 +0000 (13:22 +0530)]
Miscellaneous fixes
Yashodha Chaku [Tue, 10 Jun 2014 05:06:53 +0000 (10:36 +0530)]
Merge pull request #3463 from yashodha/CRM-14810
CRM-14810 : fix URLs for dashlets
Tim Otten [Tue, 10 Jun 2014 04:35:18 +0000 (21:35 -0700)]
CRM-14765 - FullText - Display file matches as paperclip icons
Instead of defining a separate table for searching by file, treat files as
part of their corresponding entities. If a file matches, then display a
paperclip icon on its parent record.
Tim Otten [Tue, 10 Jun 2014 04:27:00 +0000 (21:27 -0700)]
CRM-14765 - CRM_Core_BAO_File - Allow calling paperIconAttachment for a specific file
CiviCRM [Tue, 10 Jun 2014 04:13:59 +0000 (09:43 +0530)]
CRM-14810: fix URLs for dashlets
CiviCRM [Tue, 10 Jun 2014 03:59:38 +0000 (09:29 +0530)]
CRM-14810: fix URLs for dashlets
Tim Otten [Tue, 10 Jun 2014 03:14:34 +0000 (20:14 -0700)]
CRM-14765 - FullText - Consistently use function name "moveIDs"
Tim Otten [Tue, 10 Jun 2014 02:50:13 +0000 (19:50 -0700)]
CRM-14765 - Allow fillTempTable() to return multiple pieces of information
Tim Otten [Tue, 10 Jun 2014 02:30:45 +0000 (19:30 -0700)]
CRM-14765 - FullText - Split prepareQueries / runQueries
Without this patch, changing the signature of runQueries() requires changing
the every fillTempTables() *and* every fillFooIDs().
With this patch, we can change the signature of runQueries() without changing
evey fillFooID() function.
Tim Otten [Tue, 10 Jun 2014 01:58:32 +0000 (18:58 -0700)]
CRM-14765 - CRM_Core_FileSearchInterface - Allow modules to define file-search mechanism
Brian Shaughnessy [Tue, 10 Jun 2014 02:20:35 +0000 (22:20 -0400)]
CRM-14831 check if membership type is present on contrib page to display renew link
Tim Otten [Tue, 10 Jun 2014 01:49:12 +0000 (18:49 -0700)]
CRM_Utils_SQL_Insert - Allow REPLACE INTO
Tim Otten [Mon, 9 Jun 2014 23:29:13 +0000 (16:29 -0700)]
CRM_Core_BAO_CustomGroup - Change private _getTableName() to public getTableNameByEntityName()
Based on grep, it appears that _getTableName() is never used, and it's
unlikely to be used by third-party code (considering that it's "private").
Tim Otten [Mon, 9 Jun 2014 23:28:42 +0000 (16:28 -0700)]
CRM_Core_BAO_File - Fix warnings
Tim Otten [Mon, 9 Jun 2014 23:23:26 +0000 (16:23 -0700)]
Merge pull request #3460 from totten/master-file-cleanup
CRM_Core_BAO_File - Cleanup / indentation
Tim Otten [Mon, 9 Jun 2014 23:22:32 +0000 (16:22 -0700)]
CRM_Core_BAO_File - Cleanup / indentation
Dave Greenberg [Mon, 9 Jun 2014 22:13:37 +0000 (15:13 -0700)]
Merge pull request #3452 from kenwest/CRM-14812
CRM-14812 Campaign Survey Dtls Rpt fails if Interviewer name displayed
Tim Otten [Mon, 9 Jun 2014 22:03:36 +0000 (15:03 -0700)]
Merge pull request #3458 from lcdservices/CRM-14826
CRM-14826 preserve context with custom search results
Eileen McNaughton [Mon, 9 Jun 2014 20:25:28 +0000 (08:25 +1200)]
Merge pull request #3459 from jmcclelland/paypal-express-recur-master
Merging - this code has been in use for a long time!
Jamie McClelland [Wed, 19 Mar 2014 20:48:11 +0000 (16:48 -0400)]
CRM-12679 - use properly FinancialType DAO call for 4.4
----------------------------------------
* CRM-12679: Paypal Express Recurring IPN not working?
http://issues.civicrm.org/jira/browse/CRM-12679
Jamie McClelland [Wed, 19 Mar 2014 16:15:35 +0000 (12:15 -0400)]
CRM-12679 - ensure IPN works when you use paypal express button
----------------------------------------
* CRM-12679: Paypal Express Recurring IPN not working?
http://issues.civicrm.org/jira/browse/CRM-12679
Brian Shaughnessy [Mon, 9 Jun 2014 19:05:20 +0000 (15:05 -0400)]
CRM-14826 preserve context with custom search results
colemanw [Mon, 9 Jun 2014 16:27:01 +0000 (17:27 +0100)]
Merge pull request #3457 from colemanw/profiles
Popup and form fixes
Coleman Watts [Mon, 9 Jun 2014 15:58:57 +0000 (16:58 +0100)]
CRM-14353 - More accurate comparison with multiselects and excluding buttons
Coleman Watts [Mon, 9 Jun 2014 13:59:53 +0000 (14:59 +0100)]
Ensure scrollbars are restored when closing modal dialog
Coleman Watts [Mon, 9 Jun 2014 13:51:00 +0000 (14:51 +0100)]
CRM-14690 - Target correct button for undo action
Coleman Watts [Mon, 9 Jun 2014 13:50:18 +0000 (14:50 +0100)]
CRM-14690 - Use correct action name for submit button
Coleman Watts [Mon, 9 Jun 2014 12:20:49 +0000 (13:20 +0100)]
Remove stray debug statement
Yashodha Chaku [Mon, 9 Jun 2014 09:32:54 +0000 (15:02 +0530)]
Merge pull request #3456 from yashodha/CRM-14806
fix recently visited link for activity
CiviCRM [Mon, 9 Jun 2014 09:35:57 +0000 (15:05 +0530)]
fix recently visited link for activity
Yashodha Chaku [Mon, 9 Jun 2014 08:52:41 +0000 (14:22 +0530)]
Merge pull request #3440 from NileemaJadhav/CRM-master
--Fix fatal error for case assignee change from case dashboard
colemanw [Sun, 8 Jun 2014 08:30:51 +0000 (09:30 +0100)]
Merge pull request #3421 from colemanw/search
CRM-12872 - Search js fixes and improvements
Tim Otten [Sun, 8 Jun 2014 00:07:25 +0000 (17:07 -0700)]
Merge pull request #3451 from totten/master-fts-idx
CRM-14811 - Full Text Search - Optional optimizations for MySQL 5.6+
Tim Otten [Sun, 8 Jun 2014 00:05:27 +0000 (17:05 -0700)]
CRM-14811 - AbstractPartialQuery - Doc tweak
Dave Greenberg [Sat, 7 Jun 2014 18:02:40 +0000 (11:02 -0700)]
Merge pull request #3367 from kirkatcaat/empty-labels-on-profile-fields
CRM-14747 - Profiles - Fixed error caused by profile fields with empty labels
Dave Greenberg [Sat, 7 Jun 2014 17:43:34 +0000 (10:43 -0700)]
Merge pull request #3447 from monishdeb/CRM-14800
CRM-14800 fix - Contact merge deletes a contribution record if it is linked to a membership being merged
Dave Greenberg [Sat, 7 Jun 2014 17:02:39 +0000 (10:02 -0700)]
Merge pull request #3445 from systopia/master
CRM-14802 fixed missing ts tags in mailing form and member dashboard
Dave Greenberg [Sat, 7 Jun 2014 16:52:55 +0000 (09:52 -0700)]
Merge pull request #3446 from systopia/CRM-14804
CRM-14804 order participant statuses by weighting
projects / civicrm-core.git / log