Maggie [Wed, 30 Apr 2014 22:48:30 +0000 (18:48 -0400)]
Reformatted badges, fit text and realigned image.
Maggie [Wed, 30 Apr 2014 21:16:58 +0000 (17:16 -0400)]
Removed center option and fit width of text for first three rows if user sets show participant image to yes, cleaned up code and variable names
Maggie [Thu, 10 Apr 2014 20:46:10 +0000 (16:46 -0400)]
Allows users to display a contact's profile picture on their name badge
Kurund Jalmi [Wed, 30 Apr 2014 20:43:11 +0000 (13:43 -0700)]
Merge pull request #2998 from yashodha/CRM-14500
CRM-14500: refer to contact id foreign keys dynamically
Tim Otten [Wed, 30 Apr 2014 20:03:48 +0000 (13:03 -0700)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-30-12-58-23
Conflicts:
CRM/Admin/Form/RelationshipType.php
Tim Otten [Wed, 30 Apr 2014 19:57:16 +0000 (12:57 -0700)]
Merge pull request #3058 from totten/mepps-4.4-secure-image-urls
CRM-14499 - Image URL fixup
colemanw [Wed, 30 Apr 2014 19:54:02 +0000 (12:54 -0700)]
Merge pull request #3056 from ginkgomzd/CRM-11864-fixes
CRM-11864 - qa bug fix - change function to static and fix calls
Tim Otten [Wed, 30 Apr 2014 19:50:49 +0000 (12:50 -0700)]
CRM-14499 - ImageFile - Fix photo URL validation on WP
----------------------------------------
* CRM-14499: Upgrade to 4.4.5 causes contact photos to be unviewable
https://issues.civicrm.org/jira/browse/CRM-14499
mzd [Wed, 30 Apr 2014 19:33:31 +0000 (15:33 -0400)]
CRM-11864 - qa bug fix - change function to static and fix calls
----------------------------------------
* CRM-11864: Embed form-designer in event and contribution UIs
https://issues.civicrm.org/jira/browse/CRM-11864
Yashodha Chaku [Wed, 30 Apr 2014 18:42:24 +0000 (00:12 +0530)]
Merge pull request #3046 from NileemaJadhav/HR-338-qa
HR-338 Support multiple cases when creating activity
Dave Greenberg [Wed, 30 Apr 2014 18:32:49 +0000 (11:32 -0700)]
Merge pull request #3054 from davecivicrm/CRM-14488
CRM-14488 Reserved profiles no longer need Used for = standalone form.
Dave Greenberg [Wed, 30 Apr 2014 18:31:39 +0000 (11:31 -0700)]
CRM-14488 Reserved profiles no longer need Used for = standalone form.
----------------------------------------
* CRM-14488:
https://issues.civicrm.org/jira/browse/CRM-14488
Yashodha Chaku [Wed, 30 Apr 2014 18:17:51 +0000 (23:47 +0530)]
Merge pull request #3053 from yashodha/CRM-14577
CRM-14577: fix default for excluded groups
yashodha [Wed, 30 Apr 2014 18:28:10 +0000 (23:58 +0530)]
fix default for excluded groups
Yashodha Chaku [Wed, 30 Apr 2014 18:05:23 +0000 (23:35 +0530)]
Merge pull request #3049 from KarinG/CRM-14577
CRM-14577 - Fixed Error message when Continue (or Reuse) on Find Mailings
Yashodha Chaku [Wed, 30 Apr 2014 16:59:52 +0000 (22:29 +0530)]
Merge pull request #3052 from yashodha/CRM-14493
fix generated data
yashodha [Wed, 30 Apr 2014 17:10:52 +0000 (22:40 +0530)]
fix generated data
colemanw [Wed, 30 Apr 2014 16:42:27 +0000 (09:42 -0700)]
Merge pull request #3029 from ginkgomzd/CRM-11864
Crm 11864
Coleman Watts [Wed, 30 Apr 2014 16:39:01 +0000 (09:39 -0700)]
Partial revert of
cf1182e to fix profile edit
Kurund Jalmi [Wed, 30 Apr 2014 15:47:45 +0000 (08:47 -0700)]
Merge pull request #3047 from jitendrapurohit/WebTests
Web Test Fix
mzd [Wed, 30 Apr 2014 15:22:10 +0000 (11:22 -0400)]
CRM-11864 add validation for minimum profile field requirements
----------------------------------------
* CRM-11864: Embed form-designer in event and contribution UIs
https://issues.civicrm.org/jira/browse/CRM-11864
mzd [Wed, 30 Apr 2014 01:42:48 +0000 (21:42 -0400)]
CRM-11864 add ProfileSelector js widget to on-half-of config
[in-progress]
----------------------------------------
* CRM-11864: Embed form-designer in event and contribution UIs
https://issues.civicrm.org/jira/browse/CRM-11864
mzd [Wed, 30 Apr 2014 00:45:55 +0000 (20:45 -0400)]
make variable naming more accurate
mzd [Wed, 30 Apr 2014 00:10:25 +0000 (20:10 -0400)]
add doc-block; remove dev-detritus; add argument to override configs to addProfileSelector
mzd [Tue, 29 Apr 2014 18:35:53 +0000 (14:35 -0400)]
CRM-11864 add functionality for 'same as main contact'
----------------------------------------
* CRM-11864: Embed form-designer in event and contribution UIs
https://issues.civicrm.org/jira/browse/CRM-11864
mzd [Tue, 29 Apr 2014 01:09:36 +0000 (21:09 -0400)]
fix regression bug in js scoping
remove now unused code in php
ensure additional-profiles are hidden on load when appropriate
mzd [Tue, 29 Apr 2014 00:31:16 +0000 (20:31 -0400)]
normalize js code & whitespace
mzd [Tue, 29 Apr 2014 00:22:06 +0000 (20:22 -0400)]
normalize js code & whitespace - move out of php, move into closure, remove use of cj()
mzd [Mon, 28 Apr 2014 23:12:22 +0000 (19:12 -0400)]
cleanup detritus and no-longer used js functions for managing profiles
mzd [Mon, 28 Apr 2014 23:02:31 +0000 (19:02 -0400)]
CRM-11864 add/remove multiple profiles to event registrations:
refactor add/remove js to use classes instead of identifiers and move into a closure
----------------------------------------
* CRM-11864: Embed form-designer in event and contribution UIs
https://issues.civicrm.org/jira/browse/CRM-11864
mzd [Mon, 28 Apr 2014 23:00:05 +0000 (19:00 -0400)]
correct label
mzd [Sun, 27 Apr 2014 22:39:00 +0000 (18:39 -0400)]
CRM-11864 hack to make new jquery widget load after poor-mans ajax call
----------------------------------------
* CRM-11864: Embed form-designer in event and contribution UIs
https://issues.civicrm.org/jira/browse/CRM-11864
mzd [Sun, 27 Apr 2014 22:22:20 +0000 (18:22 -0400)]
CRM-11864 add plus and trash icons to add/remove profile buttons;
----------------------------------------
* CRM-11864: Embed form-designer in event and contribution UIs
https://issues.civicrm.org/jira/browse/CRM-11864
mzd [Sun, 27 Apr 2014 22:13:49 +0000 (18:13 -0400)]
CRM-11864 replace selects with ProfileSelects;
----------------------------------------
* CRM-11864: Embed form-designer in event and contribution UIs
https://issues.civicrm.org/jira/browse/CRM-11864
mzd [Sun, 27 Apr 2014 22:13:09 +0000 (18:13 -0400)]
CRM-11864 remove link to create new profiels (soon to be unnecessary);
add crm-hover-button class to "add profile" links;
----------------------------------------
* CRM-11864: Embed form-designer in event and contribution UIs
https://issues.civicrm.org/jira/browse/CRM-11864
KarinG [Wed, 30 Apr 2014 14:27:58 +0000 (07:27 -0700)]
CRM-14577 - Fixed Error message when trying to Continue (or Reuse) on Find Mailings.
jitendrapurohit [Wed, 30 Apr 2014 11:01:32 +0000 (16:31 +0530)]
Web Test Fix
Nileema [Wed, 30 Apr 2014 09:48:18 +0000 (15:18 +0530)]
HR-338 Support multiple cases when creating activity
Kurund Jalmi [Wed, 30 Apr 2014 07:37:36 +0000 (00:37 -0700)]
Merge pull request #3043 from yashodha/CRM-14493
CRM-14493: added state for Greece
Kurund Jalmi [Wed, 30 Apr 2014 05:56:31 +0000 (22:56 -0700)]
Merge pull request #3040 from mlutfy/4.4-crm14573
CRM-14573: ts fixes for 4.4
Coleman Watts [Wed, 30 Apr 2014 03:14:14 +0000 (20:14 -0700)]
Hide button in popup mode
colemanw [Wed, 30 Apr 2014 03:10:24 +0000 (20:10 -0700)]
Merge pull request #3044 from colemanw/popup
Popup fixes
Coleman Watts [Wed, 30 Apr 2014 03:10:09 +0000 (20:10 -0700)]
CRM-14557 - Remove stray script tag which was breaking ajax
Coleman Watts [Wed, 30 Apr 2014 03:03:24 +0000 (20:03 -0700)]
Standardize on get not request
Coleman Watts [Wed, 30 Apr 2014 03:01:36 +0000 (20:01 -0700)]
CRM-14215 - Fix ajax redirects
yashodha [Wed, 30 Apr 2014 02:32:56 +0000 (08:02 +0530)]
CRM-14493: added state for Greece
Kurund Jalmi [Wed, 30 Apr 2014 02:10:11 +0000 (19:10 -0700)]
Merge pull request #3037 from GinkgoFJG/CRM-14375
CRM-14375: Membership fee doubled when fixed contribution option set to "no thank you"
Frank J. Gómez [Wed, 30 Apr 2014 02:07:42 +0000 (19:07 -0700)]
Resolve PHP notices.
Margaret Epps [Wed, 30 Apr 2014 01:47:36 +0000 (21:47 -0400)]
Redid indentation in CRM/Upgrade/Incremental/php/FourFour.php
Mathieu Lutfy [Wed, 30 Apr 2014 01:46:21 +0000 (21:46 -0400)]
CRM-14573: ts fixes (CRM/Event/Cart/Form/Checkout/Payment.php, templates/CRM/Contribute/Form/ContributionPage/Tab.hlp).
Coleman Watts [Wed, 30 Apr 2014 01:45:19 +0000 (18:45 -0700)]
CRM-14215 - Fix popup form errors
Eileen McNaughton [Wed, 30 Apr 2014 01:42:32 +0000 (18:42 -0700)]
Add required field to test case
This field was not required earlier but at some point I made it required as it was not possible to create a valid schedule without this or absolute_date
Dave Greenberg [Wed, 30 Apr 2014 01:39:54 +0000 (18:39 -0700)]
Merge pull request #3038 from davecivicrm/fixContribHelp
Clarify contribution form amount field help given the possibility of par...
Dave Greenberg [Wed, 30 Apr 2014 01:37:50 +0000 (18:37 -0700)]
Clarify contribution form amount field help given the possibility of partial payments.
Frank J. Gómez [Wed, 30 Apr 2014 01:35:10 +0000 (18:35 -0700)]
Code clean-up. Initialized variables. Removed unused variables.
Frank J. Gómez [Wed, 30 Apr 2014 01:33:43 +0000 (18:33 -0700)]
Fix for CRM-14375: Membership fee doubled when fixed contribution option set to "no thank you."
----------------------------------------
* CRM-14375: Membership fee doubled when fixed contribution option set to "no thank you"
https://issues.civicrm.org/jira/browse/CRM-14375
Kurund Jalmi [Wed, 30 Apr 2014 01:22:17 +0000 (18:22 -0700)]
Merge pull request #3026 from GinkgoFJG/CRM-14487
CRM-14487 - Fixed PHP notices.
Kurund Jalmi [Wed, 30 Apr 2014 01:15:53 +0000 (18:15 -0700)]
Merge pull request #3036 from kurund/CRM-14503
fixed indentation and added comments, CRM-14503
kurund [Wed, 30 Apr 2014 01:14:39 +0000 (18:14 -0700)]
fixed indentation and added comments, CRM-14503
----------------------------------------
* CRM-14503: Incorrect global groups listing
https://issues.civicrm.org/jira/browse/CRM-14503
Dave Greenberg [Wed, 30 Apr 2014 00:53:44 +0000 (17:53 -0700)]
Merge pull request #3035 from davecivicrm/fixEventAmountLabel
Clarify label and remove help on Create Participant form.
Dave Greenberg [Wed, 30 Apr 2014 00:53:16 +0000 (17:53 -0700)]
Clarify label and remove help on Create Participant form.
Kurund Jalmi [Wed, 30 Apr 2014 00:33:53 +0000 (17:33 -0700)]
Merge pull request #2744 from pratik-joshi/CRM-13992_temp_fix
CRM-14386 fix for : form rule validation notifications not shown
Kurund Jalmi [Wed, 30 Apr 2014 00:33:04 +0000 (17:33 -0700)]
Merge pull request #3024 from relldoesphp/CRM-14503
CRM-14503 patch fixes grouphierarchy error
Coleman Watts [Wed, 30 Apr 2014 00:14:32 +0000 (17:14 -0700)]
Merge branch 'tests'
Conflicts:
CRM/Core/SelectValues.php
Coleman Watts [Tue, 29 Apr 2014 20:42:05 +0000 (13:42 -0700)]
Code cleanup
Coleman Watts [Tue, 29 Apr 2014 20:27:03 +0000 (13:27 -0700)]
tpl cleanup
colemanw [Tue, 29 Apr 2014 20:16:23 +0000 (13:16 -0700)]
Merge pull request #3021 from NileemaJadhav/HR-345
HR-345 Fix the broken edit link on profileSelector for support of case sub type
Maggie [Tue, 29 Apr 2014 19:06:08 +0000 (15:06 -0400)]
CRM-14499: Update FourFour upgrade script and changes image urls to improve security but allow access
Kurund Jalmi [Tue, 29 Apr 2014 19:50:48 +0000 (12:50 -0700)]
Merge pull request #3007 from GinkgoFJG/CRM-14283
Fixed CRM-14283. Strips protocol and domain name from premium image befo...
Yashodha Chaku [Tue, 29 Apr 2014 19:50:41 +0000 (01:20 +0530)]
Merge pull request #3027 from yashodha/CRM-14418
CRM-14418: fix scheduled reminder UI
Yashodha Chaku [Tue, 29 Apr 2014 19:28:31 +0000 (00:58 +0530)]
Merge pull request #3018 from divya-jose/HR-344-fixes
--fixes for HR-344,changes to retrieve caseId based on case_type
Eileen McNaughton [Tue, 29 Apr 2014 19:15:28 +0000 (12:15 -0700)]
Merge pull request #3031 from eileenmcnaughton/code-cleanup
standardise api scheduled reminder
Eileen McNaughton [Thu, 13 Mar 2014 04:53:36 +0000 (17:53 +1300)]
CRM-14319 standardise action_schedule api
in the course of trying to write tests for this I found the api was non-standard in ways that suggested copy & paste rather than
intention. The mandatory fields said one of title, mapping_id, entity_value & entity_status - whereas it seemed to me that all
are required except entity_status, also I found that one date field was required, other changes were only legacy boilerplate
----------------------------------------
* CRM-14319: not all scheduled reminders are being sent
http://issues.civicrm.org/jira/browse/CRM-14319
Conflicts:
api/v3/ActionSchedule.php
Eileen McNaughton [Tue, 29 Apr 2014 14:56:20 +0000 (07:56 -0700)]
fix comment blocks
Coleman Watts [Tue, 29 Apr 2014 19:02:05 +0000 (12:02 -0700)]
Fix profileSelector and select2
Maggie [Tue, 29 Apr 2014 16:44:52 +0000 (12:44 -0400)]
Rewrote system CRM_Utils_System::download to take optional disposition argument
Eileen McNaughton [Tue, 29 Apr 2014 18:29:18 +0000 (11:29 -0700)]
Merge pull request #3028 from eileenmcnaughton/test-fixes
Test fixes - Membership form test
Eileen McNaughton [Tue, 29 Apr 2014 14:39:04 +0000 (07:39 -0700)]
minor code tidyups
Eileen McNaughton [Tue, 29 Apr 2014 16:48:59 +0000 (09:48 -0700)]
more comment fixes
Eileen McNaughton [Tue, 29 Apr 2014 17:39:07 +0000 (10:39 -0700)]
fix invalid php count statement (identified by IDE - unsure if it was causing bug
Eileen McNaughton [Tue, 29 Apr 2014 14:34:04 +0000 (07:34 -0700)]
add product api test:
Eileen McNaughton [Tue, 29 Apr 2014 18:25:50 +0000 (11:25 -0700)]
update membership form rule test
Coleman Watts [Tue, 29 Apr 2014 18:21:42 +0000 (11:21 -0700)]
CRM-14181 - Cleanup membership form
colemanw [Tue, 29 Apr 2014 17:50:55 +0000 (10:50 -0700)]
Merge pull request #3001 from torrance/breadcrumbs
Ensure breadcrumbs are formatted correctly by the CMS.
Eileen McNaughton [Tue, 29 Apr 2014 17:39:07 +0000 (10:39 -0700)]
fix invalid php count statement (identified by IDE - unsure if it was causing bug
Eileen McNaughton [Tue, 29 Apr 2014 17:22:45 +0000 (10:22 -0700)]
Merge pull request #3025 from sgladstone/patch-3
Update Membership.php
Sarah Gladstone [Tue, 29 Apr 2014 17:21:38 +0000 (10:21 -0700)]
Update Membership.php
formatting improvements
Sarah Gladstone [Tue, 29 Apr 2014 17:16:13 +0000 (10:16 -0700)]
Update Membership.php
Change compare to false to "empty" function
Frank J. Gómez [Tue, 29 Apr 2014 17:11:53 +0000 (10:11 -0700)]
CRM-14487 - Fixed PHP notices.
----------------------------------------
* CRM-14487:
https://issues.civicrm.org/jira/browse/CRM-14487
Sarah Gladstone [Tue, 29 Apr 2014 17:11:49 +0000 (10:11 -0700)]
Update Membership.php
Check if status_id is empty before using it to look inside an array
Tyrell Cook [Tue, 29 Apr 2014 17:06:51 +0000 (13:06 -0400)]
CRM-14503 patch fixes grouphierarchy error
Kurund Jalmi [Tue, 29 Apr 2014 16:59:20 +0000 (09:59 -0700)]
Merge pull request #3016 from jitendrapurohit/Import_Webtest
Web Test Fix
Eileen McNaughton [Tue, 29 Apr 2014 16:48:59 +0000 (09:48 -0700)]
more comment fixes
Eileen McNaughton [Tue, 29 Apr 2014 16:46:58 +0000 (09:46 -0700)]
CRM-14181 remove form-related enum options from static functions (need to separately alter form elements) as this breaks test & returns invalid options (eg api)
colemanw [Tue, 29 Apr 2014 16:26:25 +0000 (09:26 -0700)]
Merge pull request #3012 from eileenmcnaughton/CRM-14527
CRM-14527 migrate cid=0 to use entity ref
Eileen McNaughton [Tue, 29 Apr 2014 14:56:20 +0000 (07:56 -0700)]
fix comment blocks
Nileema [Tue, 29 Apr 2014 14:47:18 +0000 (20:17 +0530)]
HR-345 Fix the broken edit link on profileSelector for support of case sub type
Eileen McNaughton [Tue, 29 Apr 2014 14:44:04 +0000 (07:44 -0700)]
minor code tidy ups
Eileen McNaughton [Tue, 29 Apr 2014 14:39:04 +0000 (07:39 -0700)]
minor code tidyups
Divya Jose [Tue, 29 Apr 2014 14:34:36 +0000 (20:04 +0530)]
--minor fixes