Eileen McNaughton [Thu, 1 May 2014 23:09:01 +0000 (16:09 -0700)]
Merge pull request #3102 from eileenmcnaughton/tests
CRM-14319 test set up tweaks
Eileen McNaughton [Thu, 1 May 2014 23:08:15 +0000 (16:08 -0700)]
CRM-14319 test set up tweaks
Kurund Jalmi [Thu, 1 May 2014 22:48:22 +0000 (15:48 -0700)]
Merge pull request #3100 from kurund/CRM-14563
clean and fixes for CRM-14563
kurund [Thu, 1 May 2014 22:46:17 +0000 (15:46 -0700)]
clean and fixes for CRM-14563
----------------------------------------
* CRM-14563: Search builder IN operator on a custom field
https://issues.civicrm.org/jira/browse/CRM-14563
Eileen McNaughton [Thu, 1 May 2014 22:41:34 +0000 (15:41 -0700)]
Merge pull request #3099 from eileenmcnaughton/CRM-14494
CRM-14494 add system logger (PSR3)
Eileen McNaughton [Thu, 1 May 2014 22:39:52 +0000 (15:39 -0700)]
CRM-14494 use preferred logger syntax
eileenmcnaughton [Thu, 1 May 2014 18:04:02 +0000 (18:04 +0000)]
CRM-14494 add system logger to handle payment notification & test
CRM-14449 log legacy style ipns to system_log
CRM-14449 logging request seems more consistent with others
CRM-14449 stding message value in payment notification logs
CRM-14449 log ipaddress on ipn calls
CRM-14449 add fn exists as legacy non-boostrapped methods get to this point
eileenmcnaughton [Thu, 1 May 2014 16:03:07 +0000 (16:03 +0000)]
CRM-14494 add system logger files
CRM-14449 Add system Log table to schema
Conflicts:
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
CRM-14449 add system log
CRM-14449 remove debug
Eileen McNaughton [Thu, 1 May 2014 22:24:24 +0000 (15:24 -0700)]
Merge pull request #3097 from eileenmcnaughton/CRM-14109
CRM-14109 add test for ajx fns
Kurund Jalmi [Thu, 1 May 2014 21:32:05 +0000 (14:32 -0700)]
Merge pull request #3089 from relldoesphp/CRM-14466
CRM-14466 made changes to how variables are initialized
Eileen McNaughton [Thu, 1 May 2014 20:24:20 +0000 (13:24 -0700)]
Merge pull request #3091 from eileenmcnaughton/CRM-14319
CRM-14319 test that extra contacts get scheduled reminders
Dave Greenberg [Thu, 1 May 2014 20:24:00 +0000 (13:24 -0700)]
Merge pull request #3092 from davecivicrm/CRM-14488
CRM-14488 - Additional fix for profiles with multiple Used For entries i...
eileenmcnaughton [Thu, 1 May 2014 20:23:56 +0000 (20:23 +0000)]
CRM-14109 add test for ajx fns
Dave Greenberg [Thu, 1 May 2014 20:22:46 +0000 (13:22 -0700)]
CRM-14488 - Additional fix for profiles with multiple Used For entries in uf_join table
----------------------------------------
* CRM-14488:
https://issues.civicrm.org/jira/browse/CRM-14488
Eileen McNaughton [Thu, 1 May 2014 20:12:20 +0000 (13:12 -0700)]
Merge pull request #3090 from eileenmcnaughton/CRM-14522
CRM-14522 remove incorrect FK
Eileen McNaughton [Thu, 1 May 2014 20:11:27 +0000 (13:11 -0700)]
CRM-14522 remove incorrect FK
eileenmcnaughton [Thu, 1 May 2014 20:09:49 +0000 (20:09 +0000)]
CRM-14319 test that extra contacts get scheduled reminders
Tyrell Cook [Thu, 1 May 2014 20:01:27 +0000 (16:01 -0400)]
CRM-14466 made changes to how variables are initialized
----------------------------------------
* CRM-14466: View manage case screen gives two PHP Notices (civicrm/contact/view/case?reset=1&action=view&cid=xxx&id=yyy&show=1)
https://issues.civicrm.org/jira/browse/CRM-14466
Kurund Jalmi [Thu, 1 May 2014 19:54:04 +0000 (12:54 -0700)]
Merge pull request #3087 from kurund/search-builder
CRM-13274, search builder fixes
kurund [Thu, 1 May 2014 19:53:33 +0000 (12:53 -0700)]
CRM-13274, search builder fixes
----------------------------------------
* CRM-13274: Sort by pseudo-constants is broken for search builder
https://issues.civicrm.org/jira/browse/CRM-13274
Tim Otten [Thu, 1 May 2014 19:52:08 +0000 (12:52 -0700)]
Merge pull request #3072 from mlutfy/master-crm14594
CRM-14594: bin/gitify: use the new civicrm-l10n-daily.tar.gz archive instead of the now deprecated SVN
Kurund Jalmi [Thu, 1 May 2014 18:48:43 +0000 (11:48 -0700)]
Merge pull request #3081 from mlutfy/master-crm14598
CRM-14598: Fix sql/4.5.alpha1.mysql.tpl FK declaration for the civicrm_mailing_settings
Kurund Jalmi [Thu, 1 May 2014 18:48:08 +0000 (11:48 -0700)]
Merge pull request #3080 from mlutfy/master-crm14597
CRM-14597: Fix for multi-lingual upgade, broken by the communication_style upgrade in sql/4.5.alpha1.mysql.tpl.
Mathieu Lutfy [Thu, 1 May 2014 18:46:42 +0000 (14:46 -0400)]
CRM-14598: Fix sql/4.5.alpha1.mysql.tpl FK declaration for the civicrm_mailing_settings.
Mathieu Lutfy [Thu, 1 May 2014 18:39:24 +0000 (14:39 -0400)]
CRM-14597: Fix for multi-lingual upgade, broken by the communication_style upgrade in sql/4.5.alpha1.mysql.tpl.
colemanw [Thu, 1 May 2014 18:21:21 +0000 (11:21 -0700)]
Merge pull request #3079 from mepps/fix-jquery-autocomplete-search
Fixed focus on jquery ui in navigation menu
Maggie [Thu, 1 May 2014 18:19:32 +0000 (14:19 -0400)]
Fixed focus on jquery ui in navigation menu
Kurund Jalmi [Thu, 1 May 2014 16:41:06 +0000 (09:41 -0700)]
Merge pull request #3041 from freeform/CRM-14470
CRM-14470 - Prevent users from adding two 'is_primary' fields of the same field type
Coleman Watts [Thu, 1 May 2014 04:26:58 +0000 (21:26 -0700)]
Revert "Ensure breadcrumbs are formatted correctly by the CMS."
This reverts commit
8cd191e0cd18b090e82205d3657960dbc5eb3f86.
colemanw [Thu, 1 May 2014 03:36:17 +0000 (20:36 -0700)]
Merge pull request #3063 from eileenmcnaughton/rebase
CRM-14581 upgrade Multisite form including stdise group api
Coleman Watts [Thu, 1 May 2014 03:35:56 +0000 (20:35 -0700)]
CRM-14581 user selector on group field - cleanup params
Mathieu Lutfy [Thu, 1 May 2014 02:49:56 +0000 (22:49 -0400)]
CRM-14594: bin/gitify: use the new civicrm-l10n-daily.tar.gz archive instead of the now deprecated SVN.
Eileen McNaughton [Thu, 1 May 2014 02:46:10 +0000 (19:46 -0700)]
Merge pull request #3073 from eileenmcnaughton/CRM-14449
CRM-14449 give up on fixing last 2 entities
Eileen McNaughton [Thu, 1 May 2014 02:45:48 +0000 (19:45 -0700)]
CRM-14449 give up on fixing last 2 entities
Eileen McNaughton [Thu, 1 May 2014 02:33:23 +0000 (19:33 -0700)]
Merge pull request #3071 from eileenmcnaughton/CRM-14449
CRM-14449 add test to check custom data (& some fixes to pass)
Eileen McNaughton [Thu, 1 May 2014 02:32:31 +0000 (19:32 -0700)]
CRM-14449 - re-fix case api _spec :-)
colemanw [Thu, 1 May 2014 02:19:57 +0000 (19:19 -0700)]
Merge pull request #3070 from colemanw/tagset
CRM-13966 - Switch to entityRef for tagsets
Coleman Watts [Thu, 1 May 2014 02:19:27 +0000 (19:19 -0700)]
CRM_Tag_Form_Tag - cleanup
Eileen McNaughton [Thu, 1 May 2014 02:16:53 +0000 (19:16 -0700)]
CRM-14449 case api fix _spec functions
Eileen McNaughton [Thu, 1 May 2014 02:08:49 +0000 (19:08 -0700)]
CRM-14449 case api code tidy up
Eileen McNaughton [Thu, 1 May 2014 01:53:07 +0000 (18:53 -0700)]
CRM-14449 activity api fix enotice to pass test, tidy up
Eileen McNaughton [Thu, 1 May 2014 01:44:55 +0000 (18:44 -0700)]
CRM-14449 stdise group api so it gets custom fields & works with getlist
Eileen McNaughton [Thu, 1 May 2014 01:30:28 +0000 (18:30 -0700)]
CRM-14449 add automated test for ensuring custom fields are handled adequately
Eileen McNaughton [Thu, 1 May 2014 01:29:00 +0000 (18:29 -0700)]
Merge pull request #3069 from eileenmcnaughton/CRM-14449
CRM-14449 api custom data behaviour - preliminary tidy up
Eileen McNaughton [Thu, 1 May 2014 01:28:41 +0000 (18:28 -0700)]
CRM-14449 api move custom formatting call to utils
Eileen McNaughton [Thu, 1 May 2014 01:25:24 +0000 (18:25 -0700)]
CRM-14449 api custom data behaviour - preliminary tidy up
Coleman Watts [Thu, 1 May 2014 01:24:31 +0000 (18:24 -0700)]
CRM-13966 - Tagset fixes for files
Tim Otten [Thu, 1 May 2014 01:14:03 +0000 (18:14 -0700)]
Merge pull request #2965 from generalredneck/CRM-14135
CRM-14135: Making Custom Membership Fields in profiles apply to all purchased Memberships.
colemanw [Thu, 1 May 2014 00:02:17 +0000 (17:02 -0700)]
Merge pull request #3066 from relldoesphp/CRM-14466
CRM-14466 removed multiple php notices from case pages
Tyrell Cook [Wed, 30 Apr 2014 23:37:45 +0000 (19:37 -0400)]
CRM-14466 added missing items to array
Tyrell Cook [Wed, 30 Apr 2014 23:31:49 +0000 (19:31 -0400)]
removed code
Tyrell Cook [Wed, 30 Apr 2014 23:10:19 +0000 (19:10 -0400)]
CRM-14466 make sure element is initalized if empty to avoid php notice
Tyrell Cook [Wed, 30 Apr 2014 23:08:35 +0000 (19:08 -0400)]
CRM-14466 found better way to intialize variables to avoid php notice
Tyrell Cook [Wed, 30 Apr 2014 23:03:27 +0000 (19:03 -0400)]
CRM-14466 found better way to intialize variables to avoid php notice
Tyrell Cook [Wed, 30 Apr 2014 22:31:01 +0000 (18:31 -0400)]
CRM-14466 initialized variables to get rid of php notices
Tim Otten [Wed, 30 Apr 2014 22:30:23 +0000 (15:30 -0700)]
Merge pull request #3003 from generalredneck/CRM-14171
CRM-14171: Give configuration warning if Anonymous role is granted inappropriate permissions
Dave Greenberg [Wed, 30 Apr 2014 22:28:20 +0000 (15:28 -0700)]
Merge pull request #3064 from davecivicrm/CRM-14361
CRM-14361 - Prevent addition of option values to certain option groups i...
Dave Greenberg [Wed, 30 Apr 2014 22:26:06 +0000 (15:26 -0700)]
CRM-14361 - Prevent addition of option values to certain option groups including contribution_status, financial_item_status, batch_status and others which are used programmatically.
----------------------------------------
* CRM-14361:
https://issues.civicrm.org/jira/browse/CRM-14361
Eileen McNaughton [Wed, 30 Apr 2014 22:07:15 +0000 (15:07 -0700)]
revert change on case - intended for separate commit set
dskallman [Wed, 30 Apr 2014 21:58:49 +0000 (14:58 -0700)]
CRM-13966 - Cleanup tagset function signature
----------------------------------------
* CRM-13966: Migrate asmSelect, tokeninput and autocompletes to use Select2
https://issues.civicrm.org/jira/browse/CRM-13966
Dave Greenberg [Wed, 30 Apr 2014 22:03:17 +0000 (15:03 -0700)]
Merge pull request #3051 from KarinG/CRM-14515
CRM-14515 - Replace 360px PCP image restriction w/ CSS resizing.
Eileen McNaughton [Wed, 30 Apr 2014 22:00:35 +0000 (15:00 -0700)]
CRM-14581 user selector on group field - fix post process
Eileen McNaughton [Wed, 30 Apr 2014 21:52:57 +0000 (14:52 -0700)]
comment fixes only
Eileen McNaughton [Wed, 30 Apr 2014 21:47:48 +0000 (14:47 -0700)]
CRM-14581 upgrade Multisite form
Dave Greenberg [Wed, 30 Apr 2014 22:01:08 +0000 (15:01 -0700)]
Merge pull request #3023 from KarinG/CRM-11302
CRM-11302: mailing optout/unsubscribe verification
colemanw [Wed, 30 Apr 2014 21:48:56 +0000 (14:48 -0700)]
Merge pull request #3062 from colemanw/master
Fix field label in xml
Coleman Watts [Wed, 30 Apr 2014 21:44:48 +0000 (14:44 -0700)]
Fix field label in xml
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
Coleman Watts [Wed, 30 Apr 2014 20:29:13 +0000 (13:29 -0700)]
CRM-13966 - Tagset cleanup - remove unused functions
Coleman Watts [Wed, 30 Apr 2014 20:09:20 +0000 (13:09 -0700)]
CRM-13966 - Tagset params fixes
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
Coleman Watts [Wed, 30 Apr 2014 19:46:13 +0000 (12:46 -0700)]
CRM-13966 - Tagset code cleanup
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
Lola Slade [Wed, 30 Apr 2014 19:15:18 +0000 (12:15 -0700)]
CRM-14470 - Moved check for existing field edits inside the function.
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
Coleman Watts [Wed, 30 Apr 2014 16:15:12 +0000 (09:15 -0700)]
CRM-13966 - Remove unneeded tpl variable
Kurund Jalmi [Wed, 30 Apr 2014 15:47:45 +0000 (08:47 -0700)]
Merge pull request #3047 from jitendrapurohit/WebTests
Web Test Fix
KarinG [Wed, 30 Apr 2014 15:38:04 +0000 (08:38 -0700)]
CRM-14515 - Replace 360px PCP image restriction w/ CSS resizing.
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
projects / civicrm-core.git / log