Dave Greenberg [Thu, 19 Feb 2015 19:49:34 +0000 (11:49 -0800)]
Merge pull request #5196 from totten/master-wizard-ts
CRM-15705 - crmUiWizard - Label and translate previous/next buttons
Tim Otten [Thu, 19 Feb 2015 18:23:11 +0000 (10:23 -0800)]
CRM-15705 - crmUiWizard - Label and translate previous/next buttons
Dave Greenberg [Wed, 18 Feb 2015 19:47:37 +0000 (11:47 -0800)]
Merge pull request #5193 from totten/master-civimail-footer
CRM-15578 - Mailing API - Fix bug with resaving mailings
Tim Otten [Wed, 18 Feb 2015 18:03:26 +0000 (10:03 -0800)]
CRM-15578 - Mailing API - Fix bug with resaving mailings
The bug manifested as failure to validate the required tokens. When
submitting (resaving with scheduled_date, etal), the BAO's create() function
incorrectly applied defaults and overwrote the value of footer_id (among
others) -- which subsequently caused checkSendable() to fail.
Kurund Jalmi [Wed, 18 Feb 2015 16:36:36 +0000 (22:06 +0530)]
Merge pull request #5191 from pratikshad/FixedWebtest3
Fixed webtest for member and contact
colemanw [Wed, 18 Feb 2015 15:40:55 +0000 (10:40 -0500)]
Merge pull request #5190 from JKingsnorth/CRM-15985
CRM-15985 Update debugging page text
colemanw [Wed, 18 Feb 2015 15:14:16 +0000 (10:14 -0500)]
Merge pull request #5180 from monishdeb/master
CRM-15889 fix - Relationship enable/disable through API & the UI - does ...
JKingsnorth [Wed, 18 Feb 2015 09:39:55 +0000 (09:39 +0000)]
Update debugging page text
pratikshad [Wed, 18 Feb 2015 09:17:20 +0000 (19:17 +1000)]
Fixed webtest for member and contact
CiviCRM [Wed, 18 Feb 2015 08:09:59 +0000 (00:09 -0800)]
Update version to 4.6.beta1
Tim Otten [Wed, 18 Feb 2015 04:46:56 +0000 (20:46 -0800)]
Merge pull request #5184 from totten/master-abtest-list
CRM-15970 - crmMailingAB - Sort & filter. Cleanup metadata.
Tim Otten [Wed, 18 Feb 2015 01:28:00 +0000 (17:28 -0800)]
Regen sql/civicrm_generated.mysql
Tim Otten [Wed, 18 Feb 2015 01:30:09 +0000 (17:30 -0800)]
CRM-15970 - crmMailingAB - Use new testing_criteria and winner_criteria fields
Tim Otten [Wed, 18 Feb 2015 01:06:29 +0000 (17:06 -0800)]
CRM-15970 - Convert A/B test option-groups to simple arrays (backend)
Tim Otten [Tue, 17 Feb 2015 22:05:26 +0000 (14:05 -0800)]
CRM-15970 - crmMailingAB - Add support for filtering and sorting
Tim Otten [Tue, 17 Feb 2015 23:51:53 +0000 (15:51 -0800)]
CRM-15970 - crmUiOrder - Add directives for managing sort order.
Tim Otten [Mon, 16 Feb 2015 21:33:12 +0000 (13:33 -0800)]
CRM-15970 - Add MailingAB fields, "created_id" and "created_date"
Tim Otten [Mon, 16 Feb 2015 21:54:42 +0000 (13:54 -0800)]
MailingAB.submit - Fix getfields
Tim Otten [Mon, 16 Feb 2015 21:34:12 +0000 (13:34 -0800)]
MailingAB.xml - Fix versions
Dave Greenberg [Wed, 18 Feb 2015 01:35:05 +0000 (17:35 -0800)]
Merge pull request #5174 from joannechester/patch-2
CRM-15962
Dave Greenberg [Wed, 18 Feb 2015 01:23:25 +0000 (17:23 -0800)]
Merge pull request #5123 from eileenmcnaughton/CRM-15369
CRM-15369 recurring wording improvements
Eileen McNaughton [Tue, 17 Feb 2015 22:24:48 +0000 (11:24 +1300)]
CRM-15369 recurring wording follow up fix
colemanw [Tue, 17 Feb 2015 18:41:30 +0000 (13:41 -0500)]
Merge pull request #5186 from colemanw/CRM-15981
CRM-15981 - Fix case activity revision table
monishdeb [Tue, 17 Feb 2015 06:43:57 +0000 (12:13 +0530)]
added doc
Tim Otten [Tue, 17 Feb 2015 04:31:40 +0000 (20:31 -0800)]
Merge pull request #5185 from colemanw/revertExamples
Revert examples causing test failures
Coleman Watts [Tue, 17 Feb 2015 02:40:58 +0000 (21:40 -0500)]
CRM-15981 - Fix case activity revision table
Coleman Watts [Mon, 16 Feb 2015 22:28:07 +0000 (17:28 -0500)]
Revert examples causing test failures
Tim Otten [Mon, 16 Feb 2015 22:08:39 +0000 (14:08 -0800)]
Merge pull request #5183 from totten/master-civimail-misc3
CRM-15857 - crmMetadata - Use 'sequential' so that options are returned in ordered format
Tim Otten [Sun, 15 Feb 2015 00:41:16 +0000 (16:41 -0800)]
CRM-15857 - crmMetadata - Use 'sequential' so that options are returned in ordered format
colemanw [Mon, 16 Feb 2015 20:36:49 +0000 (15:36 -0500)]
Merge pull request #5179 from eileenmcnaughton/CRM-15798-master
CRM-15978 remove enotice introduced in last commit
colemanw [Mon, 16 Feb 2015 19:45:24 +0000 (14:45 -0500)]
Merge pull request #5182 from colemanw/Cleanup
Cleanup api generated example docblocks
Coleman Watts [Mon, 16 Feb 2015 18:49:29 +0000 (13:49 -0500)]
Merge branch 4.5 into master
Coleman Watts [Mon, 16 Feb 2015 18:11:31 +0000 (13:11 -0500)]
Cleanup api generated example docblocks
colemanw [Mon, 16 Feb 2015 18:19:05 +0000 (13:19 -0500)]
Merge pull request #5181 from monishdeb/CRM-15964
CRM-15964 fix - Tabbed custom data for contact subtypes don't save
monishdeb [Mon, 16 Feb 2015 14:41:43 +0000 (20:11 +0530)]
CRM-15964 fix - Tabbed custom data for contact subtypes don't save
https://issues.civicrm.org/jira/browse/CRM-15964
monishdeb [Mon, 16 Feb 2015 14:34:19 +0000 (20:04 +0530)]
CRM-15889 fix - Relationship enable/disable through API & the UI - does not take care of inherited memberships
https://issues.civicrm.org/jira/browse/CRM-15889
Eileen McNaughton [Mon, 16 Feb 2015 12:54:09 +0000 (01:54 +1300)]
CRM-15978 remove enotice introduced in last commit
Eileen McNaughton [Mon, 16 Feb 2015 12:51:23 +0000 (01:51 +1300)]
Tidy up - put civiExit in calling class
Kurund Jalmi [Mon, 16 Feb 2015 12:51:05 +0000 (18:21 +0530)]
Merge pull request #5177 from atif-shaikh/CRM-15745NoticFix
CRM-15745 - Notice Fixes
kurund [Mon, 16 Feb 2015 12:46:40 +0000 (18:16 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-16-17-51-20
Conflicts:
CRM/Upgrade/Incremental/php/FourFour.php
Kurund Jalmi [Mon, 16 Feb 2015 11:57:03 +0000 (17:27 +0530)]
Merge pull request #5169 from PalanteJon/CRM-15745
CRM-15745 - Free events with confirmation screen bypass waitlist/approval process
atif-shaikh [Mon, 16 Feb 2015 11:30:32 +0000 (17:00 +0530)]
CRM-15745 - Notice Fixes
----------------------------------------
* CRM-15745: "Require Participant Approval" fails on unpaid events w/ confirm screen
https://issues.civicrm.org/jira/browse/CRM-15745
Eileen McNaughton [Mon, 16 Feb 2015 07:08:20 +0000 (20:08 +1300)]
Merge pull request #5175 from eileenmcnaughton/CRM-15978
CRM-15978 remove redundant test_mode check in ipn callback
Monish Deb [Mon, 16 Feb 2015 05:59:05 +0000 (11:29 +0530)]
Merge pull request #5162 from jitendrapurohit/CRM-15936
Initial new user open CiviCRM base page hangs fix CRM-15936
Monish Deb [Mon, 16 Feb 2015 05:57:55 +0000 (11:27 +0530)]
Merge pull request #5152 from pratikshad/CRM-15935
CRM-15935 Fixed issue of Lybunt report includes people who made no contr...
Eileen McNaughton [Mon, 16 Feb 2015 03:46:24 +0000 (16:46 +1300)]
CRM-15978 remove redundant test_mode check
Eileen McNaughton [Mon, 16 Feb 2015 03:45:36 +0000 (16:45 +1300)]
partial tidy up of comment blocks in file
pratikshad [Mon, 16 Feb 2015 00:11:55 +0000 (10:11 +1000)]
CRM-15935 Fixed warning
----------------------------------------
* CRM-15935: Lybunt report includes people who made no contributions
https://issues.civicrm.org/jira/browse/CRM-15935
pratikshad [Thu, 12 Feb 2015 09:02:37 +0000 (19:02 +1000)]
CRM-15935 Fixed issue of Lybunt report includes people who made no contributions
----------------------------------------
* CRM-15935: Lybunt report includes people who made no contributions
https://issues.civicrm.org/jira/browse/CRM-15935
joannechester [Sun, 15 Feb 2015 23:49:10 +0000 (10:49 +1100)]
CRM-15962
colemanw [Sun, 15 Feb 2015 22:15:27 +0000 (17:15 -0500)]
Merge pull request #5171 from colemanw/cleanup
Icon & css cleanup
Coleman Watts [Sun, 15 Feb 2015 20:20:17 +0000 (15:20 -0500)]
Css cleanup & remove redundant selectors
Coleman Watts [Sun, 15 Feb 2015 19:32:03 +0000 (14:32 -0500)]
Fix contact actions list
Coleman Watts [Sun, 15 Feb 2015 19:24:50 +0000 (14:24 -0500)]
Icon cleanup
Kurund Jalmi [Sun, 15 Feb 2015 16:25:52 +0000 (21:55 +0530)]
Merge pull request #5170 from kurund/CRM-15909
CRM-15909, report fixes
kurund [Sun, 15 Feb 2015 15:29:34 +0000 (20:59 +0530)]
CRM-15909, report fixes
----------------------------------------
* CRM-15909: Country name is not shown in report Constituent Summary
https://issues.civicrm.org/jira/browse/CRM-15909
Kurund Jalmi [Sun, 15 Feb 2015 13:38:09 +0000 (19:08 +0530)]
Merge pull request #5168 from PalanteJon/CRM-15921
CRM-15921 - CiviReport - Membership Detail Report - don't automatically ...
Kurund Jalmi [Sun, 15 Feb 2015 13:24:55 +0000 (18:54 +0530)]
Merge pull request #5159 from atif-shaikh/CRM-15897
Crm 15897
Jon goldberg [Sun, 15 Feb 2015 04:32:48 +0000 (23:32 -0500)]
CRM-15745 - CiviEvent - define $pending earlier in postProcess to avoid an 'undefined variable' error in certain flows
Jon goldberg [Sun, 15 Feb 2015 04:13:46 +0000 (23:13 -0500)]
CRM-15745 - CiviEvent - free events with confirmation screen bypass waitlist/approval process
Jon goldberg [Sun, 15 Feb 2015 03:04:04 +0000 (22:04 -0500)]
CRM-15921 - CiviReport - Membership Detail Report - don't automatically group memberships by contact and type
colemanw [Sun, 15 Feb 2015 02:58:09 +0000 (21:58 -0500)]
Merge pull request #5167 from colemanw/CRM-15705
CRM-15705 - Fix menu closing
Coleman Watts [Sun, 15 Feb 2015 02:49:17 +0000 (21:49 -0500)]
CRM-15705 - Fix menu closing
colemanw [Sun, 15 Feb 2015 02:32:35 +0000 (21:32 -0500)]
Merge pull request #5166 from colemanw/CRM-15705
CRM-15705 - Mailing UI style improvements
Coleman Watts [Sun, 15 Feb 2015 02:22:01 +0000 (21:22 -0500)]
CRM-15705 - Match preview iframe size with dialog
Coleman Watts [Sun, 15 Feb 2015 00:08:02 +0000 (19:08 -0500)]
CRM-15705 - Set ui dialog defaults in Angular
Coleman Watts [Sat, 14 Feb 2015 20:12:49 +0000 (15:12 -0500)]
CRM-15705 - Style preview buttons and fix text preview conditions
Coleman Watts [Sat, 14 Feb 2015 20:06:29 +0000 (15:06 -0500)]
CRM-15705 - Style mailing submit button
Coleman Watts [Sat, 14 Feb 2015 15:05:12 +0000 (10:05 -0500)]
CRM-15705 - Use element title as default in crmConfirm
Coleman Watts [Sat, 14 Feb 2015 14:58:01 +0000 (09:58 -0500)]
CRM-15705 - Hover button cleanup
Coleman Watts [Sat, 14 Feb 2015 14:07:47 +0000 (09:07 -0500)]
CRM-15705 - Style crm buttons in Angular
Tim Otten [Sat, 14 Feb 2015 23:45:32 +0000 (15:45 -0800)]
Merge pull request #5165 from totten/master-abvalid
CRM-15856 - crmMailingAB - Fix redirect and final validation.
Tim Otten [Sat, 14 Feb 2015 03:52:58 +0000 (19:52 -0800)]
CRM-15856 - crmMailingRadioDate - Add unit test. Fix validation edge-cases.
Tim Otten [Sat, 14 Feb 2015 03:50:50 +0000 (19:50 -0800)]
CRM-15856 - crmMailingAB - Fix validation check on submit button
Tim Otten [Sat, 14 Feb 2015 02:46:27 +0000 (18:46 -0800)]
karma.conf.js - Load partials (crmResource) and timeentry
Tim Otten [Sat, 14 Feb 2015 01:50:12 +0000 (17:50 -0800)]
crmMailingAB - Remove updateUrl calls
These should have been removed when we switched to create-on-open/auto-save
behavior. dgg reported some sporadic issues with redirects (in CRM-15856)
which I haven't reproduced, but spurious updateUrl is a plausible cause.
Tim Otten [Sat, 14 Feb 2015 01:42:18 +0000 (17:42 -0800)]
Doc tweaks
Tim Otten [Sat, 14 Feb 2015 03:53:39 +0000 (19:53 -0800)]
Merge pull request #5164 from totten/master-recip-opt
CRM-15857, CRM-15361 - crmMailing - Display recipient addressing options
Tim Otten [Sat, 14 Feb 2015 01:09:06 +0000 (17:09 -0800)]
CRM-15361, CRM-15857 - crmMailing - Expose email_selection_method in UI
Tim Otten [Fri, 13 Feb 2015 23:24:12 +0000 (15:24 -0800)]
crmMetadata - Add service which calls and caches crmApi(*,getfields)
Tim Otten [Sat, 14 Feb 2015 01:01:44 +0000 (17:01 -0800)]
CRM-15361, CRM-15857 - Set default location_type_id
The default value of '0' is invalid. It should be NULL.
In the original UI for location_type_id (patched but unreleased for 4.6),
the default behavior was to set the value to NULL, so it seems implicit that
NULL is an acceptable value.
Tim Otten [Fri, 13 Feb 2015 21:17:06 +0000 (13:17 -0800)]
js/Common.js - Fix hard karma crash.
Tim Otten [Fri, 13 Feb 2015 20:56:08 +0000 (12:56 -0800)]
CRM-15361 - Expose API options for location_type_id, email_selection_method
Coleman Watts [Fri, 13 Feb 2015 20:43:51 +0000 (15:43 -0500)]
css tweak
colemanw [Fri, 13 Feb 2015 20:14:16 +0000 (15:14 -0500)]
Merge pull request #5163 from colemanw/cssFix
Fix contact action button size
Coleman Watts [Fri, 13 Feb 2015 20:08:09 +0000 (15:08 -0500)]
Fix contact action button size
Tim Otten [Fri, 13 Feb 2015 18:46:10 +0000 (10:46 -0800)]
CRM-15857 - Move "Dedupe by email" into a dialog
Tim Otten [Fri, 13 Feb 2015 17:22:24 +0000 (09:22 -0800)]
crmMailing - Tweak style on msg template button
Monish Deb [Fri, 13 Feb 2015 13:20:13 +0000 (18:50 +0530)]
Merge pull request #5161 from monishdeb/master
CRM-15964 fix - Tabbed custom data for contact subtypes don't save
jitendrapurohit [Fri, 13 Feb 2015 13:04:21 +0000 (18:34 +0530)]
warning fix
jitendrapurohit [Fri, 13 Feb 2015 12:31:27 +0000 (18:01 +0530)]
Initial new user open CiviCRM base page hangs fix CRM-15936
monishdeb [Fri, 13 Feb 2015 11:36:41 +0000 (17:06 +0530)]
CRM-15964 fix - Tabbed custom data for contact subtypes don't save
https://issues.civicrm.org/jira/browse/CRM-15964
Yashodha Chaku [Fri, 13 Feb 2015 10:57:50 +0000 (16:27 +0530)]
Merge pull request #5160 from yashodha/CRM-15963
CRM-15963: fix event title filter
yashodha [Fri, 13 Feb 2015 07:43:16 +0000 (13:13 +0530)]
CRM-15963: fix event title filter
----------------------------------------
* CRM-15963: Event_title can't be filtered with the search builder
https://issues.civicrm.org/jira/browse/CRM-15963
yashodha [Fri, 13 Feb 2015 07:09:55 +0000 (12:39 +0530)]
CRM-15963: fix event title filter
----------------------------------------
* CRM-15963: Event_title can't be filtered with the search builder
https://issues.civicrm.org/jira/browse/CRM-15963
atif-shaikh [Mon, 9 Feb 2015 08:20:02 +0000 (13:50 +0530)]
Typo Fix
atif-shaikh [Mon, 9 Feb 2015 07:47:02 +0000 (13:17 +0530)]
CRM-15897 - Fix for Joomla Image Url's not upgraded
----------------------------------------
* CRM-15897: Contact ImagesUnviewable - Issue Persisting through 4.5.5
https://issues.civicrm.org/jira/browse/CRM-15897
Dave Greenberg [Fri, 13 Feb 2015 03:18:12 +0000 (19:18 -0800)]
Merge pull request #5146 from eileenmcnaughton/CRM-15955
CRM-15955 move credit card block to close to the top of the back office form
Dave Greenberg [Fri, 13 Feb 2015 02:48:40 +0000 (18:48 -0800)]
Merge pull request #5156 from totten/master-replyto-track
CRM-15856 - "Reply-To" and "Track Replies" are mutually exclusive. Tweak missing tokens.
Tim Otten [Fri, 13 Feb 2015 00:24:56 +0000 (16:24 -0800)]
crmMailingAB - Don't set a default "name"
projects / civicrm-core.git / log