Yashodha Chaku [Wed, 14 Sep 2016 11:25:50 +0000 (16:55 +0530)]
Merge pull request #8993 from frederickgzmn/patch-1
CRM-19315 - Block ID and PCP ID are bugging result on getPcpDashboardInfo function
Yashodha Chaku [Wed, 14 Sep 2016 09:41:59 +0000 (15:11 +0530)]
Merge pull request #8994 from jitendrapurohit/CRM-17681
CRM-17681 - "Master address belongs to" field gives the master addres…
Yashodha Chaku [Wed, 14 Sep 2016 08:37:24 +0000 (14:07 +0530)]
Merge pull request #9030 from caleboki/fixed-typeError
CRM-19231 Fixed MultipleRecordFieldsListing.tpl extra th causing TypeError: i is undefined
Yashodha Chaku [Wed, 14 Sep 2016 04:51:33 +0000 (10:21 +0530)]
Merge pull request #9021 from yashodha/CRM-19222
CRM-19222 Export: temp table field length at least 255 for strings
Tim Otten [Wed, 14 Sep 2016 04:46:50 +0000 (21:46 -0700)]
Merge pull request #8960 from seamuslee001/validate-switch-composer
CRM-19284 Load Credit Card validation package using composer
Tim Otten [Wed, 14 Sep 2016 04:39:20 +0000 (21:39 -0700)]
Merge pull request #8959 from andrew-cormick-dockery/CRM-19283
CRM-19283 - Allow contribution forms to recognise new MasterCard 2-se…
Tim Otten [Tue, 13 Sep 2016 22:22:36 +0000 (15:22 -0700)]
Merge pull request #8503 from seamuslee001/CRM-18651
CRM 18651 - Add in Option Group and soft validation
Tim Otten [Tue, 13 Sep 2016 20:41:50 +0000 (13:41 -0700)]
Merge pull request #9015 from jitendrapurohit/CRM-17789
CRM-17789 - Fix Notice Error on PHP 7
Caleb Oki [Tue, 13 Sep 2016 15:23:42 +0000 (16:23 +0100)]
MultipleRecordFieldsListing.tpl extra th causing TypeError: i is undefined
yashodha [Tue, 13 Sep 2016 10:41:43 +0000 (16:11 +0530)]
CRM-19222 Export: temp table field length at least 255 for strings
----------------------------------------
* CRM-19222: Data too long on export including custom field
https://issues.civicrm.org/jira/browse/CRM-19222
Yashodha Chaku [Tue, 13 Sep 2016 09:43:02 +0000 (15:13 +0530)]
Merge pull request #9020 from yashodha/CRM-19235
CRM-19235 : Report locale notice
yashodha [Tue, 13 Sep 2016 07:58:35 +0000 (13:28 +0530)]
CRM-19235 : Report locale notice
----------------------------------------
* CRM-19235: Notice related to report permission on localized CiviCRM
https://issues.civicrm.org/jira/browse/CRM-19235
Seamus Lee [Tue, 13 Sep 2016 05:12:45 +0000 (15:12 +1000)]
Fix up pear-execption-fix as per comment from tim
Seamus Lee [Tue, 13 Sep 2016 01:22:18 +0000 (11:22 +1000)]
Add in post composer file to add in civicrm custom comment and test if class_exists or not
Seamus Lee [Fri, 9 Sep 2016 03:49:29 +0000 (13:49 +1000)]
update to use dev branch to ensure we get the 2bin mastercard changes
Seamus Lee [Wed, 31 Aug 2016 07:28:04 +0000 (17:28 +1000)]
CRM-19284 Load Credit Card validation package using composer
Yashodha Chaku [Tue, 13 Sep 2016 05:29:01 +0000 (10:59 +0530)]
Merge pull request #8978 from flaviovs/CRM-19123-merging-contacts-blank-date-fields-wrong
CRM-19123 - Merging contacts: blank date fields write as 1970
Tim Otten [Mon, 12 Sep 2016 20:47:28 +0000 (13:47 -0700)]
Merge pull request #9006 from seamuslee001/remove_debug
NFC remove debugging code mistakenly left in
jitendrapurohit [Mon, 12 Sep 2016 13:22:46 +0000 (18:52 +0530)]
CRM-17789 - Fix Notice Error on PHP 7
Seamus Lee [Fri, 9 Sep 2016 07:27:14 +0000 (17:27 +1000)]
Improve code as per comment from Jitendra and exclude activity_type from the check when saving the option value form and re run regen.sh
Seamus Lee [Wed, 7 Sep 2016 11:24:04 +0000 (21:24 +1000)]
Fix upgrade for multilingual and have strings as string rather than array
Seamus Lee [Fri, 2 Sep 2016 23:52:41 +0000 (09:52 +1000)]
Fix variable issue found by Jitendra
Seamus Lee [Fri, 2 Sep 2016 11:41:37 +0000 (21:41 +1000)]
move to static call as per comment from Jitendra and re run regen.sh
Seamus Lee [Wed, 31 Aug 2016 00:08:17 +0000 (10:08 +1000)]
Shift upgrade code to 4.7.12 and re run regen.sh
Seamus Lee [Thu, 21 Jul 2016 00:20:44 +0000 (10:20 +1000)]
Shift Upgrade code to php for more stability
Seamus Lee [Thu, 21 Jul 2016 00:07:20 +0000 (10:07 +1000)]
Fix up OptionGroup Form
Seamus Lee [Wed, 20 Jul 2016 23:54:33 +0000 (09:54 +1000)]
Move getting dataType into own function and add test of loading data type also minor code changes as suggested on PR
Seamus Lee [Wed, 20 Jul 2016 23:25:01 +0000 (09:25 +1000)]
Shift upgrade script to 4.7.10
Re run regen.sh
Seamus Lee [Fri, 2 Sep 2016 11:43:09 +0000 (21:43 +1000)]
Fix up Option Group Check
Seamus Lee [Wed, 13 Jul 2016 04:58:47 +0000 (04:58 +0000)]
Fix up upgrade script and add a system check
Seamus Lee [Wed, 13 Jul 2016 04:58:00 +0000 (04:58 +0000)]
Add in updates to install to set data types for some option groups
Seamus Lee [Sat, 18 Jun 2016 02:09:34 +0000 (12:09 +1000)]
Add in updates to install to set data types for some option groups
Fix up upgrade script and add a system check
rerun regen after rebasing
WIP on adding data type for option group
Further work on soft fail when option value value field doesn't match given data type
Seamus Lee [Sun, 5 Jun 2016 13:50:24 +0000 (23:50 +1000)]
Add in setting Data Type when option groups are created from custom fields
Seamus Lee [Sun, 5 Jun 2016 13:28:34 +0000 (23:28 +1000)]
Further work on soft fail when option value value field doesn't match given data type
Seamus Lee [Sun, 5 Jun 2016 09:49:24 +0000 (19:49 +1000)]
WIP on adding data type for option group
Yashodha Chaku [Fri, 9 Sep 2016 10:53:44 +0000 (16:23 +0530)]
Merge pull request #8998 from yashodha/CRM-19271
CRM-19271 - Repeat event: cannot repeat an event for more than 3 days…
yashodha [Fri, 9 Sep 2016 09:29:22 +0000 (14:59 +0530)]
fix typo in upgrdae
Seamus Lee [Fri, 9 Sep 2016 08:03:59 +0000 (18:03 +1000)]
NFC remove debugging code mistakenly left in
Yashodha Chaku [Thu, 8 Sep 2016 16:20:55 +0000 (21:50 +0530)]
Merge pull request #9002 from ginkgomzd/patch-2
CRM-19327 - remove invalid SQL character
Michael Z Daryabeygi [Thu, 8 Sep 2016 14:49:54 +0000 (10:49 -0400)]
remove invalid SQL character
resolve issue posted to SE: https://civicrm.stackexchange.com/questions/12647/what-causes-the-sms-system-to-stop-working-and-throw-db-errors
Yashodha Chaku [Thu, 8 Sep 2016 10:47:14 +0000 (16:17 +0530)]
Merge pull request #8968 from yashodha/CRM-19293
CRM-19293: Dashboard options disappear after CiviContribute Component…
yashodha [Thu, 8 Sep 2016 08:23:32 +0000 (13:53 +0530)]
CRM-19293: Dashboard options disappear after CiviContribute Component Settings save
----------------------------------------
* CRM-19293: Dashboard options disappear after CiviContribute Component Settings save
https://issues.civicrm.org/jira/browse/CRM-19293
yashodha [Thu, 1 Sep 2016 10:13:30 +0000 (15:43 +0530)]
CRM-19293: Dashboard options disappear after CiviContribute Component Settings save
----------------------------------------
* CRM-19293: Dashboard options disappear after CiviContribute Component Settings save
https://issues.civicrm.org/jira/browse/CRM-19293
yashodha [Thu, 8 Sep 2016 07:11:16 +0000 (12:41 +0530)]
CRM-19271: schema changes reflected in DAO
----------------------------------------
* CRM-19271: Repeat event: cannot repeat an event for more than 3 days
https://issues.civicrm.org/jira/browse/CRM-19271
yashodha [Thu, 8 Sep 2016 03:55:22 +0000 (09:25 +0530)]
CRM-19271 - Repeat event: cannot repeat an event for more than 3 days(handled upgrade as well)
----------------------------------------
* CRM-19271: Repeat event: cannot repeat an event for more than 3 days
https://issues.civicrm.org/jira/browse/CRM-19271
Yashodha Chaku [Thu, 8 Sep 2016 03:48:24 +0000 (09:18 +0530)]
Merge pull request #8995 from code-wizard/master
Issue #CRM-19271 Fixed: Repeat event: cannot repeat an event for more than 3 days
Yashodha Chaku [Thu, 8 Sep 2016 03:06:53 +0000 (08:36 +0530)]
Merge pull request #8991 from nielosz/fix-getMailingGroupIds-unknown-var
CRM-19322 - Fix unitialized table name var
Mathieu Lutfy [Wed, 7 Sep 2016 21:03:45 +0000 (17:03 -0400)]
Merge pull request #8929 from twomice/CRM-19240
Fix CRM-19240
Yashodha Chaku [Wed, 7 Sep 2016 10:14:07 +0000 (15:44 +0530)]
Merge pull request #8961 from jmcclelland/CRM-19286
CRM-19286 - civicrm_survey is used by CiviCampaign and should be allo…
jitendrapurohit [Wed, 7 Sep 2016 09:37:38 +0000 (15:07 +0530)]
CRM-17681 - "Master address belongs to" field gives the master address id rather than the contact name
Yashodha Chaku [Wed, 7 Sep 2016 09:40:44 +0000 (15:10 +0530)]
Merge pull request #8949 from jitendrapurohit/CRM-19262
CRM-19262 - Fix offline Pay Now Functionality
Yashodha Chaku [Wed, 7 Sep 2016 09:39:22 +0000 (15:09 +0530)]
Merge pull request #8970 from jitendrapurohit/CRM-19263
CRM-19263
Ebuka Amaefula [Wed, 7 Sep 2016 09:35:55 +0000 (15:05 +0530)]
Edit the xml/schema/Core/ActionSechule.xml. Change start_action_condition character length from 32 to 62
Yashodha Chaku [Wed, 7 Sep 2016 09:33:47 +0000 (15:03 +0530)]
Merge pull request #8829 from monishdeb/CRM-19172
CRM-19172: on behalf form + user account creation attempts to create user for org
nielosz [Wed, 7 Sep 2016 08:08:25 +0000 (10:08 +0200)]
Update Mailing.php
Frederic Guzman [Tue, 6 Sep 2016 20:02:39 +0000 (16:02 -0400)]
Block ID and PCP ID are bugging result on getPcpDashboardInfo function
Now you can peek, this query is looking for PCP in database, and showing all tables of civicrm_pcp and civicrm_pcp_block, this include their "ID", it can be fail because depend the configuration of database server the result, i mean, the server will select between pcp_block's(table) ID or pcp's(table) ID(In my case, my database server, selected the block ID instead of PCP ID), it's bad because pcp(table) and pcp_block(table) they has the same ID field name, but, it's good structure schema in database, the problem is the query, and can be solve.
Tim Otten [Tue, 6 Sep 2016 19:43:31 +0000 (12:43 -0700)]
Merge pull request #8989 from civicrm/4.7.11-rc
4.7.11 rc
Jamie McClelland [Tue, 6 Sep 2016 15:12:02 +0000 (11:12 -0400)]
CRM-19286 - add unit test to avoid future problems with surveys.
Jamie McClelland [Wed, 31 Aug 2016 13:04:53 +0000 (09:04 -0400)]
CRM-19286 - civicrm_survey is used by CiviCampaign and should be allowed.
jitendrapurohit [Tue, 6 Sep 2016 11:32:10 +0000 (17:02 +0530)]
return to the contrib edit form
jitendrapurohit [Tue, 6 Sep 2016 05:45:00 +0000 (11:15 +0530)]
Change button name and amount
jitendrapurohit [Tue, 6 Sep 2016 10:12:06 +0000 (15:42 +0530)]
additional fix for offline pay now
nielosz [Tue, 6 Sep 2016 09:47:15 +0000 (11:47 +0200)]
Fix unitialized table name var
Tim Otten [Mon, 5 Sep 2016 21:46:54 +0000 (14:46 -0700)]
Merge pull request #8979 from ergonlogic/dev/CRM-19306
Fixes CRM-19306: Fix documentation for upload directories in civicrm.…
Tim Otten [Mon, 5 Sep 2016 20:04:02 +0000 (13:04 -0700)]
Merge pull request #8973 from seamuslee001/CRM-19301
CRM-19301 fix dashboard upgrade for multilingual sites
colemanw [Sun, 4 Sep 2016 15:58:12 +0000 (11:58 -0400)]
Merge pull request #8981 from colemanw/ApiExplorer
ApiExplorer - Fix formatting of getvalue return field
Seamus Lee [Fri, 2 Sep 2016 23:46:15 +0000 (09:46 +1000)]
CRM-19291 Fix up eileen's fix for multilingual use practice from 4.6.0 to use first locale for name
Seamus Lee [Fri, 2 Sep 2016 22:14:31 +0000 (08:14 +1000)]
Ensure new column is added to base table when fixing up dashboard and rebuild multilingual structure afterwads
Seamus Lee [Fri, 2 Sep 2016 22:06:19 +0000 (08:06 +1000)]
Rebuild localisation schema after dropping column
Seamus Lee [Fri, 2 Sep 2016 08:17:32 +0000 (18:17 +1000)]
CRM-19301 fix dashboard upgrade for multilingual sites
Coleman Watts [Sun, 4 Sep 2016 01:26:17 +0000 (21:26 -0400)]
ApiExplorer - Fix formatting of getvalue return field
Christopher Gervais [Sat, 3 Sep 2016 19:35:41 +0000 (15:35 -0400)]
Fixes CRM-19306: Fix documentation for upload directories in civicrm.settings.php template.
Flávio Veloso [Fri, 2 Sep 2016 23:31:59 +0000 (16:31 -0700)]
Fix some Coding Standards whitespace violations
Flávio Veloso [Fri, 2 Sep 2016 22:26:23 +0000 (15:26 -0700)]
CRM-19123 Merging contacts: blank date fields write as 1970
----------------------------------------
* CRM-19123: Merging contacts: blank date fields write as 1970
https://issues.civicrm.org/jira/browse/CRM-19123
jitendrapurohit [Fri, 2 Sep 2016 08:35:22 +0000 (14:05 +0530)]
additional fixes for pay later
jitendrapurohit [Fri, 2 Sep 2016 07:01:32 +0000 (12:31 +0530)]
additional fixes
jitendrapurohit [Thu, 1 Sep 2016 12:00:12 +0000 (17:30 +0530)]
Additional fixes
Eileen McNaughton [Fri, 2 Sep 2016 02:37:03 +0000 (14:37 +1200)]
Merge pull request #8967 from seamuslee001/CRM-19291
CRM-19291 put Eileen's fix into upgrade script
Tim Otten [Thu, 1 Sep 2016 23:18:15 +0000 (16:18 -0700)]
Merge pull request #8965 from seamuslee001/CRM-19290
CRM-19290 Fix date creation in Karma test
Seamus Lee [Thu, 1 Sep 2016 10:05:32 +0000 (20:05 +1000)]
CRM-19291 put Eileen's fix into upgrade script
jitendrapurohit [Thu, 1 Sep 2016 09:52:09 +0000 (15:22 +0530)]
CRM-19263 - Online Pay Now Fix
Yashodha Chaku [Thu, 1 Sep 2016 07:38:49 +0000 (13:08 +0530)]
Merge pull request #8962 from KarinG/patch-1
CRM-19289 - English language/grammar edit
Seamus Lee [Wed, 31 Aug 2016 23:40:25 +0000 (09:40 +1000)]
CRM-19290 Fix date creation in Karma test
Karin Gerritsen [Wed, 31 Aug 2016 17:37:18 +0000 (11:37 -0600)]
English grammar edit
Yashodha Chaku [Wed, 31 Aug 2016 09:36:07 +0000 (15:06 +0530)]
Merge pull request #8951 from jitendrapurohit/CRM-19275
CRM-19275 - DB Error on adding priceset when deferred revenue setting…
Andrew Cormick-Dockery [Wed, 31 Aug 2016 07:08:31 +0000 (07:08 +0000)]
CRM-19283 - Allow contribution forms to recognise new MasterCard 2-series BIN numbers
Tim Otten [Tue, 30 Aug 2016 20:59:06 +0000 (13:59 -0700)]
Merge pull request #8943 from seamuslee001/CRM-19261
CRM-19261 Set uniqueID as well
jitendrapurohit [Tue, 30 Aug 2016 09:57:34 +0000 (15:27 +0530)]
CRM-19275 - DB Error on adding priceset when deferred revenue setting is enabled
jitendrapurohit [Tue, 30 Aug 2016 06:07:17 +0000 (11:37 +0530)]
CRM-19262 - Fix offline Pay Now Functionality
Tim Otten [Tue, 30 Aug 2016 06:59:29 +0000 (23:59 -0700)]
Merge pull request #8946 from totten/4.7.11-nag
CRM-15928, CRM-15925 - Refine upgrade nags
Monish Deb [Tue, 30 Aug 2016 04:44:02 +0000 (10:14 +0530)]
Merge pull request #8760 from jitendrapurohit/CRM-19121
CRM-19121 - add DT for soft credit listings
Tim Otten [Tue, 30 Aug 2016 04:18:30 +0000 (21:18 -0700)]
CRM-15928 - CRM/Upgrade - Enable remote_profile_submissions
Tim Otten [Tue, 30 Aug 2016 03:51:51 +0000 (20:51 -0700)]
CRM-15925 - CRM/Upgrade - Add post-upgrade msg re: "import SQL datasource"
Tim Otten [Tue, 30 Aug 2016 03:34:42 +0000 (20:34 -0700)]
CRM-15928 - CRM_Upgrade - Remove post-upgrade msg re: profiles
We'll be switching the upgrade to enable this feature by default on existing
sites.
Tim Otten [Tue, 30 Aug 2016 03:32:12 +0000 (20:32 -0700)]
CRM-15928 - Display warning if `remote_profile_submissions` is enabled
Tim Otten [Tue, 30 Aug 2016 04:01:15 +0000 (21:01 -0700)]
Set version to 4.7.12
Tim Otten [Mon, 29 Aug 2016 22:01:23 +0000 (15:01 -0700)]
Merge pull request #8936 from cividesk/CRM-19261-4.7
CRM-19261: full fix
Seamus Lee [Mon, 29 Aug 2016 07:29:12 +0000 (17:29 +1000)]
Fix escaping
Seamus Lee [Mon, 29 Aug 2016 22:24:44 +0000 (08:24 +1000)]
CRM-19261 Set uniqueID as well
Yashodha Chaku [Mon, 29 Aug 2016 06:54:23 +0000 (12:24 +0530)]
Merge pull request #8934 from JMAConsulting/CRM-19260
CRM-19260, fixed function name
projects / civicrm-core.git / log