Jaka Kranjc [Sat, 7 Feb 2015 08:39:28 +0000 (09:39 +0100)]
CRM-15934: more quota patterns
For responses:
Sorry, this user has overdrawn their diskspace quota
user overdrawn his diskspace quota
mail action aborted: exceeded storage allocation
QuotaExceeded
message could not be delivered because the user's mailfolder is full
The recipients inbox is full
recipient doesn't have enough disk space left for it
Mailbox is over the limit
The account is running out of disk space
Dave Greenberg [Mon, 23 Feb 2015 01:51:25 +0000 (17:51 -0800)]
Merge pull request #5209 from davecivicrm/CRM-15958
CRM-15958 - Fix problem where financial_trxn.trxn_id is not being saved ...
Eileen McNaughton [Sat, 21 Feb 2015 20:44:49 +0000 (09:44 +1300)]
Merge pull request #5210 from eileenmcnaughton/CRM-15996
CRM-15966 add repeattransaction api + test making sure line items created
Eileen McNaughton [Sat, 21 Feb 2015 20:21:25 +0000 (09:21 +1300)]
CRM-15996 add long comment to completeTransaction explaining the overload
Eileen McNaughton [Sat, 21 Feb 2015 19:35:15 +0000 (08:35 +1300)]
test formatting tidy-up
Eileen McNaughton [Sat, 21 Feb 2015 19:27:52 +0000 (08:27 +1300)]
CRM-15966 add repeattransaction api + test making sure line items created
Conflicts:
tests/phpunit/api/v3/ContributionTest.php
Eileen McNaughton [Sat, 21 Feb 2015 17:39:38 +0000 (06:39 +1300)]
CRM-15996 add repeattransaction api & fix baseipn to create line items
Note that there appears to be an issue with the contribution_recur
object not being loaded. But, this seems a better place to fix it
as it is a more direct way of determining if it is a
recurring contribution
Dave Greenberg [Sat, 21 Feb 2015 16:40:10 +0000 (08:40 -0800)]
Merge pull request #5207 from davecivicrm/CMR-14578
CRM-14578 - Provide direct menu access for date preferences screen.
Dave Greenberg [Sat, 21 Feb 2015 02:04:49 +0000 (18:04 -0800)]
CRM-15958 - Fix problem where financial_trxn.trxn_id is not being saved on contribution update.
----------------------------------------
* CRM-15958: Updating a contribution to completed with a new trxn_id writes unjoinable finanical_trxn record
https://issues.civicrm.org/jira/browse/CRM-15958
Dave Greenberg [Sat, 21 Feb 2015 01:42:26 +0000 (17:42 -0800)]
CRM-14578 - Add upgrade logic and incorporate FK fix for location_type_id
----------------------------------------
* CRM-14578: Relocate Advanced Date Input Settings to Customize data and screens menu
https://issues.civicrm.org/jira/browse/CRM-14578
Dave Greenberg [Fri, 20 Feb 2015 23:10:33 +0000 (15:10 -0800)]
CRM-14578 - Provide direct menu access for date preferences screen.
----------------------------------------
* CRM-14578: Relocate Advanced Date Input Settings to Customize data and screens menu
https://issues.civicrm.org/jira/browse/CRM-14578
Tim Otten [Fri, 20 Feb 2015 20:17:44 +0000 (12:17 -0800)]
Merge pull request #5202 from totten/master-civimail-task
CRM-15801 - CiviMail - Change "Schedule/Send Mailing" task to use Angular UI
Tim Otten [Fri, 20 Feb 2015 20:11:23 +0000 (12:11 -0800)]
Merge pull request #5206 from jmcclelland/mailing-location-type-default-null
Mailing location type default null
CiviCRM Dev User [Fri, 20 Feb 2015 18:14:40 +0000 (13:14 -0500)]
CRM-15361 - foreign key constraint for location type id
CiviCRM Dev User [Fri, 20 Feb 2015 17:31:13 +0000 (12:31 -0500)]
CRM-15361 - fixing un-related white space problem.
Dave Greenberg [Fri, 20 Feb 2015 17:26:27 +0000 (09:26 -0800)]
Merge pull request #5201 from davecivicrm/CRM-15834
Crm 15834
Tim Otten [Fri, 20 Feb 2015 04:28:36 +0000 (20:28 -0800)]
CRM-15801 - crmMailing - Display the "Unsubscribe tracking group" field
But only if the recipient list includes a hidden-group /
search-result-group.
Tim Otten [Fri, 20 Feb 2015 03:50:31 +0000 (19:50 -0800)]
CRM-15801 - crmMailing - Special formatting for recipients based on searches.
Tim Otten [Fri, 20 Feb 2015 02:25:57 +0000 (18:25 -0800)]
CRM-15801 - CiviMail - Change "Schedule/Send Mailing" task to use Angular UI.
Dave Greenberg [Fri, 20 Feb 2015 02:47:24 +0000 (18:47 -0800)]
Merge pull request #5197 from totten/master-abtest-unify
CRM-15995 - crmMailingAB - Unify send and report screens. Cleanup report screen.
Dave Greenberg [Fri, 20 Feb 2015 02:27:30 +0000 (18:27 -0800)]
CRM-15834 - spacing fix
----------------------------------------
* CRM-15834: Allow end dates of auto-renew memberships to be edited
https://issues.civicrm.org/jira/browse/CRM-15834
Dave Greenberg [Fri, 20 Feb 2015 02:24:45 +0000 (18:24 -0800)]
CRM-15834 - allow override of auto-renew membership end dates
----------------------------------------
* CRM-15834: Allow end dates of auto-renew memberships to be edited
https://issues.civicrm.org/jira/browse/CRM-15834
Eileen McNaughton [Fri, 20 Feb 2015 00:41:26 +0000 (13:41 +1300)]
CRM-15996 preliminary tidy up
Dave Greenberg [Fri, 20 Feb 2015 00:04:02 +0000 (16:04 -0800)]
Update Payment.php
Remove extraneous "$processorInstance = " on line 592.
Dave Greenberg [Thu, 19 Feb 2015 23:34:38 +0000 (15:34 -0800)]
Merge pull request #5187 from mallezie/CRM-15982
add relationshiptype filter to ajax getcontactrelationships call
Tim Otten [Thu, 19 Feb 2015 23:00:34 +0000 (15:00 -0800)]
crmMailingAB - report.html - Disable broken graphs.
Tim Otten [Thu, 19 Feb 2015 22:59:04 +0000 (14:59 -0800)]
crmMailingAB - report.html - Fix reload after submitting final
Tim Otten [Thu, 19 Feb 2015 22:43:45 +0000 (14:43 -0800)]
crmMailingAB - report.html - Display placeholder column for the final mailing
This provides some continuity between the appearance during testing and
after testing. It also emphasizes that there's a gap -- that the user
has not yet made a choice.
Tim Otten [Thu, 19 Feb 2015 22:34:37 +0000 (14:34 -0800)]
crmMailingAB - report.html - Padding between sections of the table
Tim Otten [Thu, 19 Feb 2015 22:29:29 +0000 (14:29 -0800)]
crmMailingAB - report.html - Display job info
Tim Otten [Thu, 19 Feb 2015 22:15:13 +0000 (14:15 -0800)]
CRM-15979 - crmMailingAB - More symmetry between edit and report modes.
The top level file is "main.html" which includes either "edit.html" or
"report.html" depending on whether the test has been submitted.
Tim Otten [Thu, 19 Feb 2015 05:42:52 +0000 (21:42 -0800)]
crmMailingAB - report.html - Only link to contact search if user has permission
Tim Otten [Thu, 19 Feb 2015 05:37:20 +0000 (21:37 -0800)]
CRM_Core_Resources - Add API to export permission info
Tim Otten [Thu, 19 Feb 2015 05:18:20 +0000 (21:18 -0800)]
crmMailingAB - report.html - Include all the major sections from review.html as rows
Tim Otten [Thu, 19 Feb 2015 04:08:53 +0000 (20:08 -0800)]
crmMailingAB - report.html - Loop over mailings
Tim Otten [Thu, 19 Feb 2015 03:54:56 +0000 (19:54 -0800)]
crmMailingAB - Use CSS file
Tim Otten [Thu, 19 Feb 2015 03:00:49 +0000 (19:00 -0800)]
crmMailingAB - Hyperlinks for stats. Get stats in a batch.
Tim Otten [Thu, 19 Feb 2015 02:50:58 +0000 (18:50 -0800)]
crmMailingAB - After submitting, stay on the report screen. Don't redirect to listing.
Tim Otten [Thu, 19 Feb 2015 02:49:01 +0000 (18:49 -0800)]
crmMailingAB - Suspend autosave while submitting. Reload after submission.
Tim Otten [Wed, 18 Feb 2015 19:54:24 +0000 (11:54 -0800)]
crmMailing, crmMailingAB - Use CrmAutosaveCtrl
Tim Otten [Wed, 18 Feb 2015 19:52:30 +0000 (11:52 -0800)]
crmAutosave - Rewrite as service/class instead of directive. Expose internal API.
Tim Otten [Wed, 18 Feb 2015 18:15:27 +0000 (10:15 -0800)]
CRM-15979 - crmMailingAB - Merge the compose and report URLs
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
Tim Mallezie [Tue, 17 Feb 2015 19:47:15 +0000 (20:47 +0100)]
fixed code style2
Tim Mallezie [Tue, 17 Feb 2015 19:43:47 +0000 (20:43 +0100)]
fixed code style
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
Tim Mallezie [Tue, 17 Feb 2015 15:50:33 +0000 (16:50 +0100)]
fixed indentation
Tim Mallezie [Tue, 17 Feb 2015 14:24:57 +0000 (15:24 +0100)]
make relationshiptype selector optional
Tim Mallezie [Tue, 17 Feb 2015 13:42:02 +0000 (14:42 +0100)]
add relationshiptype filter to ajax getcontactrelationships call
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