Dave Greenberg [Wed, 7 Aug 2013 00:43:20 +0000 (17:43 -0700)]
Merge pull request #1350 from pradpnayak/CRM-12970
-- fixed for CRM-12970
Dave Greenberg [Tue, 6 Aug 2013 23:35:40 +0000 (16:35 -0700)]
Merge pull request #1353 from eileenmcnaughton/CRM-13162
CRM-13162 [closes ticket] make table for disabled relationships show the same fields as ...
eileen [Tue, 6 Aug 2013 23:28:47 +0000 (11:28 +1200)]
CRM-13162 remove extra indents from last commit (copy & pastegit add templates/CRM/Contact/Page/View/Relationship.tplgit add templates/CRM/Contact/Page/View/Relationship.tpl)
eileen [Tue, 6 Aug 2013 23:25:48 +0000 (11:25 +1200)]
CRM-13162 make table for disabled relationships show the same fields as enabled relationships on relationship tab
Pradeep Nayak [Tue, 6 Aug 2013 12:57:39 +0000 (18:27 +0530)]
-- fixed for CRM-12970
----------------------------------------
* CRM-12970: civicrm_price_field_value not removed for discount price set
http://issues.civicrm.org/jira/browse/CRM-12970
Kurund Jalmi [Tue, 6 Aug 2013 12:06:10 +0000 (05:06 -0700)]
Merge pull request #1348 from pratik-joshi/CRM-12689_fixes
Crm 12689 fixes
Kurund Jalmi [Tue, 6 Aug 2013 11:59:28 +0000 (04:59 -0700)]
Merge pull request #1349 from kurund/CRM-13107
CRM-13107 removed obsolete code
Pratik Joshi [Tue, 6 Aug 2013 11:25:50 +0000 (16:55 +0530)]
CRM-12689_fixes : is_repeat handling for 'addtion to' recipients
Pratik Joshi [Tue, 6 Aug 2013 14:15:38 +0000 (19:45 +0530)]
CRM-12689-fixes : minor fix
Pratik Joshi [Mon, 5 Aug 2013 13:38:41 +0000 (19:08 +0530)]
CRM-12689-fixes : few improvements after testing
Pratik Joshi [Fri, 2 Aug 2013 16:23:17 +0000 (21:53 +0530)]
CRM-12689-fixes : adding restriction to building additional recipient when 'state_action_date' has been selected which depends on mapping enitity configured for a reminder
Pratik Joshi [Fri, 2 Aug 2013 15:55:30 +0000 (21:25 +0530)]
CRM-12689-fixes : for event as mapping entity for schedule reminder skip the pariticipant status check while building up 'addition to' recipients as the date clause responsible for sending reminders is WRT event criterias
Pratik Joshi [Thu, 1 Aug 2013 15:27:59 +0000 (20:57 +0530)]
CRM-12689-fixes : fixing for multiple email sending for a contact fullfiling reminder criteria as well as in group, proper date clause handling for associated entities while building up additional recipients
kurund [Tue, 6 Aug 2013 07:35:32 +0000 (13:05 +0530)]
CRM-13107 removed obsolete code
----------------------------------------
* CRM-13107: Individual Prefix, Suffix and Gender fields are broken in Profile Create, Edit and View
http://issues.civicrm.org/jira/browse/CRM-13107
Kurund Jalmi [Tue, 6 Aug 2013 06:57:24 +0000 (23:57 -0700)]
Merge pull request #1347 from davecivicrm/CRM-13157
CRM-13157 added static to the function and tested isDeleteRelatedMembers...
Kurund Jalmi [Tue, 6 Aug 2013 06:55:59 +0000 (23:55 -0700)]
Merge pull request #1346 from eileenmcnaughton/master
CRM-13122 added a test for kurunds fix, ran tests & committing updated test-generated examples
Dave Greenberg [Mon, 5 Aug 2013 23:37:10 +0000 (16:37 -0700)]
CRM-13157 added static to the function and tested isDeleteRelatedMembership use case
----------------------------------------
* CRM-13157: isDeleteRelatedMembership() should be declared as static
http://issues.civicrm.org/jira/browse/CRM-13157
eileen [Mon, 5 Aug 2013 22:54:52 +0000 (10:54 +1200)]
CRM-13122 ensure fix is tested, also remove obvious cruft from api & update examples to reflect change
Kurund Jalmi [Mon, 5 Aug 2013 22:49:00 +0000 (15:49 -0700)]
Merge pull request #1345 from kurund/CRM-13107
notice fixes, for now using @ to suppress some strange notices
kurund [Mon, 5 Aug 2013 22:47:51 +0000 (04:17 +0530)]
notice fixes, for now using @ to suppress some strange notices
Dave Greenberg [Mon, 5 Aug 2013 22:40:13 +0000 (15:40 -0700)]
Merge pull request #1344 from kurund/CRM-13107
CRM-13107, fixed for prefix, suffix and gender display in profile.
Also fixed CRM_Event_BAO_Event::displayProfile for display of fields in event registration confirm and thank-you. Tested create, view, edit, profile search form and results columns, advanced search view, user account view and edit.
kurund [Mon, 5 Aug 2013 22:35:00 +0000 (04:05 +0530)]
CRM-13107, fixed for event confirm/thank you screen to show prefix/suffix/gender labels
----------------------------------------
* CRM-13107: Individual Prefix, Suffix and Gender fields are broken in Profile Create, Edit and View
http://issues.civicrm.org/jira/browse/CRM-13107
kurund [Mon, 5 Aug 2013 22:21:32 +0000 (03:51 +0530)]
notice fixes
kurund [Mon, 5 Aug 2013 20:26:59 +0000 (01:56 +0530)]
CRM-13122 fixed default return properties
----------------------------------------
* CRM-13122: API contact.get no longer returning prefix_id, suffix_id by default
http://issues.civicrm.org/jira/browse/CRM-13122
kurund [Mon, 5 Aug 2013 22:13:21 +0000 (03:43 +0530)]
CRM-13107, fixed the option to show prefix and suffix fields only in Individual select
----------------------------------------
* CRM-13107: Individual Prefix, Suffix and Gender fields are broken in Profile Create, Edit and View
http://issues.civicrm.org/jira/browse/CRM-13107
kurund [Mon, 5 Aug 2013 21:37:44 +0000 (03:07 +0530)]
CRM-13107, more clean / removed extra code
----------------------------------------
* CRM-13107: Individual Prefix, Suffix and Gender fields are broken in Profile Create, Edit and View
http://issues.civicrm.org/jira/browse/CRM-13107
kurund [Mon, 5 Aug 2013 21:11:38 +0000 (02:41 +0530)]
fixes for profile search selector CRM-13107
----------------------------------------
* CRM-13107: Individual Prefix, Suffix and Gender fields are broken in Profile Create, Edit and View
http://issues.civicrm.org/jira/browse/CRM-13107
kurund [Mon, 5 Aug 2013 21:06:48 +0000 (02:36 +0530)]
removed quest related code
kurund [Mon, 5 Aug 2013 21:02:52 +0000 (02:32 +0530)]
CRM-13107, fixes for profile view mode
----------------------------------------
* CRM-13107: Individual Prefix, Suffix and Gender fields are broken in Profile Create, Edit and View
http://issues.civicrm.org/jira/browse/CRM-13107
Kurund Jalmi [Mon, 5 Aug 2013 20:44:45 +0000 (13:44 -0700)]
Merge pull request #1230 from davecivicrm/CRM-13107
Fixes towards CRM-13107. This commit fixes create and edit modes. View m...
Kurund Jalmi [Mon, 5 Aug 2013 20:31:40 +0000 (13:31 -0700)]
Merge pull request #1342 from davecivicrm/CRM-13158
CRM-13158 adding event_type variable to event/info page.
Kurund Jalmi [Mon, 5 Aug 2013 19:55:07 +0000 (12:55 -0700)]
Merge pull request #1335 from yashodha/CRM-12981
worked on CRM-12981
Dave Greenberg [Mon, 5 Aug 2013 19:30:15 +0000 (12:30 -0700)]
CRM-13158 adding event_type variable to event/info page.
----------------------------------------
* CRM-13158: Event Type label should be available for Event Info pages
http://issues.civicrm.org/jira/browse/CRM-13158
Kurund Jalmi [Mon, 5 Aug 2013 19:21:42 +0000 (12:21 -0700)]
Merge pull request #1341 from kurund/CRM-13018
CRM-13018, applied the patch for yahoo geocoder
kurund [Mon, 5 Aug 2013 19:18:41 +0000 (00:48 +0530)]
CRM-13018, applied the patch for yahoo geocoder
----------------------------------------
* CRM-13018: CLONE - Yahoo geocoder returns page not found
http://issues.civicrm.org/jira/browse/CRM-13018
Dave Greenberg [Mon, 5 Aug 2013 16:48:51 +0000 (09:48 -0700)]
Merge pull request #1339 from yashodha/CRM-13092
fixed activity query (CRM-13092)
yashodha [Mon, 5 Aug 2013 16:10:29 +0000 (21:40 +0530)]
fixed activity query (CRM-13092)
Kurund Jalmi [Mon, 5 Aug 2013 13:08:49 +0000 (06:08 -0700)]
Merge pull request #1337 from eileenmcnaughton/CRM-13148
CRM-13148 update another place to get contact id from url/ checksum/ ses...
Kurund Jalmi [Mon, 5 Aug 2013 13:06:52 +0000 (06:06 -0700)]
Merge pull request #1338 from aadityawalawalkar/CRM-12812-Fixes
Fixed CRM-12812 & added a webtest for the same
Aaditya Walawalkar [Mon, 5 Aug 2013 11:19:46 +0000 (16:49 +0530)]
Fixed CRM-12812 & added a webtest for the same. Correct syntax error in ActivityChangeStatus.js [added missing ');' at the end of page]
----------------------------------------
* CRM-12812: case custom field using wysiwyg fails to load
http://issues.civicrm.org/jira/browse/CRM-12812
* CRM-12812-Fixes:
http://issues.civicrm.org/jira/browse/CRM-12812-Fixes
* CRM-12439-org:
http://issues.civicrm.org/jira/browse/CRM-12439-org
* CRM-12439: Add description field for Profiles and expose the created_id field
http://issues.civicrm.org/jira/browse/CRM-12439
* CRM-12995-1:
http://issues.civicrm.org/jira/browse/CRM-12995-1
* CRM-12995-2:
http://issues.civicrm.org/jira/browse/CRM-12995-2
eileen [Mon, 5 Aug 2013 08:08:37 +0000 (20:08 +1200)]
CRM-13148 update another place to get contact id from url/ checksum/ session as appropriate. Change function signature in the few places it is called to make contact id mandatory, it was only optional because it was the last param
yashodha [Mon, 5 Aug 2013 05:50:57 +0000 (11:20 +0530)]
CRM-12981
Kurund Jalmi [Mon, 5 Aug 2013 05:44:35 +0000 (22:44 -0700)]
Merge pull request #1333 from eileenmcnaughton/CRM-13155
CRM-13155 add recurring contribution to advanced search
kurund [Mon, 5 Aug 2013 05:41:38 +0000 (11:11 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-05-11-07-08
Conflicts:
js/Common.js
templates/CRM/Batch/Form/Entry.tpl
Kurund Jalmi [Mon, 5 Aug 2013 05:13:56 +0000 (22:13 -0700)]
Merge pull request #1334 from kurund/CRM-13078
CRM-13078
kurund [Mon, 5 Aug 2013 05:12:22 +0000 (10:42 +0530)]
CRM-13078, typo fixes
----------------------------------------
* CRM-13078: Batch Data Entry silently drops 'batch-valid' entries if no contact_id is associated with them
http://issues.civicrm.org/jira/browse/CRM-13078
eileen [Mon, 5 Aug 2013 02:51:51 +0000 (14:51 +1200)]
CRM-13155 collapse by default
eileen [Mon, 5 Aug 2013 02:28:14 +0000 (14:28 +1200)]
essential fix on member payment bao I've made about 50 times & some keeps not making it into my PRs
eileen [Mon, 5 Aug 2013 02:25:31 +0000 (14:25 +1200)]
CRM-13155 move recur contribution search pane into subsidiary tpl
this appears to all work. To get recurring contributions with no contributions you have to manually clear 'test' - but as this is a bit of an edge case it can stay that way for now. I expect that this will become more important with the circle extension - but not today
eileen [Mon, 5 Aug 2013 01:44:49 +0000 (13:44 +1200)]
CRM-13155 fix search to join direct from contact when in contact context
eileen [Mon, 5 Aug 2013 01:26:13 +0000 (13:26 +1200)]
CRM-13155 search is working but a) the recurring should have a separate pane & b) on contact the search joins via contribution & doesn't find ones with no contribution
eileen [Mon, 5 Aug 2013 01:17:14 +0000 (13:17 +1200)]
CRM-13155 rename next_sched_contribution to end in date as search logic expects that & conformance seems better than hackery
colemanw [Mon, 5 Aug 2013 00:23:46 +0000 (17:23 -0700)]
Merge pull request #1332 from eileenmcnaughton/CRM-13148
CRM-13148 preparatory cleanup mostly moving js from tpl to js file
Coleman Watts [Mon, 5 Aug 2013 00:06:39 +0000 (17:06 -0700)]
Revert eileen's commit to BAO_Membership
Eileen McNaughton [Mon, 5 Aug 2013 00:06:27 +0000 (12:06 +1200)]
Opps changed wrong BAO per Colemans's comment
Eileen McNaughton [Mon, 5 Aug 2013 00:04:47 +0000 (12:04 +1200)]
use BAO obj not DAO per @colmanw comment
Coleman Watts [Sun, 4 Aug 2013 23:42:23 +0000 (16:42 -0700)]
Merge branch 'CRM-13067-bao-prep' of https://github.com/eileenmcnaughton/civicrm-core into CRM-13067-bao-prep
Conflicts:
api/v3/Membership.php
tests/phpunit/api/v3/MembershipTest.php
----------------------------------------
* CRM-13067-bao-prep:
http://issues.civicrm.org/jira/browse/CRM-13067-bao-prep
eileen [Sun, 4 Aug 2013 10:18:57 +0000 (22:18 +1200)]
CRM-13148 preliminary cleanup - move rest of js out of tpl
eileen [Sun, 4 Aug 2013 10:17:07 +0000 (22:17 +1200)]
unrelated e-notice fix
eileen [Sun, 4 Aug 2013 09:40:29 +0000 (21:40 +1200)]
CRM-13148 minor tidy up - remove smarty from js
eileen [Sun, 4 Aug 2013 09:37:34 +0000 (21:37 +1200)]
unrelated e-notice fix
eileen [Sun, 4 Aug 2013 08:15:19 +0000 (20:15 +1200)]
CRM-13148 partial move of js functions out of the tpl into the js file
eileen [Sun, 4 Aug 2013 08:02:06 +0000 (20:02 +1200)]
CRM-13148 basic tidy up - use 'recommended' functions / tpl js separation
eileen [Sun, 4 Aug 2013 07:45:07 +0000 (19:45 +1200)]
unrelated fix to broken test set up on BaseIPN
eileen [Sun, 4 Aug 2013 06:18:02 +0000 (18:18 +1200)]
fix api wrapper as CRM_Core_Exception fatals on the PEAR exception getUserMessage despite extending that exception
colemanw [Sun, 4 Aug 2013 22:50:40 +0000 (15:50 -0700)]
Merge pull request #1331 from colemanw/memberApi
Membership API date calculation CRM-13153
Coleman Watts [Sun, 4 Aug 2013 16:32:39 +0000 (09:32 -0700)]
Membership API date calculation CRM-13153
----------------------------------------
* CRM-13153: Improve Membership API to calculate dates
http://issues.civicrm.org/jira/browse/CRM-13153
Kurund Jalmi [Sun, 4 Aug 2013 18:04:48 +0000 (11:04 -0700)]
Merge pull request #1168 from eileenmcnaughton/CRM-13059
CRM-13059 fix relationship killing query
Coleman Watts [Sun, 4 Aug 2013 04:24:32 +0000 (21:24 -0700)]
Cleanup membership api
Kurund Jalmi [Sun, 4 Aug 2013 12:50:44 +0000 (05:50 -0700)]
Merge pull request #1326 from davecivicrm/CRM-13148
CRM-13148 Support use of cid=0 and cid=NNN for online contribution pages...
Kurund Jalmi [Sun, 4 Aug 2013 12:50:15 +0000 (05:50 -0700)]
Merge pull request #1327 from davecivicrm/CRM-13111
CRM-1311 Improved inline help for Honoree section.
Kurund Jalmi [Sun, 4 Aug 2013 12:48:48 +0000 (05:48 -0700)]
Merge pull request #1330 from eileenmcnaughton/master
test fixup- changed fn signature doesn't expect 'NULL'
eileen [Sun, 4 Aug 2013 07:15:34 +0000 (19:15 +1200)]
CRM-13067 fix up membership date setting to be done in BAO & work for API
eileen [Sun, 4 Aug 2013 03:00:36 +0000 (15:00 +1200)]
CRM-13142 as we have now have a unit test for date setting, dates do not need to be a reserved profile field
eileen [Sun, 4 Aug 2013 02:51:41 +0000 (14:51 +1200)]
CRM-13142 , CRM-13067 update tests to date setting is tested correctly
eileen [Sat, 3 Aug 2013 23:40:35 +0000 (11:40 +1200)]
CRM-13067 preparatory tidy-up on membership-payment api
CRM-13067 preparatory tidy-up on membership-payment api
eileen [Sat, 3 Aug 2013 00:37:06 +0000 (12:37 +1200)]
CRM-13067 mini-refactor - make options per wiki BAO std (ie. params holds
ids & ids is optional / on the way out
CRM-13067 mini-refactor - make options per wiki BAO std (ie. params holds
ids & ids is optional / on the way out
eileen [Fri, 2 Aug 2013 22:04:13 +0000 (10:04 +1200)]
CRM-13067 refactor recordMembershipContribution into MembershipPayment::create step one
CRM-13067 refactor recordMembershipContribution into MembershipPayment::create step one
CRM-13067 reinstate change to fn signature lost during gitting
eileen [Sun, 4 Aug 2013 03:42:30 +0000 (15:42 +1200)]
test fixup- changed fn signature doesn't expect 'NULL'
colemanw [Sun, 4 Aug 2013 02:29:56 +0000 (19:29 -0700)]
Merge pull request #1328 from eileenmcnaughton/master
Test improvements, minor fix on mailing API (Closes CRM-13512)
eileen [Sat, 3 Aug 2013 23:56:17 +0000 (11:56 +1200)]
add tests for exising behaviour on membership_type, membership_type_id fields (so redundant can be removed safely
eileen [Sat, 3 Aug 2013 23:23:39 +0000 (11:23 +1200)]
CRM-13152 - api mailing_event_subscribe.create returns array in wrong format
eileen [Sat, 3 Aug 2013 07:05:41 +0000 (19:05 +1200)]
test tweaks and updated examples
colemanw [Sat, 3 Aug 2013 21:43:38 +0000 (14:43 -0700)]
Merge pull request #1325 from davecivicrm/GeneratedFix
Rebuilt generated since last merge version was missing sample contacts.
Dave Greenberg [Sat, 3 Aug 2013 18:34:44 +0000 (11:34 -0700)]
CRM-1311 Improved inline help for Honoree section.
----------------------------------------
* CRM-1311:
http://issues.civicrm.org/jira/browse/CRM-1311
Dave Greenberg [Sat, 3 Aug 2013 18:28:01 +0000 (11:28 -0700)]
CRM-13148 Support use of cid=0 and cid=NNN for online contribution pages.
----------------------------------------
* CRM-13148:
http://issues.civicrm.org/jira/browse/CRM-13148
Dave Greenberg [Sat, 3 Aug 2013 18:26:24 +0000 (11:26 -0700)]
Rebuilt generated since last merge version was missing sample contacts.
Tim Otten [Fri, 2 Aug 2013 23:28:05 +0000 (16:28 -0700)]
Merge pull request #1324 from totten/master-duplicate
CRM-12911 - CRM.Backbone.sync - Add mechanism for API-assisted duplicati...
Tim Otten [Fri, 2 Aug 2013 22:41:33 +0000 (15:41 -0700)]
CRM-12911 - CRM.Backbone.sync - Add mechanism for API-assisted duplication of entities
----------------------------------------
* CRM-12911: Implement "Duplicate" feature for Jobs
http://issues.civicrm.org/jira/browse/CRM-12911
Tim Otten [Fri, 2 Aug 2013 23:23:31 +0000 (16:23 -0700)]
Merge pull request #1323 from totten/master-handleprimary
CRM_Core_BAO_Block - Fix API regressions
Tim Otten [Fri, 2 Aug 2013 23:20:54 +0000 (16:20 -0700)]
CRM_Core_BAO_Block - Fix API regressions
Dave Greenberg [Fri, 2 Aug 2013 22:01:50 +0000 (15:01 -0700)]
Merge pull request #1322 from kurund/accounting-batch-fixes
another fix
Dave Greenberg [Fri, 2 Aug 2013 22:01:15 +0000 (15:01 -0700)]
Merge pull request #1314 from pradpnayak/CRM-13004
-- fixed notice error for CRM-13004
kurund [Fri, 2 Aug 2013 21:55:21 +0000 (03:25 +0530)]
another fix
Dave Greenberg [Fri, 2 Aug 2013 21:45:26 +0000 (14:45 -0700)]
Merge pull request #1321 from kurund/accounting-batch-fixes
fixed wrong PseudoConstant call
kurund [Fri, 2 Aug 2013 21:42:13 +0000 (03:12 +0530)]
fixed wrong PseudoConstant call
kurund [Fri, 2 Aug 2013 21:30:22 +0000 (03:00 +0530)]
fixed wrong PseudoConstant call
Dave Greenberg [Fri, 2 Aug 2013 21:14:51 +0000 (14:14 -0700)]
Merge pull request #1315 from pradpnayak/CRM-12972
--fixed typo for CRM-12972
eileen [Tue, 16 Jul 2013 04:18:24 +0000 (16:18 +1200)]
CRM-13059 fix relationship killing query
Dave Greenberg [Fri, 2 Aug 2013 20:58:01 +0000 (13:58 -0700)]
Merge pull request #1313 from pradpnayak/CRM-12694
-- Fixed formatting and code fix for CRM-12694, removed mime_content_typ...
projects / civicrm-core.git / log