Coleman Watts [Tue, 17 Feb 2015 02:40:58 +0000 (21:40 -0500)]
CRM-15981 - Fix case activity revision table
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
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
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"
Tim Otten [Fri, 13 Feb 2015 00:20:28 +0000 (16:20 -0800)]
CRM-15856 - Tweak style for required-tokens error.
Tim Otten [Thu, 12 Feb 2015 23:23:50 +0000 (15:23 -0800)]
crmMailing - Skip token dropdown when tabbing
Tim Otten [Thu, 12 Feb 2015 23:14:58 +0000 (15:14 -0800)]
CRM-15856 - crmMailing - Display a warning inline if required tokens are missing
When you first fill in the body, we produce a popup on-blur to mention the
missing tokens. However, when you edit an existing mailing, there is no
blur at first, and it's not clear what's wrong (unless you focus and blur
the problematic field). This makes the problem more obvious.
Tim Otten [Thu, 12 Feb 2015 23:14:28 +0000 (15:14 -0800)]
crmMailing - Expand "Plain Text" if any text has been set.
Tim Otten [Thu, 12 Feb 2015 22:26:52 +0000 (14:26 -0800)]
Cleanup
Tim Otten [Thu, 12 Feb 2015 22:14:37 +0000 (14:14 -0800)]
CRM-15856 - crmMailingAB - Disable "Reply-To" when testing diff "From" addrs
The issue here is that "Reply-To" is linked with "Track Replies", and the
validation+warnings get a bit messy when there are two values of "Reply-To"
and one value of "Track Replies". The whole thing is an edge-case that's
merely "nice to have", so I'm disabling it for now. If someone really wants
it, they can figure out how to make the validation+warnings work well.
Tim Otten [Thu, 12 Feb 2015 22:07:06 +0000 (14:07 -0800)]
CRM-15856 - crmMailingAB - "Reply-To" and "Track Replies" are mutually exclusive
Tim Otten [Thu, 12 Feb 2015 21:47:12 +0000 (13:47 -0800)]
CRM-15856 - crmMailing - "Reply-To" and "Track Replies" are mutually exclusive
Dave Greenberg [Thu, 12 Feb 2015 21:31:00 +0000 (13:31 -0800)]
Merge pull request #5154 from mallezie/CRM-15966
add context all, to get all relations of contact in ajax call
Tim Otten [Thu, 12 Feb 2015 21:05:28 +0000 (13:05 -0800)]
Merge pull request #5147 from totten/master-abtest-btn
CRM-15856 - crmMailing - Require recipients and mailing tokens. Fixes for AB test.
colemanw [Thu, 12 Feb 2015 21:01:09 +0000 (16:01 -0500)]
Merge pull request #5155 from colemanw/bower
Add force flag to bower install
Coleman Watts [Thu, 12 Feb 2015 20:58:10 +0000 (15:58 -0500)]
Add force flag to bower install
Tim Otten [Thu, 12 Feb 2015 19:45:55 +0000 (11:45 -0800)]
CRM-15856 - Required tokens - Display rich dialog
Tim Otten [Thu, 12 Feb 2015 19:41:19 +0000 (11:41 -0800)]
crmUiAlert - Add wrapper for embedding Angular content in an alert.
Tim Otten [Thu, 12 Feb 2015 16:53:38 +0000 (08:53 -0800)]
crmMailingToken - Use $broadcast to link insertions and their targets
Tim Otten [Thu, 12 Feb 2015 15:44:58 +0000 (07:44 -0800)]
crmMailingMgr - Fix saving of blank footer_id/header_id
Tim Otten [Thu, 12 Feb 2015 14:32:17 +0000 (06:32 -0800)]
Cleanup style
Tim Otten [Thu, 12 Feb 2015 00:54:43 +0000 (16:54 -0800)]
angular-crm-ui.js = Remove extraneous $()
Tim Otten [Thu, 12 Feb 2015 00:32:46 +0000 (16:32 -0800)]
CRM-15856 - Enforce required tokens in UI
Tim Otten [Thu, 12 Feb 2015 00:30:46 +0000 (16:30 -0800)]
CRM-15856 - Export list of required tokens to UI
Tim Otten [Thu, 12 Feb 2015 00:31:53 +0000 (16:31 -0800)]
CRM-15856 - crmMailingRecipients - Respect ngRequired
Tim Otten [Thu, 12 Feb 2015 00:30:06 +0000 (16:30 -0800)]
crmUiRichtext - Add support for ngBlur.
Tim Otten [Wed, 11 Feb 2015 21:47:54 +0000 (13:47 -0800)]
CRM-15856 - crmMailingRecipients - Use ngModel. Merge mailing.groups and mailing.mailings under mailing.recipients
Tim Otten [Wed, 11 Feb 2015 21:03:29 +0000 (13:03 -0800)]
CRM-15855 - crmMailingAB
* Fix duplicate autosave
* Fix "Submit Mailing" button
Tim Mallezie [Thu, 12 Feb 2015 17:56:18 +0000 (18:56 +0100)]
code style
Tim Mallezie [Thu, 12 Feb 2015 15:06:09 +0000 (16:06 +0100)]
resolved merge conflict
Tim Mallezie [Thu, 12 Feb 2015 14:55:29 +0000 (15:55 +0100)]
add context all, to get all relations of contact in ajax call
Kurund Jalmi [Thu, 12 Feb 2015 10:54:15 +0000 (16:24 +0530)]
Merge pull request #5022 from atif-shaikh/CRM-5039SoldOut
CRM-5039 - Sold out price options modifications
atif-shaikh [Thu, 12 Feb 2015 09:46:20 +0000 (15:16 +0530)]
CRM-5039 Test Build Fixes Continued
----------------------------------------
* CRM-5039: Events don't always limit registrations to "max participants" setting
https://issues.civicrm.org/jira/browse/CRM-5039
atif-shaikh [Thu, 12 Feb 2015 08:00:34 +0000 (13:30 +0530)]
CRM-5039-Testbuild Fixes
atif-shaikh [Wed, 28 Jan 2015 14:52:13 +0000 (20:22 +0530)]
QA Fix
atif-shaikh [Wed, 28 Jan 2015 14:34:48 +0000 (20:04 +0530)]
CRM-5039 - Sold out price options modifications
----------------------------------------
* CRM-5039: Events don't always limit registrations to "max participants" setting
https://issues.civicrm.org/jira/browse/CRM-5039
Eileen McNaughton [Thu, 12 Feb 2015 07:11:26 +0000 (20:11 +1300)]
Merge pull request #5148 from eileenmcnaughton/master
some comment fixes
projects / civicrm-core.git / log