colemanw [Tue, 20 May 2014 20:44:08 +0000 (21:44 +0100)]
Merge pull request #3311 from colemanw/membershipType
CRM-14700 - Fix membershipType visibility in schema and tests
Coleman Watts [Tue, 20 May 2014 20:38:54 +0000 (21:38 +0100)]
CRM-14700 - Fix membershipType visibility in schema and tests
Tim Otten [Tue, 20 May 2014 20:04:30 +0000 (13:04 -0700)]
Merge pull request #3310 from totten/master-truncate-xml
CiviTest - Remove unused files ("truncate*.xml")
Tim Otten [Tue, 20 May 2014 20:02:24 +0000 (13:02 -0700)]
CiviTest - Remove & don't generate truncate*.xml
These files don't appear to be used:
* A quick grep for "truncate.xml" (etal) doesn't find any matches
* Munging or deleting the file doesn't yield any new errors when running a test-suite (CRM_Core_AllTests)
Tim Otten [Tue, 20 May 2014 20:01:22 +0000 (13:01 -0700)]
CiviTest - Fix gitignore for truncate.xml
Kurund Jalmi [Tue, 20 May 2014 15:30:38 +0000 (21:00 +0530)]
Merge pull request #3309 from monishdeb/CRM-14627
CRM-14627 related - civicrm navigation inconsistent
monishdeb [Tue, 20 May 2014 14:48:54 +0000 (20:18 +0530)]
CRM-14627 related - civicrm navigation inconsistent
https://issues.civicrm.org/jira/browse/CRM-14627
Kurund Jalmi [Tue, 20 May 2014 14:09:49 +0000 (19:39 +0530)]
Merge pull request #3306 from joannechester/master
CRM-14508 update access.tpl
pratik-joshi [Tue, 20 May 2014 12:48:14 +0000 (18:18 +0530)]
Merge pull request #3280 from atif-shaikh/CiviCoreBugs
CoreBug Related Changes
Kurund Jalmi [Tue, 20 May 2014 12:13:44 +0000 (17:43 +0530)]
Merge pull request #3307 from kurund/membership-fix
Revert "Merge pull request #3282 from colemanw/memberVisibility"
kurund [Tue, 20 May 2014 12:11:07 +0000 (17:41 +0530)]
Revert "Merge pull request #3282 from colemanw/memberVisibility"
This reverts commit
ce68481190840ee772e92eb1b16561abfaaedd32, reversing
changes made to
189c9c560d9f67961fc3756333c06fa520d93fec.
joannechester [Tue, 20 May 2014 11:40:36 +0000 (21:40 +1000)]
CRM-14508 update access.tpl
changed title and description for action name=core.manage
Kurund Jalmi [Tue, 20 May 2014 07:31:58 +0000 (13:01 +0530)]
Merge pull request #3304 from pratik-joshi/CRM-14704
CRM-14704 fix: in this fix, the selected records are editable on activity form
Eileen McNaughton [Tue, 20 May 2014 04:06:39 +0000 (16:06 +1200)]
Merge pull request #3302 from eileenmcnaughton/code-cleanup
Code cleanup - rename var from deprecated contributionType name
Eileen McNaughton [Mon, 19 May 2014 12:02:24 +0000 (00:02 +1200)]
remove unused paramter deductible mode
Eileen McNaughton [Mon, 19 May 2014 20:48:21 +0000 (08:48 +1200)]
declare used variables & comment fix
Eileen McNaughton [Mon, 19 May 2014 11:51:20 +0000 (23:51 +1200)]
rename parameter from contributionType to financialType
Eileen McNaughton [Tue, 20 May 2014 03:44:38 +0000 (15:44 +1200)]
Merge pull request #3300 from eileenmcnaughton/code-cleanup
merging this - we've discussed removing those & before function names & passing ids as reference before - nothing too complex in there
Tim Otten [Tue, 20 May 2014 03:26:56 +0000 (20:26 -0700)]
Merge pull request #3210 from totten/master-casetype-rebased
CRM-14479, CRM-14480 - Add Angular and basic Case Type UI.
Tim Otten [Fri, 9 May 2014 01:01:13 +0000 (18:01 -0700)]
CRM-14484 - crmCaseType - Make activity lists sortable
Tim Otten [Thu, 8 May 2014 23:46:59 +0000 (16:46 -0700)]
CRM-14483 - crmCaseType - Implement row addition for activity sets
This abstracts some of the code used for addition of activity types
Tim Otten [Thu, 8 May 2014 23:06:16 +0000 (16:06 -0700)]
CRM-14483 - crmCaseType - Implement row addition for "Activity Types" table
Tim Otten [Thu, 8 May 2014 01:07:48 +0000 (18:07 -0700)]
CRM-14480 - crmCaseType - Make cells editable (per mockup)
Tim Otten [Wed, 7 May 2014 22:04:32 +0000 (15:04 -0700)]
CRM-14483 - Only allow addition of "Sequence" if we don't have a sequence already
Tim Otten [Wed, 7 May 2014 20:38:43 +0000 (13:38 -0700)]
CRM-14481 - crmCaseType - Styling for trash icon
Tim Otten [Wed, 7 May 2014 20:38:11 +0000 (13:38 -0700)]
CRM-14481 - crmCaseType - Styling for accordion, trash icon
Tim Otten [Sun, 20 Apr 2014 21:06:33 +0000 (14:06 -0700)]
CRM-14480 - crmCaseType - Prettier URL construction
Tim Otten [Sun, 20 Apr 2014 02:34:40 +0000 (19:34 -0700)]
CRM-14479 - Load minified angular.js by default
Note: CRM_Core_Resources changes ".min.js" to ".js" if debugging is enabled.
Tim Otten [Sun, 20 Apr 2014 01:11:14 +0000 (18:11 -0700)]
CRM-14480 - Allow creation/deletion of activity sets
Tim Otten [Sun, 20 Apr 2014 00:10:47 +0000 (17:10 -0700)]
CRM-14481, CRM-14479 - Load CSS for Angular modules
Tim Otten [Sat, 19 Apr 2014 23:40:02 +0000 (16:40 -0700)]
CRM-14481 - crmCaseType - Use tabs and accordions from jQuery UI
Tim Otten [Sat, 19 Apr 2014 22:28:20 +0000 (15:28 -0700)]
CRM-14481 - crmCaseType - First pass at Angular-based case-type screen (view-only)
Tim Otten [Fri, 18 Apr 2014 23:02:48 +0000 (16:02 -0700)]
CRM-14479 - hook_angularModules - Allow specifying multiple *.js files for one module
Tim Otten [Fri, 18 Apr 2014 22:47:11 +0000 (15:47 -0700)]
CRM_Core_Resources - Fix PhpStorm warnings
Tim Otten [Wed, 16 Apr 2014 02:38:54 +0000 (19:38 -0700)]
Update README.md
Tim Otten [Wed, 16 Apr 2014 02:27:31 +0000 (19:27 -0700)]
CRM-14479 - Implement example extension with an Angular module
Tim Otten [Wed, 16 Apr 2014 02:25:38 +0000 (19:25 -0700)]
CRM-14479 - Implement "/civicrm/a" page
This page is a container for Angular-based pages. To develop a new Angular-based page,
one would:
a) Create a JS file which defines an Angular module. (The file should start
out with "var myModule = angular.module(...)".)
b) Register the module-name/file-name. This can be registered either by:
- If writing a CiviCRM extension, then implement hook_civicrm_angularModules.
- If writing a CiviCRM component, then implement getAngularModules().
Dave Greenberg [Mon, 19 May 2014 23:36:20 +0000 (16:36 -0700)]
Merge pull request #3301 from davecivicrm/CRM-14367
CRM-14367 - Fix fatal error due to 5.3 vs 5.4 php reqs, and tweak warnin...
Dave Greenberg [Mon, 19 May 2014 23:35:22 +0000 (16:35 -0700)]
CRM-14367 - Fix fatal error due to 5.3 vs 5.4 php reqs, and tweak warning msg.
----------------------------------------
* CRM-14367:
https://issues.civicrm.org/jira/browse/CRM-14367
Eileen McNaughton [Mon, 19 May 2014 23:30:20 +0000 (11:30 +1200)]
minor code tidy ups - in don't pass as ref per std we have been moving to
Eileen McNaughton [Mon, 19 May 2014 10:09:33 +0000 (22:09 +1200)]
minor code tidy ups
Dave Greenberg [Mon, 19 May 2014 23:12:17 +0000 (16:12 -0700)]
Merge pull request #3240 from eileenmcnaughton/CRM-14197
CRM-14197 store contribution id in line item table for data accessibility
Eileen McNaughton [Mon, 19 May 2014 23:04:56 +0000 (11:04 +1200)]
Merge pull request #3299 from eileenmcnaughton/code-cleanup
this param is not used anywhere
Eileen McNaughton [Mon, 19 May 2014 22:59:28 +0000 (10:59 +1200)]
this param is not used anywhere
Kurund Jalmi [Mon, 19 May 2014 22:44:37 +0000 (04:14 +0530)]
Merge pull request #3298 from eileenmcnaughton/code-cleanup
Code cleanup
Eileen McNaughton [Mon, 19 May 2014 20:46:34 +0000 (08:46 +1200)]
don't pass as reference where not required to be
Eileen McNaughton [Mon, 19 May 2014 10:04:14 +0000 (22:04 +1200)]
minor code simplications
Eileen McNaughton [Mon, 19 May 2014 20:51:39 +0000 (08:51 +1200)]
fix comment
Eileen McNaughton [Mon, 19 May 2014 11:44:44 +0000 (23:44 +1200)]
fix spelling errors
Kurund Jalmi [Mon, 19 May 2014 22:29:54 +0000 (03:59 +0530)]
Merge pull request #3295 from monishdeb/CRM-14623
CRM-14623 notice fixes
Dave Greenberg [Mon, 19 May 2014 22:20:12 +0000 (15:20 -0700)]
Merge pull request #3290 from kurund/CRM-14488
ignore uf_join module for reserved profiles CRM-14488
Dave Greenberg [Mon, 19 May 2014 17:59:09 +0000 (10:59 -0700)]
Merge pull request #3296 from davecivicrm/CRM-12882
Crm 12882
Dave Greenberg [Mon, 19 May 2014 17:57:35 +0000 (10:57 -0700)]
CRM-12882 - Change fatal to statusBounce.
----------------------------------------
* CRM-12882:
https://issues.civicrm.org/jira/browse/CRM-12882
Dave Greenberg [Mon, 19 May 2014 17:53:23 +0000 (10:53 -0700)]
CRM-12882 - Allow all admins to view payment processors page. Clarify error message when try to add or edit a payment processor without the new permission.
----------------------------------------
* CRM-12882:
https://issues.civicrm.org/jira/browse/CRM-12882
monishdeb [Mon, 19 May 2014 13:11:12 +0000 (18:41 +0530)]
CRM-14623 notice fixes
----------------------------------------
* CRM-14623: PHP Notices when registering a participant in the back end for an event that uses a price set with max participants
https://issues.civicrm.org/jira/browse/CRM-14623
Eileen McNaughton [Thu, 15 May 2014 23:59:19 +0000 (11:59 +1200)]
CRM-14197 alter index to include contribution id
Eileen McNaughton [Tue, 13 May 2014 11:33:34 +0000 (23:33 +1200)]
CRM-14197 set entity_id & entity_table to reflect membership on membership transactions
Eileen McNaughton [Tue, 13 May 2014 09:59:44 +0000 (21:59 +1200)]
CRM-14197 fill contribution_id data & fix entity references on membership data
Edsel [Thu, 6 Feb 2014 12:36:53 +0000 (18:06 +0530)]
MISC-32 Added comment from xml/schema
Edsel [Thu, 6 Feb 2014 11:09:35 +0000 (16:39 +0530)]
MISC-32 Added test for contribution_id
Edsel [Thu, 6 Feb 2014 10:02:59 +0000 (15:32 +0530)]
MISC-32 Added support for contribution_id to lineitem table
Eileen McNaughton [Mon, 19 May 2014 09:37:08 +0000 (21:37 +1200)]
Merge pull request #3293 from eileenmcnaughton/comments
add missing comment blocks
Eileen McNaughton [Mon, 19 May 2014 09:36:54 +0000 (21:36 +1200)]
fix commen & remove a couple of unused assignments
Eileen McNaughton [Mon, 19 May 2014 09:30:23 +0000 (21:30 +1200)]
add missing comment blocks
Pratik Joshi [Mon, 19 May 2014 08:20:10 +0000 (13:50 +0530)]
CRM-14704 fix: in this fix, the selected records are editable on activity form
Kurund Jalmi [Mon, 19 May 2014 05:37:20 +0000 (11:07 +0530)]
Merge pull request #3289 from kurund/CRM-14475
removed unused variables, case type test CRM-14475
Kurund Jalmi [Mon, 19 May 2014 05:36:57 +0000 (11:06 +0530)]
Merge pull request #3288 from kurund/CRM-14454
Crm 14454
kurund [Sun, 18 May 2014 04:24:55 +0000 (23:24 -0500)]
ignore uf_join module for reserved profiles CRM-14488
----------------------------------------
* CRM-14488:
https://issues.civicrm.org/jira/browse/CRM-14488
Kurund Jalmi [Mon, 19 May 2014 05:29:18 +0000 (10:59 +0530)]
Merge pull request #3286 from kurund/CRM-14703
we should skip value changes of submit buttons, CRM-14703
Kurund Jalmi [Mon, 19 May 2014 05:26:38 +0000 (10:56 +0530)]
Merge pull request #3287 from kurund/CRM-14590
fixed the break in saving custom data of type participant role, due to s...
Kurund Jalmi [Mon, 19 May 2014 05:20:51 +0000 (22:20 -0700)]
Merge pull request #3112 from freeform/CRM-14568
CRM-14568 - Billing payment block is not being loaded in Chrome.
Eileen McNaughton [Mon, 19 May 2014 03:18:41 +0000 (15:18 +1200)]
Merge pull request #3285 from eileenmcnaughton/comments
autogenerate missing comments
Eileen McNaughton [Mon, 19 May 2014 03:18:27 +0000 (15:18 +1200)]
autogenerate missing comments
Eileen McNaughton [Mon, 19 May 2014 03:16:25 +0000 (15:16 +1200)]
Merge pull request #3284 from eileenmcnaughton/comments
some comment block fixes
Eileen McNaughton [Mon, 19 May 2014 02:56:50 +0000 (14:56 +1200)]
some comment block fixes
kurund [Sun, 18 May 2014 07:24:00 +0000 (12:54 +0530)]
removed unused variables, case type test CRM-14475
----------------------------------------
* CRM-14475:
https://issues.civicrm.org/jira/browse/CRM-14475
kurund [Sun, 18 May 2014 04:52:35 +0000 (10:22 +0530)]
notice fixes, CRM-14454
----------------------------------------
* CRM-14454:
https://issues.civicrm.org/jira/browse/CRM-14454
kurund [Sun, 18 May 2014 04:47:37 +0000 (10:17 +0530)]
fixed code indentation, CRM-14454
----------------------------------------
* CRM-14454:
https://issues.civicrm.org/jira/browse/CRM-14454
kurund [Sun, 18 May 2014 01:59:58 +0000 (20:59 -0500)]
fixed the break in saving custom data of type participant role, due to select2 changes CRM-14590
----------------------------------------
* CRM-14590:
https://issues.civicrm.org/jira/browse/CRM-14590
kurund [Sat, 17 May 2014 22:41:06 +0000 (17:41 -0500)]
we should skip value changes of submit buttons, CRM-14703
----------------------------------------
* CRM-14703:
https://issues.civicrm.org/jira/browse/CRM-14703
Dave Greenberg [Sat, 17 May 2014 01:02:23 +0000 (18:02 -0700)]
Merge pull request #3283 from davecivicrm/CRM-14700a
CRM-14700 - revert to addSelect() now that MembershipType.xml has valid ...
Dave Greenberg [Sat, 17 May 2014 01:01:47 +0000 (18:01 -0700)]
CRM-14700 - revert to addSelect() now that MembershipType.xml has valid ref to get the options.
----------------------------------------
* CRM-14700:
https://issues.civicrm.org/jira/browse/CRM-14700
Kurund Jalmi [Fri, 16 May 2014 22:04:48 +0000 (15:04 -0700)]
Merge pull request #2876 from mepps/participant-image-event-badge
Allows users to display a contact's profile picture on their name badge
Tim Otten [Fri, 16 May 2014 21:48:35 +0000 (14:48 -0700)]
Merge pull request #3248 from eileenmcnaughton/CRM-14684
CRM-14684 refactor function that identifies is a site supports back-offi...
Kurund Jalmi [Fri, 16 May 2014 21:43:38 +0000 (14:43 -0700)]
Merge pull request #3268 from eileenmcnaughton/CRM-14626
CRM-14626 fix event acl so that view event info & register for events ar...
Kurund Jalmi [Fri, 16 May 2014 20:48:18 +0000 (13:48 -0700)]
Merge pull request #3274 from jitendrapurohit/Webtest_4.5Fix
Web Test Fix 4.5alpha1
Kurund Jalmi [Fri, 16 May 2014 20:23:44 +0000 (13:23 -0700)]
Merge pull request #3282 from colemanw/memberVisibility
MembershipType schema fix
Coleman Watts [Fri, 16 May 2014 20:15:50 +0000 (16:15 -0400)]
MembershipType schema fix
Dave Greenberg [Fri, 16 May 2014 16:41:58 +0000 (09:41 -0700)]
Merge pull request #3281 from monishdeb/CRM-14669
CRM-14669 fix - Amount entered into Text/Numeric Quantity not included correctly
monishdeb [Fri, 16 May 2014 15:54:10 +0000 (21:24 +0530)]
CRM-14669 fix - Amount entered into Text/Numeric Quantity not included correctly
https://issues.civicrm.org/jira/browse/CRM-14669
atif-shaikh [Fri, 16 May 2014 14:34:34 +0000 (20:04 +0530)]
CoreBug Related Changes
Dave Greenberg [Thu, 15 May 2014 23:59:12 +0000 (16:59 -0700)]
Merge pull request #3269 from monishdeb/CRM-13981
CRM-13981 Upgrade fix
Dave Greenberg [Thu, 15 May 2014 23:12:52 +0000 (16:12 -0700)]
Merge pull request #3276 from davecivicrm/CRM-14700
CRM-14700 - revert to add() mechanism for Membership Type visibility.
Dave Greenberg [Thu, 15 May 2014 23:12:01 +0000 (16:12 -0700)]
CRM-14700 - revert to add() mechanism for Membership Type visibility.
----------------------------------------
* CRM-14700:
https://issues.civicrm.org/jira/browse/CRM-14700
Dave Greenberg [Thu, 15 May 2014 21:49:59 +0000 (14:49 -0700)]
Merge pull request #3273 from joannechester/master
CRM-14508 update URL for permissions documentation in book
Dave Greenberg [Thu, 15 May 2014 17:20:40 +0000 (10:20 -0700)]
Merge pull request #3275 from monishdeb/CRM-14675
CRM-14675 fix - Strict warning: Non-static method CRM_Event_BAO_Event::g...
Dave Greenberg [Thu, 15 May 2014 16:30:41 +0000 (09:30 -0700)]
Merge pull request #3272 from monishdeb/CRM-14625
CRM-14625 fix - missing asset: soft_credit_type.png
monishdeb [Thu, 15 May 2014 15:58:47 +0000 (21:28 +0530)]
CRM-14675 fix - Strict warning: Non-static method CRM_Event_BAO_Event::getTemplateDefaultValues() should not be called statically, assuming $this from incompatible context in CRM_Event_Form_ManageEvent_EventInfo->postProcess() (line 309
https://issues.civicrm.org/jira/browse/CRM-14675
jitendrapurohit [Thu, 15 May 2014 13:35:57 +0000 (19:05 +0530)]
Web Test Fix 4.5alpha1
joannechester [Thu, 15 May 2014 02:16:35 +0000 (12:16 +1000)]
new URL for permission doc
projects / civicrm-core.git / log