Adam Roses Wight [Sun, 1 Dec 2013 00:31:22 +0000 (16:31 -0800)]
Split code generation into components.
Parsing the specification has become its own class.
Templating has been abstracted, now beautifying is built into all php
generation. We lose the singleton efficiency, it gained us a few seconds
at most.
Generation tasks are split into ITasks, and are fed the main CG object
as if it were a configuration object. Eventually we will want to make
the configuration a first-class object so that it is customizable.
----------------------------------------
* CRM-13871: Provide an ORM layer: Doctrine
http://issues.civicrm.org/jira/browse/CRM-13871
Adam Roses Wight [Sat, 30 Nov 2013 19:25:52 +0000 (11:25 -0800)]
CRM-13871 Move code generation implementation into CRM/Core
----------------------------------------
* CRM-13871: Provide an ORM layer: Doctrine
http://issues.civicrm.org/jira/browse/CRM-13871
dlobo [Fri, 29 Nov 2013 16:17:05 +0000 (08:17 -0800)]
Merge pull request #2120 from pratik-joshi/CRM-13857
Crm 13857
Pratik Joshi [Fri, 29 Nov 2013 06:19:08 +0000 (11:49 +0530)]
CRM-13857 indentation fix
Pratik Joshi [Fri, 29 Nov 2013 06:15:42 +0000 (11:45 +0530)]
CRM-13857
colemanw [Thu, 28 Nov 2013 01:04:58 +0000 (17:04 -0800)]
Merge pull request #2116 from civicrm/4.4
Merge branch 4.4 into master
colemanw [Thu, 28 Nov 2013 01:02:47 +0000 (17:02 -0800)]
Merge pull request #2115 from colemanw/master
CRM-10693 - crmSnippet - Convert clientside helpers to use $.widget; standardize events.
Coleman Watts [Thu, 28 Nov 2013 01:01:48 +0000 (17:01 -0800)]
CRM-10693 - crmSnippet - Convert clientside helpers to use $.widget; standardize events.
dlobo [Thu, 28 Nov 2013 00:57:53 +0000 (16:57 -0800)]
Merge pull request #2112 from lcdservices/CRM-13852
CRM-13852 flush cache before saving activity filter pref
Brian Shaughnessy [Wed, 27 Nov 2013 21:33:10 +0000 (16:33 -0500)]
CRM-13852 remove default value as the key always exists so it will never be applied anyway
Brian Shaughnessy [Wed, 27 Nov 2013 21:26:58 +0000 (16:26 -0500)]
CRM-13852 flush cache before saving activity filter pref
Kurund Jalmi [Wed, 27 Nov 2013 20:47:02 +0000 (12:47 -0800)]
Merge pull request #2110 from freeform/CRM-13850
CRM-13850 - Remove outdated reference to UpdatePledgeRecord.php.
Lola Slade [Wed, 27 Nov 2013 19:05:30 +0000 (14:05 -0500)]
CRM-13850 - Remove outdated reference to UpdatePledgeRecord.php.
----------------------------------------
* CRM-13850: Help is Incorrect on pledge reminders tab
http://issues.civicrm.org/jira/browse/CRM-13850
dlobo [Wed, 27 Nov 2013 14:30:28 +0000 (06:30 -0800)]
Merge pull request #2101 from eileenmcnaughton/CRM-13841
Fix Group Organization BAO not to error if the unique pairing up group_i...
Tim Otten [Wed, 27 Nov 2013 13:47:11 +0000 (05:47 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-27-05-47-07
Tim Otten [Wed, 27 Nov 2013 13:17:38 +0000 (05:17 -0800)]
Merge pull request #2106 from NileemaJadhav/HR-fix
-- Modification to remove warnings/notices on uninstall of CiviHR extension
Nileema [Wed, 27 Nov 2013 12:35:26 +0000 (18:05 +0530)]
-- Modification to remove warnings/notices on uninstall of CiviHR extension
Tim Otten [Wed, 27 Nov 2013 11:30:25 +0000 (03:30 -0800)]
Merge pull request #2104 from totten/4.4-ext-postpostinstall
CRM_Extension_Manager - Add stub for onPostPostInstall
Tim Otten [Wed, 27 Nov 2013 11:27:27 +0000 (03:27 -0800)]
CRM_Extension_Manager - Add stub for onPostPostInstall
This is a fix/followup to
3d0e24ec2
colemanw [Tue, 26 Nov 2013 23:59:23 +0000 (15:59 -0800)]
Merge pull request #2102 from eileenmcnaughton/CRM-13744
CRM-13744 permissions allow 'or' permissions - prevents regression on ev...
Eileen [Tue, 19 Nov 2013 09:10:06 +0000 (09:10 +0000)]
CRM-13744 permissions allow 'or' permissions - prevents regression on event registration under some circumstances
----------------------------------------
* CRM-13744: cid=0 contribution & event form autocompletes not working for people with *only* access ajax api
http://issues.civicrm.org/jira/browse/CRM-13744
Eileen [Tue, 26 Nov 2013 23:25:28 +0000 (12:25 +1300)]
Fix Group Organization BAO not to error if the unique pairing up group_id & organization_id is passed in without the id
colemanw [Tue, 26 Nov 2013 22:57:54 +0000 (14:57 -0800)]
Merge pull request #2100 from kenwest/CRM-13840
CRM-13840
Ken West [Tue, 26 Nov 2013 22:47:26 +0000 (09:47 +1100)]
CRM-13840 Edit button not showing when viewing Contact record
colemanw [Tue, 26 Nov 2013 22:14:24 +0000 (14:14 -0800)]
Merge pull request #2099 from brylie/patch-1
CRM-12045 Modified description of form element, yes/no question.
Brylie Oxley [Tue, 26 Nov 2013 21:55:55 +0000 (13:55 -0800)]
Modified description of form toggle to indicate yes/no true/false response.
dlobo [Tue, 26 Nov 2013 18:09:47 +0000 (10:09 -0800)]
Merge pull request #2095 from dlobo/CRM-13838
CRM-13838 - Report filtering by price level
colemanw [Tue, 26 Nov 2013 16:11:14 +0000 (08:11 -0800)]
Merge pull request #2078 from totten/4.4-profile-event
HR-8 - MultipleRecordFieldsListing.tpl - Trigger JS event when dialog opens
Tim Otten [Tue, 26 Nov 2013 15:28:31 +0000 (07:28 -0800)]
Merge pull request #2096 from totten/4.4-syntaxtest-override
api_v3_SyntaxConformanceTest - Allow subclasses to override (filter) the list of entities
Tim Otten [Tue, 26 Nov 2013 15:14:01 +0000 (07:14 -0800)]
api_v3_SyntaxConformanceTest - Allow subclasses to override (filter) the list of entities
Donald A. Lobo [Tue, 26 Nov 2013 14:55:20 +0000 (06:55 -0800)]
CRM-13838 - Report iltering by price level
http://issues.civicrm.org/jira/browse/CRM-13838
dlobo [Tue, 26 Nov 2013 14:33:24 +0000 (06:33 -0800)]
Merge pull request #2077 from totten/4.4-case-warning
CRM_Case_Form_Activity - Fix PHP warning when opening case
Kurund Jalmi [Tue, 26 Nov 2013 10:26:26 +0000 (02:26 -0800)]
Merge pull request #2093 from monishdeb/CRM-13738
CRM-13738 related fix on 'Limit current user' filter handling on Where clause
Kurund Jalmi [Tue, 26 Nov 2013 10:26:04 +0000 (02:26 -0800)]
Merge pull request #2092 from yashodha/4.4.CRM-13834
CRM-13834 - fix sort order for source contact
monishdeb [Tue, 26 Nov 2013 09:53:48 +0000 (15:23 +0530)]
CRM-13738 related fix on 'Limit current user' filter handling on Where clause
----------------------------------------
* CRM-13738: Activity Report fails if filtering on any contact
http://issues.civicrm.org/jira/browse/CRM-13738
Tim Otten [Tue, 26 Nov 2013 09:48:22 +0000 (01:48 -0800)]
HR-8 - MultipleRecordsFieldsListing.tpl - Trigger crmFormLoad instead of profile-dialog:*:open
kurund [Tue, 26 Nov 2013 06:49:38 +0000 (12:19 +0530)]
regenerated data
kurund [Tue, 26 Nov 2013 06:41:48 +0000 (12:11 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-26-11-46-28
Conflicts:
CRM/Contact/Form/Search/Custom/Group.php
sql/civicrm_generated.mysql
templates/CRM/Contact/Page/View/Summary.tpl
xml/version.xml
yashodha [Tue, 26 Nov 2013 06:38:59 +0000 (12:08 +0530)]
CRM-13834 - fix sort order for source contact
kurund [Tue, 26 Nov 2013 06:13:26 +0000 (11:43 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-11-26-11-43-18
Kurund Jalmi [Tue, 26 Nov 2013 05:44:47 +0000 (21:44 -0800)]
Merge pull request #2088 from colemanw/4.4
CRM-13830 - MailingGroup API - hack to disable pseudoconstant lookup
Kurund Jalmi [Tue, 26 Nov 2013 05:37:51 +0000 (21:37 -0800)]
Merge pull request #2089 from eileenmcnaughton/CRM-13769
CRM-13769 Backoffice membership renewal form - prefill time
colemanw [Tue, 26 Nov 2013 04:23:01 +0000 (20:23 -0800)]
CRM_Utils_Hook_Joomla - Fix PHP fatal parse error (missing comma)
Eileen [Tue, 26 Nov 2013 03:27:35 +0000 (16:27 +1300)]
CRM-13769 Backoffice membership renewal form - prefill time
This has already been fixed in 4.4 for backoffice membership form on receive-date field, but not on renewal form
----------------------------------------
* CRM-13769: Receive date time field on membership page should prefill with current time
http://issues.civicrm.org/jira/browse/CRM-13769
Eileen [Thu, 14 Nov 2013 23:50:47 +0000 (12:50 +1300)]
CRM-13769 - backoffice membership form - prefill time
----------------------------------------
* CRM-13769: Receive date time field on membership page should prefill with current time
http://issues.civicrm.org/jira/browse/CRM-13769
Coleman Watts [Mon, 25 Nov 2013 22:34:57 +0000 (14:34 -0800)]
CRM-13830 - MailingGroup API - hack to disable pseudoconstant lookup
dlobo [Mon, 25 Nov 2013 20:51:16 +0000 (12:51 -0800)]
Merge pull request #2082 from kurund/CRM-13824
fixes for CRM-13824
dlobo [Mon, 25 Nov 2013 20:32:32 +0000 (12:32 -0800)]
Merge pull request #2085 from dlobo/EncodingFixes
Fix characters with wrong encoding
Donald A. Lobo [Mon, 25 Nov 2013 20:31:51 +0000 (12:31 -0800)]
Fix characters with wrong encoding
dlobo [Mon, 25 Nov 2013 14:59:38 +0000 (06:59 -0800)]
Merge pull request #2080 from colemanw/checkSqlFunctionsExist
CRM-13822 - Ensure mysql phone function exists
kurund [Mon, 25 Nov 2013 14:55:29 +0000 (20:25 +0530)]
fixes for CRM-13824
----------------------------------------
* CRM-13824: Fatal error on contribution page
http://issues.civicrm.org/jira/browse/CRM-13824
Kurund Jalmi [Mon, 25 Nov 2013 13:30:56 +0000 (05:30 -0800)]
Merge pull request #2062 from dlobo/CRM-13806
CRM-13806 - Only accept valid profile urls
Kurund Jalmi [Mon, 25 Nov 2013 13:21:50 +0000 (05:21 -0800)]
Merge pull request #2079 from yashodha/CRM-13812
CRM-13812 - fixed the broken query for activity search
Kurund Jalmi [Mon, 25 Nov 2013 11:14:51 +0000 (03:14 -0800)]
Merge pull request #2081 from eileenmcnaughton/metadata
Metadata
Eileen [Tue, 19 Nov 2013 01:20:24 +0000 (14:20 +1300)]
Add Batch metadata
Eileen [Mon, 18 Nov 2013 18:32:14 +0000 (18:32 +0000)]
Add missing titles on Campaign Schema
Coleman Watts [Mon, 25 Nov 2013 04:53:14 +0000 (20:53 -0800)]
CRM-13822 - Ensure mysql phone function exists
dlobo [Sun, 24 Nov 2013 17:34:30 +0000 (09:34 -0800)]
Merge pull request #2072 from dlobo/CRM-13815
CRM-13815 - Restrict the number of scheduled jobs log entries shown
Tim Otten [Sun, 24 Nov 2013 10:53:12 +0000 (16:23 +0530)]
HR-8 - MultipleRecordFieldsListing.tpl - Trigger JS event when dialog opens
The current implementation of HR-8 is a bit coarse (in that it binds to all
AJAX events). @colemanw said it would better to hack the specific AJAX call.
Tim Otten [Sun, 24 Nov 2013 10:43:26 +0000 (16:13 +0530)]
MultipleRecordFieldsListing.tpl - Fix indentation
Tim Otten [Sun, 24 Nov 2013 10:11:33 +0000 (15:41 +0530)]
CRM_Case_Form_Activity - Fix PHP warning when opening case
Coleman Watts [Sun, 24 Nov 2013 01:43:00 +0000 (17:43 -0800)]
Fix invalid html on options admin page
colemanw [Sun, 24 Nov 2013 00:59:48 +0000 (16:59 -0800)]
Merge pull request #2076 from colemanw/CRM-11864
Add profilebuilder to contribution page + system-wide ajax improvements
dlobo [Sat, 23 Nov 2013 14:48:38 +0000 (06:48 -0800)]
Merge pull request #2074 from pratik-joshi/CRM-13814
CRM-13814
dlobo [Sat, 23 Nov 2013 14:46:34 +0000 (06:46 -0800)]
Merge pull request #2075 from ErichBSchulz/patch-1
correct doc block cut and paste error
Erich [Sat, 23 Nov 2013 12:50:38 +0000 (22:50 +1000)]
correct doc block cut and paste error
Tim Otten [Sat, 23 Nov 2013 06:59:42 +0000 (12:29 +0530)]
CRM_Core_Component::flushEnabledComponents - Trigger after any change to settings (not just CiviCase activation)
Tim Otten [Sat, 23 Nov 2013 06:44:53 +0000 (12:14 +0530)]
Merge branch 'CRM-PostInstall' of git://github.com/vivekarora/civicrm-core into pull-request-2069
vivekarora [Sat, 23 Nov 2013 05:32:42 +0000 (11:02 +0530)]
Removed debugging code
colemanw [Fri, 22 Nov 2013 23:14:31 +0000 (15:14 -0800)]
Merge pull request #1976 from eileenmcnaughton/CRM-13737
CRM-13737 drupal integration allow drupal folder to be at the same level as the civicrm folder
Coleman Watts [Fri, 22 Nov 2013 23:05:51 +0000 (15:05 -0800)]
CRM-10693 - LoadPage/Form improvements
dlobo [Fri, 22 Nov 2013 18:54:20 +0000 (10:54 -0800)]
Merge pull request #2073 from dlobo/CRM-13816
CRM-13816 - Undefined index notice due to disabled memberships in CRM_Member_BAO_Membership::updateAllMembershipStatus()
Donald A. Lobo [Fri, 22 Nov 2013 18:53:13 +0000 (10:53 -0800)]
CRM-13816 - Undefined index notice due to disabled memberships in CRM_Member_BAO_Membership::updateAllMembershipStatus()
http://issues.civicrm.org/jira/browse/CRM-13816
dlobo [Fri, 22 Nov 2013 14:55:31 +0000 (06:55 -0800)]
Merge pull request #2070 from dlobo/CRM-13799
CRM-13799 - group contacts list doesn't reflect correct status
Donald A. Lobo [Fri, 22 Nov 2013 14:38:35 +0000 (06:38 -0800)]
CRM-13815 - Restrict the number of scheduled jobs log entries shown
http://issues.civicrm.org/jira/browse/CRM-13815
Pratik Joshi [Fri, 22 Nov 2013 13:55:19 +0000 (19:25 +0530)]
CRM-13814
dlobo [Fri, 22 Nov 2013 13:45:02 +0000 (05:45 -0800)]
Merge pull request #2071 from mgbdev/CRM-13693
Delete Profile - buttons unnecessarily repeated
yashodha [Fri, 22 Nov 2013 13:07:55 +0000 (18:37 +0530)]
CRM-13812 - fixed the broken query for activity search
mgbdev [Fri, 22 Nov 2013 05:59:39 +0000 (11:29 +0530)]
Delete Profile - buttons unnecessarily repeated
dlobo [Thu, 21 Nov 2013 14:39:29 +0000 (06:39 -0800)]
Merge pull request #2066 from totten/4.4-ufgroup-warning
CRM_Core_BAO_UFGroup - Fix warning with unknown provider
Donald A. Lobo [Thu, 21 Nov 2013 00:30:55 +0000 (16:30 -0800)]
CRM-13799 - group contacts list doesn't reflect correct status
http://issues.civicrm.org/jira/browse/CRM-13799
vivekarora [Thu, 21 Nov 2013 12:42:07 +0000 (18:12 +0530)]
Post install hook
Kurund Jalmi [Thu, 21 Nov 2013 06:44:44 +0000 (22:44 -0800)]
Merge pull request #2065 from mgbdev/crm-10994
Crm 10994
Tim Otten [Thu, 21 Nov 2013 06:14:03 +0000 (11:44 +0530)]
CRM_Core_BAO_UFGroup - Fix warning with unknown provider
mgbdev [Thu, 21 Nov 2013 05:28:29 +0000 (10:58 +0530)]
CRM-10994 in import bash donations not allowed
mgbdev [Thu, 21 Nov 2013 05:26:43 +0000 (10:56 +0530)]
CRM-10994 in import bash donations not allowed
CiviCRM [Thu, 21 Nov 2013 05:17:12 +0000 (21:17 -0800)]
Update version to 4.4.3
Coleman Watts [Thu, 21 Nov 2013 04:33:17 +0000 (20:33 -0800)]
CRM-13807 - Add comments and null test
colemanw [Thu, 21 Nov 2013 04:26:21 +0000 (20:26 -0800)]
Merge pull request #2064 from colemanw/4.4
CRM-13807 - Fix last to commit to getBAO and add unit test
Coleman Watts [Thu, 21 Nov 2013 04:25:15 +0000 (20:25 -0800)]
CRM-13807 - Fix last to commit to getBAO and add unit test
dlobo [Thu, 21 Nov 2013 02:44:43 +0000 (18:44 -0800)]
Merge pull request #2063 from colemanw/4.4
CRM-13807 - Verify BAO exists in api getBAO
Coleman Watts [Thu, 21 Nov 2013 02:26:23 +0000 (18:26 -0800)]
CRM-13807 - Verify BAO exists in api getBAO
Donald A. Lobo [Thu, 21 Nov 2013 02:03:24 +0000 (18:03 -0800)]
CRM-13806 - Only accept valid profile urls
http://issues.civicrm.org/jira/browse/CRM-13806
colemanw [Thu, 21 Nov 2013 01:02:07 +0000 (17:02 -0800)]
Merge pull request #2061 from civicrm/4.3
4.3
colemanw [Thu, 21 Nov 2013 00:46:00 +0000 (16:46 -0800)]
Merge pull request #2059 from davecivicrm/CRM-13786b
CRM-13786 Applying updated patch from Karin which fixes the calculation ...
dlobo [Thu, 21 Nov 2013 00:34:04 +0000 (16:34 -0800)]
Merge pull request #2060 from davecivicrm/CRM-13876c
CRM-13786 - Fix calc of membership end date when join date is in the pas...
dlobo [Thu, 21 Nov 2013 00:33:28 +0000 (16:33 -0800)]
Merge pull request #2058 from fjg-conflux/CRM-13805
CRM-13805 - Set a status alert if cURL is not installed.
dlobo [Thu, 21 Nov 2013 00:32:06 +0000 (16:32 -0800)]
Merge pull request #2055 from JoeMurray/CRM-13793
CRM-13793 assignment in condition code cleanup. Also line 107 fixed apparent bug.
Dave Greenberg [Thu, 21 Nov 2013 00:00:13 +0000 (16:00 -0800)]
CRM-13786 - Fix calc of membership end date when join date is in the past (for fixed period memberships).
----------------------------------------
* CRM-13786: Membership End Date not calculated properly for fixed period MembershipTypes
http://issues.civicrm.org/jira/browse/CRM-13786
Dave Greenberg [Wed, 20 Nov 2013 23:34:39 +0000 (15:34 -0800)]
CRM-13786 Applying updated patch from Karin which fixes the calculation of start date and edndate for fixed memberships. All related BAO, api and Form unit tests passing now.
----------------------------------------
* CRM-13786: Membership End Date not calculated properly for fixed period MembershipTypes
http://issues.civicrm.org/jira/browse/CRM-13786
projects / civicrm-core.git / log