Dave Greenberg [Wed, 7 Aug 2013 16:20:36 +0000 (09:20 -0700)]
Merge pull request #1362 from pratik-joshi/CRM-12926
CRM-12926 : convert the flash to image and upload the image
Pratik Joshi [Wed, 7 Aug 2013 15:13:23 +0000 (20:43 +0530)]
CRM-12926 : convert the flash to image and upload the image
Kurund Jalmi [Wed, 7 Aug 2013 11:36:33 +0000 (04:36 -0700)]
Merge pull request #1361 from kurund/test-fixes
fixed failing mailing CRM tests
kurund [Wed, 7 Aug 2013 11:35:12 +0000 (17:05 +0530)]
fixed failing mailing CRM tests
Kurund Jalmi [Wed, 7 Aug 2013 11:04:54 +0000 (04:04 -0700)]
Merge pull request #1358 from yashodha/4.4.CRM-13092
fixed export for activity source contact ID
Kurund Jalmi [Wed, 7 Aug 2013 10:57:41 +0000 (03:57 -0700)]
Merge pull request #1357 from monishdeb/CRM-12812
CRM-12812 Webtest related fix
Kurund Jalmi [Wed, 7 Aug 2013 10:56:10 +0000 (03:56 -0700)]
Merge pull request #1360 from kurund/test-fixes
fixes for failing CRM tests
kurund [Wed, 7 Aug 2013 10:54:10 +0000 (16:24 +0530)]
fixes due to change to prefix/suffix/gender
kurund [Wed, 7 Aug 2013 10:44:56 +0000 (16:14 +0530)]
fixed the test failure due to duplicate contacts being listed
yashodha [Wed, 7 Aug 2013 08:17:00 +0000 (13:47 +0530)]
fixed export for activity source contact ID
kurund [Wed, 7 Aug 2013 08:08:56 +0000 (13:38 +0530)]
fixes to test due to changes in createProfileContact
monishdeb [Wed, 7 Aug 2013 07:47:32 +0000 (13:17 +0530)]
CRM-12812 Webtest related fix
----------------------------------------
* CRM-12812: case custom field using wysiwyg fails to load
http://issues.civicrm.org/jira/browse/CRM-12812
Kurund Jalmi [Wed, 7 Aug 2013 07:44:59 +0000 (00:44 -0700)]
Merge pull request #1356 from kurund/test-fixes
Test fixes
kurund [Wed, 7 Aug 2013 07:43:33 +0000 (13:13 +0530)]
fixed failing api test CRM-13122
----------------------------------------
* CRM-13122: API contact.get no longer returning prefix_id, suffix_id by default
http://issues.civicrm.org/jira/browse/CRM-13122
kurund [Wed, 7 Aug 2013 07:22:12 +0000 (12:52 +0530)]
whitespace fixes
Kurund Jalmi [Wed, 7 Aug 2013 07:07:34 +0000 (00:07 -0700)]
Merge pull request #1355 from colemanw/recurringPane
Open recurring pane when data has been entered CRM-13155
Kurund Jalmi [Wed, 7 Aug 2013 07:06:36 +0000 (00:06 -0700)]
Merge pull request #1354 from totten/master-revlink-jquery
CRM-12910 - Extract JS from logButton.tpl so it can be reused by client-side apps
Kurund Jalmi [Wed, 7 Aug 2013 07:04:15 +0000 (00:04 -0700)]
Merge pull request #1352 from eileenmcnaughton/CRM-13159
Crm 13159 plus a couple of minor fixes
Kurund Jalmi [Wed, 7 Aug 2013 07:00:56 +0000 (00:00 -0700)]
Merge pull request #1351 from pratik-joshi/CRM-12639-minor-fix-for-state-name-display
CRM-12639-minor-fix-for-state-name-display : state abbreviations were getting displayed instead of state names
Tim Otten [Wed, 7 Aug 2013 04:34:37 +0000 (21:34 -0700)]
Merge pull request #1199 from totten/master-premature-commit
CRM-13085 - Fix premature transaction commit (due to ACL)
Coleman Watts [Wed, 7 Aug 2013 04:20:25 +0000 (21:20 -0700)]
Open recurring pane when data has been entered CRM-13155
----------------------------------------
* CRM-13155: Add searching for recurring contribution data to search
http://issues.civicrm.org/jira/browse/CRM-13155
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
Tim Otten [Wed, 7 Aug 2013 00:30:57 +0000 (17:30 -0700)]
CRM-12910 - logButton.tpl - Move $.fn.crmRevisionLink to its own file
----------------------------------------
* CRM-12910:
http://issues.civicrm.org/jira/browse/CRM-12910
Tim Otten [Wed, 7 Aug 2013 00:06:44 +0000 (17:06 -0700)]
CRM-12910 - logButton.tpl - Remove unnecesary option, cssDialogSelector
----------------------------------------
* CRM-12910:
http://issues.civicrm.org/jira/browse/CRM-12910
Tim Otten [Tue, 6 Aug 2013 23:53:50 +0000 (16:53 -0700)]
CRM-12910 - logButton.tpl - Construct dialog HTML on demand
----------------------------------------
* CRM-12910: Display revision history for each item under "Job"
http://issues.civicrm.org/jira/browse/CRM-12910
Tim Otten [Tue, 6 Aug 2013 23:42:37 +0000 (16:42 -0700)]
CRM-12910 - logButton.tpl - Pass options directly into $.fn.crmRevisionLink
----------------------------------------
* CRM-12910: Display revision history for each item under "Job"
http://issues.civicrm.org/jira/browse/CRM-12910
Tim Otten [Tue, 6 Aug 2013 23:40:21 +0000 (16:40 -0700)]
CRM-12910 - logButton.tpl - Move most JS inside $.fn.crmRevisionLink
----------------------------------------
* CRM-12910: Display revision history for each item under "Job"
http://issues.civicrm.org/jira/browse/CRM-12910
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 ...
Tim Otten [Tue, 6 Aug 2013 23:33:53 +0000 (16:33 -0700)]
CRM-1291- = logButton.tpl - Move JS vars into "options"
----------------------------------------
* CRM-1291-:
http://issues.civicrm.org/jira/browse/CRM-1291-
Tim Otten [Tue, 6 Aug 2013 23:30:54 +0000 (16:30 -0700)]
CRM-12910 - logButton.tpl - Use more JS variables instead of Smarty variables
----------------------------------------
* CRM-12910: Display revision history for each item under "Job"
http://issues.civicrm.org/jira/browse/CRM-12910
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)
Tim Otten [Tue, 6 Aug 2013 23:26:09 +0000 (16:26 -0700)]
CRM-12910 - logButton.tpl - Use a JS closure
----------------------------------------
* CRM-12910: Display revision history for each item under "Job"
http://issues.civicrm.org/jira/browse/CRM-12910
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
Tim Otten [Tue, 6 Aug 2013 23:16:18 +0000 (16:16 -0700)]
CRM-12910 - logButton.tpl - More client-side logic:
* Use JS variable instead of Smarty variable
* Construct URL on client side
----------------------------------------
* CRM-12910: Display revision history for each item under "Job"
http://issues.civicrm.org/jira/browse/CRM-12910
eileen [Tue, 6 Aug 2013 21:19:34 +0000 (09:19 +1200)]
unrelated e-notice fixes
eileen [Tue, 6 Aug 2013 21:18:39 +0000 (09:18 +1200)]
CRM-12869 ensure giftors email is not over-written on behalf membership
eileen [Tue, 6 Aug 2013 21:15:47 +0000 (09:15 +1200)]
CRM-13159 need to assign var to tpl
eileen [Tue, 6 Aug 2013 21:14:27 +0000 (09:14 +1200)]
CRM-13160 partial fix, eliminates fatal but doesn't address where there are multiple relationship type possibilities, required to avoid fatals on tests
eileen [Tue, 6 Aug 2013 21:12:56 +0000 (09:12 +1200)]
CRM-13159 enable 'membership_type' as a param on relationship get, display count of available relationships on back-office member form using this
Pratik Joshi [Tue, 6 Aug 2013 14:48:14 +0000 (20:18 +0530)]
CRM-12639-minor-fix-for-state-name-display : state abbreviations were getting displayed instead of state names
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
projects / civicrm-core.git / log