Tim Otten [Tue, 9 Dec 2014 23:52:56 +0000 (15:52 -0800)]
CRM-15578 - crmUiVisible - Add a helper for hiding elements while preserving layout
ngShow/ngHide use "display:none" to hide elements -- which modifies layout.
That's normally appropriate, but sometimes one wants to hide things without
changing layout ("visibility:hidden").
Tim Otten [Tue, 9 Dec 2014 03:03:29 +0000 (19:03 -0800)]
CRM_Core_Transaction - Doc fix
Tim Otten [Tue, 9 Dec 2014 02:58:58 +0000 (18:58 -0800)]
CRM-15578 - civicrm/ajax/attachment - Add endpoint for creating attachments using HTTP POST (multipart)
Tim Otten [Sat, 6 Dec 2014 06:44:41 +0000 (22:44 -0800)]
CRM-15578 - Attachment API - Add support for CRUD'ing files
The File API is entirely inadequate to managing files. The Attachment API
provides a pseudo-entity which represents a record in civicrm_file combined
with a record in civicrm_entity_file as well as the underlying file content.
(See also: discussions on civicrm-api mailing list circa early Dec 2014.)
Tim Otten [Sun, 7 Dec 2014 09:36:15 +0000 (01:36 -0800)]
CRM-15578 - StaticProvider, etal - Prep for unit-tests of Attachment API
Tim Otten [Fri, 5 Dec 2014 01:13:44 +0000 (17:13 -0800)]
Merge pull request #4648 from totten/master-civimail-misc
CRM-15578 - crmMailing2 - Implement multiple sections
Tim Otten [Wed, 3 Dec 2014 01:17:16 +0000 (17:17 -0800)]
CRM-15578 - Add crmStatus() service as a simpler wrapper for CRM.status()
Tim Otten [Tue, 2 Dec 2014 23:59:27 +0000 (15:59 -0800)]
CRM-15578 - crmMailing2 - Basic styling for "Submit Mailing" in wizard-style layouts
Tim Otten [Wed, 3 Dec 2014 02:32:49 +0000 (18:32 -0800)]
CRM-15578 - crmMailingMgr - Implement submit(). Add comments.
Tim Otten [Mon, 1 Dec 2014 19:19:23 +0000 (11:19 -0800)]
CRM-15578 - crmMailing2 - Implement "schedule.html"
Tim Otten [Tue, 2 Dec 2014 23:34:56 +0000 (15:34 -0800)]
CRM-15578 - crmUiDate, crmDateTime, crmTime - Don't both with crmWatcher
Tim Otten [Mon, 1 Dec 2014 19:18:18 +0000 (11:18 -0800)]
CRM-15578 - Add directives (crmUiDate, crmUiTime, crmUiDateTime)
Tim Otten [Mon, 1 Dec 2014 21:06:05 +0000 (13:06 -0800)]
CRM-15578 - Add crmUtil module with crmWatcher and crmLog
Tim Otten [Mon, 1 Dec 2014 03:06:25 +0000 (19:06 -0800)]
Remove <crm-ui-label>
Tim Otten [Mon, 1 Dec 2014 01:40:57 +0000 (17:40 -0800)]
CRM-15578 - Change table layouts to <crm-ui-field> directive. Remove <crm-ui-label> calls.
Tim Otten [Sun, 30 Nov 2014 16:55:19 +0000 (08:55 -0800)]
CRM-15578 - crmMailing2 - Implement fields/msg_template_id.html
Tim Otten [Sun, 30 Nov 2014 21:04:45 +0000 (13:04 -0800)]
CRM-15578 - Add <crm-ui-select> directive
When working with msg_template_id and <ui-jq> directive, changes in the
data-model don't seem to reflect in the select2 widget.
Tim Otten [Sun, 30 Nov 2014 03:39:20 +0000 (19:39 -0800)]
crmMailing2 - Cleanup
Tim Otten [Sun, 30 Nov 2014 01:58:08 +0000 (17:58 -0800)]
CRM-15578 - crmMailing2 - Implement "review.html"
Tim Otten [Sun, 30 Nov 2014 23:52:49 +0000 (15:52 -0800)]
CRM-15578 - Add <crm-ui-field> directive
Tim Otten [Tue, 25 Nov 2014 01:48:23 +0000 (17:48 -0800)]
Merge pull request #4604 from totten/master-civimail-addrs
CRM-15578 - crmMailing2 - Implement "Save Draft" and "Delete Draft"
Tim Otten [Mon, 24 Nov 2014 09:57:42 +0000 (01:57 -0800)]
CRM-15578 - Fix inconsistent generation of recipient list
The recipient preview worked well with new mailings but was flaky with saved
mailings. New mailings relied the api.default for "api.mailing_job.create"
which was not included with existing mailings. This patch takes explicit
control over "api.mailing_job.create".
Tim Otten [Mon, 24 Nov 2014 06:52:39 +0000 (22:52 -0800)]
CRM-15578 - crmMailing2 - Implement "Save Draft" and "Delete "Draft"
Use promises to chain actions in edit*.html. Compared to the old code, this
fits better with async operations and handles errors more gracefully.
Tim Otten [Mon, 24 Nov 2014 03:51:33 +0000 (19:51 -0800)]
CRM-15578 - crmMailing2 - Fix loading+saving of from+reply-to addresses.
In the current schema design, this is necessarily a bit messy.
Tim Otten [Mon, 24 Nov 2014 03:54:04 +0000 (19:54 -0800)]
Merge pull request #4596 from totten/master-civimail-sendtest
[DNM] CRM-15578 - CiviMail - Cleanup/implement support for sending test msgs
Tim Otten [Mon, 24 Nov 2014 02:33:26 +0000 (18:33 -0800)]
CRM-15578 - crmMailing2 - When ID of new mailing is established, update navbar.
Tim Otten [Mon, 24 Nov 2014 01:36:19 +0000 (17:36 -0800)]
CRM-15578 - crmMailing2 - Fix loading of recipient-group IDs
Tim Otten [Mon, 24 Nov 2014 01:35:23 +0000 (17:35 -0800)]
CRM-15578 - Mailing.create - Fix updates to "groups" and "mailings". Add test.
Tim Otten [Sat, 22 Nov 2014 07:06:44 +0000 (23:06 -0800)]
CRM-15578 - crmMailing2 - Set default test email address to current user
Tim Otten [Sat, 22 Nov 2014 07:03:47 +0000 (23:03 -0800)]
crmMailing2 - Tweak syntax
Tim Otten [Sat, 22 Nov 2014 07:02:30 +0000 (23:02 -0800)]
CRM-15578 - crmMailing2 - Tweak "Preview" status notification
Tim Otten [Sat, 22 Nov 2014 02:04:20 +0000 (18:04 -0800)]
CRM-15578 - crmMailing2 - Implement "Send test" buttons
Tim Otten [Sat, 22 Nov 2014 01:24:08 +0000 (17:24 -0800)]
CRM-15578 - api_v3_MailingTest - Make testMailerSendTest_email more robust
Tim Otten [Fri, 21 Nov 2014 22:08:47 +0000 (14:08 -0800)]
CRM-15578 - api_v3_MailingTest - Prettify
Now that this test class calls useTransaction(), it's not necessary to
garbage-collect specific records by ID, so there's no need to maintain an ID
list.
Tim Otten [Fri, 21 Nov 2014 22:03:23 +0000 (14:03 -0800)]
CRM-15578 - Mailing API - Add unit-test for send_test with group ID
Tim Otten [Fri, 21 Nov 2014 22:02:50 +0000 (14:02 -0800)]
CiviUnitTestCase - Add helper useTransaction()
Tim Otten [Fri, 21 Nov 2014 21:06:30 +0000 (13:06 -0800)]
CRM-15578 - Mailing API - Fix SQL escaping
Note: The offending code only exists in a feature branch -- it was never
merged into mainline.
Tim Otten [Fri, 21 Nov 2014 20:38:55 +0000 (12:38 -0800)]
CRM-15578 - crmMailing2 - Cleanup logging. Improve backtraces.
Tim Otten [Fri, 21 Nov 2014 20:29:18 +0000 (12:29 -0800)]
Merge pull request #4593 from totten/master-civimail-preview
CRM-15578 - CiviMail - Add preview block. Cleanup.
Tim Otten [Tue, 11 Nov 2014 01:08:33 +0000 (17:08 -0800)]
CRM-15578 - crmMailing2 - Add "preview.html"
Tim Otten [Fri, 21 Nov 2014 03:26:38 +0000 (19:26 -0800)]
CRM-15578 - crmMailing2 - Extract crmMailingMgr service
Tim Otten [Fri, 21 Nov 2014 04:53:54 +0000 (20:53 -0800)]
crmApi - Use Angular's $q deferred; report errors correctly
Tim Otten [Fri, 21 Nov 2014 00:00:54 +0000 (16:00 -0800)]
CRM-15578 - Mailing API - Extend test for "preview" action:
* Assert subject, text, and html
* Use force_rollback; assert no side-effects
* Rename return properties for consistency (eg text => body_text)
Tim Otten [Fri, 21 Nov 2014 01:53:46 +0000 (17:53 -0800)]
CRM-15578 - Mailing API - Replace "preview_recipients" action with chained calls
The special-purpose API "Mailing.preview_recipients" is no longer necessary. Instead,
one can chain simpler APIs ("Mailing.create" + "MailingRecipients.get" + "force_rollback")
Tim Otten [Wed, 12 Nov 2014 02:46:52 +0000 (18:46 -0800)]
CRM-15578 - crmUiIframe - Add directive for previewing content inside an iframe
Tim Otten [Fri, 21 Nov 2014 01:00:35 +0000 (17:00 -0800)]
Merge remote-tracking branch 'origin/master' into master-master-civimail-abtest-2014-11-20-16-58-49
Conflicts:
sql/civicrm_generated.mysql
Tim Otten [Fri, 21 Nov 2014 00:17:03 +0000 (16:17 -0800)]
Merge pull request #4534 from totten/master-civimail-abtest
CRM-15578 - Introduce crmMailing2 with smaller, more loosely-coupled components
Tim Otten [Tue, 18 Nov 2014 06:51:26 +0000 (22:51 -0800)]
CRM-15578 - MailingTest::testMailerDeleteSuccess - Fix invalid "created_id" when run in bulk.
Tim Otten [Tue, 18 Nov 2014 06:44:32 +0000 (22:44 -0800)]
CRM-15578 - Pull up static $mailsProcessed and reset during testing
These static variables were leaking between test-cases in a way which caused
the second test to get stuck on an infinite loop. It has been quite
difficult to identify the tests which are interacting
(api_v3_JobProcessMailingTest and api_v3_MailingTest), the particular loop
which went infinitely, and the leaky variables.
I don't understand why these statics exist, but I don't have time to fully
grok it -- right now, the branch "master-civimail-abtest" has gone off on a
bit of a limb with failing tests, I just want to bring it back to a stable
place. Promoting & resetting the static is the simplest way.
Tim Otten [Fri, 14 Nov 2014 03:57:50 +0000 (19:57 -0800)]
CRM-15578 - Mailing API - Misc test fixes (esp. syntax-conformance)
Monish Deb [Thu, 20 Nov 2014 08:22:08 +0000 (13:52 +0530)]
Merge pull request #4588 from rohankatkar/CRM-15617
CRM-15617 SYBUNT report doesn't have Add Contacts to Group Option
Rohan Katkar [Thu, 20 Nov 2014 06:53:03 +0000 (12:23 +0530)]
CRM-15617 SYBUNT report doesn't have Add Contacts to Group Option
Dave Greenberg [Thu, 20 Nov 2014 02:03:18 +0000 (18:03 -0800)]
Merge pull request #4583 from deepak-srivastava/CRM-15490
CRM-15490: fix for additional activity same as parent
deepak-srivastava [Wed, 19 Nov 2014 15:24:14 +0000 (15:24 +0000)]
CRM-15490: fix for additional activity same as parent
----------------------------------------
* CRM-15490: Recurring Activities Using Core Recursion
https://issues.civicrm.org/jira/browse/CRM-15490
Monish Deb [Wed, 19 Nov 2014 12:35:41 +0000 (18:05 +0530)]
Merge pull request #4556 from jitendrapurohit/CRM-15586
Search Filter for Activity Type in Case Mgt screen does not display acti...
Monish Deb [Wed, 19 Nov 2014 10:10:31 +0000 (15:40 +0530)]
Merge pull request #4582 from rohankatkar/CRM_15594
Fix for CRM-15594
Rohan Katkar [Wed, 19 Nov 2014 08:53:52 +0000 (14:23 +0530)]
Fix for CRM-15594
Monish Deb [Wed, 19 Nov 2014 06:23:32 +0000 (11:53 +0530)]
Merge pull request #4581 from rohankatkar/CRM-15594
CRM-15594 Fix alignments on Merge Rules page
Rohan Katkar [Wed, 19 Nov 2014 05:17:53 +0000 (10:47 +0530)]
CRM-15594 Fix alignments on Merge Rules page
Monish Deb [Wed, 19 Nov 2014 05:02:26 +0000 (10:32 +0530)]
Merge pull request #4574 from rohankatkar/CRM-15594
CRM-15594 : Fix alignments on Merge Rules page
colemanw [Tue, 18 Nov 2014 19:06:56 +0000 (14:06 -0500)]
Merge pull request #4579 from colemanw/CRM_Utils_Array
CRM_Utils_Array - Remove old unused functions
Coleman Watts [Tue, 18 Nov 2014 18:20:13 +0000 (13:20 -0500)]
Add test for CRM_Utils_Array::remove
Coleman Watts [Tue, 18 Nov 2014 17:45:33 +0000 (12:45 -0500)]
CRM_Utils_Array - Remove old unused functions
Rohan Katkar [Tue, 18 Nov 2014 12:40:34 +0000 (18:10 +0530)]
CRM-15594 Fix alignments on Merge Rules page
Monish Deb [Tue, 18 Nov 2014 07:13:49 +0000 (12:43 +0530)]
Merge pull request #4550 from jitendrapurohit/CRM-15568
Cannot use search builder on multiple Grant and Case types Fix
Dave Greenberg [Tue, 18 Nov 2014 01:43:19 +0000 (17:43 -0800)]
Merge pull request #4560 from priyankakaran26/recurring-entity-improvements
CRM-15490 - Recurring entity QA fixes
Dave Greenberg [Mon, 17 Nov 2014 22:45:07 +0000 (14:45 -0800)]
Merge pull request #4563 from monishdeb/CRM-15536
CRM-15536 fix - Scheduled reminders: Clarify "Limit to" and "Also includ...
monishdeb [Mon, 17 Nov 2014 21:43:37 +0000 (03:13 +0530)]
CRM-15536 fix - Scheduled reminders: Clarify "Limit to" and "Also include" UI to prevent user errors
https://issues.civicrm.org/jira/browse/CRM-15536
monishdeb [Mon, 17 Nov 2014 20:07:17 +0000 (01:37 +0530)]
CRM-11518 fix - Smart groups in scheduled reminders
https://issues.civicrm.org/jira/browse/CRM-11518
monishdeb [Mon, 17 Nov 2014 19:50:27 +0000 (01:20 +0530)]
indentation fix
monishdeb [Mon, 17 Nov 2014 19:48:58 +0000 (01:18 +0530)]
QA fix
colemanw [Mon, 17 Nov 2014 18:55:56 +0000 (13:55 -0500)]
Merge pull request #4568 from colemanw/CRM-15603
CRM-15603 - Misc translated string cleanup
Yashodha Chaku [Mon, 17 Nov 2014 13:30:35 +0000 (19:00 +0530)]
Merge pull request #4569 from rohankatkar/CRM-15564
Fix for CRM-15564
kurund [Mon, 17 Nov 2014 08:10:30 +0000 (13:40 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-17-13-40-23
Kurund Jalmi [Mon, 17 Nov 2014 05:59:03 +0000 (11:29 +0530)]
Merge pull request #4570 from kurund/CRM-15527
CRM-15527
Rohan Katkar [Mon, 17 Nov 2014 05:31:21 +0000 (11:01 +0530)]
Fix for CRM-15564
kurund [Mon, 17 Nov 2014 04:13:06 +0000 (09:43 +0530)]
Merge branch 'CRM-15474' of github.com:colemanw/civicrm-core into CRM-15527
Conflicts:
templates/CRM/Event/Form/Participant.tpl
----------------------------------------
* CRM-15474: Event cart option js breaks "add participant" form
https://issues.civicrm.org/jira/browse/CRM-15474
* CRM-15527: error in IPN relating to numRelatedMemberships
https://issues.civicrm.org/jira/browse/CRM-15527
Coleman Watts [Mon, 17 Nov 2014 00:43:25 +0000 (19:43 -0500)]
CRM-15603 - Remove concatenated parentheses from the end of strings
Coleman Watts [Mon, 17 Nov 2014 00:33:40 +0000 (19:33 -0500)]
CRM-15603 - Misc string fixes
Coleman Watts [Mon, 17 Nov 2014 00:32:44 +0000 (19:32 -0500)]
CRM-15603 - Standardize pluralization of 'Languages, Currency, Locations'
Coleman Watts [Mon, 17 Nov 2014 00:31:16 +0000 (19:31 -0500)]
CRM-15603 - Standardize 'Opt-out'
Coleman Watts [Sun, 16 Nov 2014 23:59:16 +0000 (18:59 -0500)]
CRM-15603 - Tame punctuation of 'This event is full!!!'
Coleman Watts [Sun, 16 Nov 2014 22:34:29 +0000 (17:34 -0500)]
CRM-15603 - Remove extra space
Coleman Watts [Sun, 16 Nov 2014 22:31:57 +0000 (17:31 -0500)]
CRM-15603 - Standardize case of reminders labels
Coleman Watts [Sun, 16 Nov 2014 22:29:43 +0000 (17:29 -0500)]
CRM-15603 - Standardize case of 'Batch Update Contributions Via Profile'
Coleman Watts [Sun, 16 Nov 2014 22:27:28 +0000 (17:27 -0500)]
CRM-15603 - Standardize punctuation of 'Title is a required field.'
Coleman Watts [Sun, 16 Nov 2014 22:21:46 +0000 (17:21 -0500)]
CRM-15603 - Remove unnecessary variables in contribution tab titles
Coleman Watts [Sun, 16 Nov 2014 22:15:41 +0000 (17:15 -0500)]
CRM-15603 - Standardize case of 'Recurring Contributions'
Coleman Watts [Sun, 16 Nov 2014 22:14:35 +0000 (17:14 -0500)]
CRM-15603 - Standardize punctuation of 'End date should be after Start date.'
Coleman Watts [Sun, 16 Nov 2014 22:13:04 +0000 (17:13 -0500)]
CRM-15603 - Standardize case of 'Pledge Made'
Coleman Watts [Sun, 16 Nov 2014 22:11:01 +0000 (17:11 -0500)]
CRM-15603 - Standardize case of 'Supporter Profile'
Coleman Watts [Sun, 16 Nov 2014 21:58:48 +0000 (16:58 -0500)]
CRM-15603 - Standardize case of 'Pledged but not Paid Report'
Coleman Watts [Sun, 16 Nov 2014 21:54:40 +0000 (16:54 -0500)]
CRM-15603 - More consistent use of 'Donations' vs 'Contributions'
Coleman Watts [Sun, 16 Nov 2014 21:45:14 +0000 (16:45 -0500)]
CRM-15603 - Fix inconsistent pluralization of 'Contributions'
Coleman Watts [Sun, 16 Nov 2014 20:50:07 +0000 (15:50 -0500)]
CRM-15603 - Standardize case of 'Delete File'
Coleman Watts [Sun, 16 Nov 2014 20:47:57 +0000 (15:47 -0500)]
CRM-15603 - Standardize case of 'HTML Format'
Coleman Watts [Sun, 16 Nov 2014 03:40:31 +0000 (22:40 -0500)]
CRM-15603 - Standardize case of 'Complete OR Partial Name'
Coleman Watts [Sun, 16 Nov 2014 03:39:31 +0000 (22:39 -0500)]
CRM-15603 - Standardize case of 'New Activity'
Coleman Watts [Sun, 16 Nov 2014 03:38:25 +0000 (22:38 -0500)]
CRM-15603 - Standardize punctuation of 'Event templates are not meant to be registered.'
Coleman Watts [Sun, 16 Nov 2014 03:28:18 +0000 (22:28 -0500)]
CRM-15603 - Standardize case of 'Proximity Search'