monishdeb [Fri, 23 May 2014 06:57:01 +0000 (12:27 +0530)]
CRM-14627 additional fix
----------------------------------------
* CRM-14627: civicrm navigation inconsistent
https://issues.civicrm.org/jira/browse/CRM-14627
Kurund Jalmi [Fri, 23 May 2014 05:55:54 +0000 (11:25 +0530)]
Merge pull request #3335 from kurund/gendata-fixes
generated data fixes
kurund [Fri, 23 May 2014 05:55:18 +0000 (11:25 +0530)]
generated data fixes
Kurund Jalmi [Fri, 23 May 2014 05:32:07 +0000 (11:02 +0530)]
Merge pull request #3191 from divya-jose/CRM-14636
--CRM-14636 Datatables implimentation causes dom collisions
pratik-joshi [Fri, 23 May 2014 05:01:25 +0000 (10:31 +0530)]
Merge pull request #3261 from atif-shaikh/CoreBugs
Core Bug related to foreign key referencing not defined for civicrm_entity_tag table
Kurund Jalmi [Fri, 23 May 2014 04:52:32 +0000 (10:22 +0530)]
Merge pull request #3271 from jitendrapurohit/CoreWebtestFix4.5alpha1
WebTest Core Bug
Kurund Jalmi [Fri, 23 May 2014 04:52:05 +0000 (10:22 +0530)]
Merge pull request #3308 from jitendrapurohit/CoreBug4.5alpha1_Webtests
CRM-12872
Kurund Jalmi [Fri, 23 May 2014 04:51:42 +0000 (10:21 +0530)]
Merge pull request #3329 from jitendrapurohit/CRM-14373
CRM-14373
Kurund Jalmi [Fri, 23 May 2014 04:51:22 +0000 (10:21 +0530)]
Merge pull request #3328 from NileemaJadhav/CRM-master
HR-376 Fix for having Case entity type custom fields for profile selector
Kurund Jalmi [Fri, 23 May 2014 04:49:15 +0000 (10:19 +0530)]
Merge pull request #3330 from monishdeb/CRM-14724
CRM-14724 fix - when viewing b to a relationship link to contact a returns contact b
Kurund Jalmi [Fri, 23 May 2014 03:51:41 +0000 (09:21 +0530)]
Merge pull request #3325 from totten/master-casetype-ajax
CRM-14725 - crmCaseType - Use AJAX load/save
Kurund Jalmi [Fri, 23 May 2014 03:16:22 +0000 (08:46 +0530)]
Merge pull request #3334 from totten/master-casexmlrepo
CRM-14478, CRM-14474 - Move XML lookup code into new class
Tim Otten [Fri, 23 May 2014 03:11:25 +0000 (20:11 -0700)]
CRM-14478, CRM-14474 - Move XML lookup code into new class
Dave Greenberg [Thu, 22 May 2014 18:59:21 +0000 (11:59 -0700)]
Merge pull request #3326 from pratik-joshi/CRM-14704-reopen-fix
CRM-14704 : newly added target contact ids won't have any effect of activity creation
Kurund Jalmi [Thu, 22 May 2014 18:58:21 +0000 (00:28 +0530)]
Merge pull request #3333 from kurund/CRM-14476
CRM-14476, case type fixes
kurund [Thu, 22 May 2014 18:57:10 +0000 (00:27 +0530)]
updated case type sample data to include xml definition
kurund [Thu, 22 May 2014 17:53:52 +0000 (23:23 +0530)]
rename column name, CRM-14473
----------------------------------------
* CRM-14473:
https://issues.civicrm.org/jira/browse/CRM-14473
Dave Greenberg [Thu, 22 May 2014 17:50:43 +0000 (10:50 -0700)]
Merge pull request #3332 from davecivicrm/CRM-11864
CRM-11864 - replacing stale PR-3101 with additional layout improvements.
Dave Greenberg [Thu, 22 May 2014 17:49:26 +0000 (10:49 -0700)]
CRM-11864 - changes for confirmation block
----------------------------------------
* CRM-11864:
https://issues.civicrm.org/jira/browse/CRM-11864
Dave Greenberg [Thu, 22 May 2014 17:37:24 +0000 (10:37 -0700)]
- replaceing stale PR-3101 with additional layout improvements.
monishdeb [Thu, 22 May 2014 14:48:44 +0000 (20:18 +0530)]
CRM-14724 fix - when viewing b to a relationship link to contact a returns contact b
https://issues.civicrm.org/jira/browse/CRM-14724
jitendrapurohit [Thu, 22 May 2014 13:42:21 +0000 (19:12 +0530)]
CRM-14373
Nileema [Thu, 22 May 2014 12:56:53 +0000 (18:26 +0530)]
HR-376 Fix for having Case entity type custom fields for profile selector
Pratik Joshi [Thu, 22 May 2014 06:03:00 +0000 (11:33 +0530)]
CRM-14704 : newly added target contact ids won't have any effect of activity creation
Tim Otten [Thu, 22 May 2014 01:51:29 +0000 (18:51 -0700)]
CRM-14725 - Load case-type based on ID in URL ("/civicrm/a/#/caseType/123")
Tim Otten [Thu, 22 May 2014 01:47:11 +0000 (18:47 -0700)]
CRM-14725 - Implement "Save" button
Tim Otten [Thu, 22 May 2014 01:44:11 +0000 (18:44 -0700)]
CRM-14725 - Add Angular service wrapper for CRM.api3
Tim Otten [Thu, 22 May 2014 00:43:05 +0000 (17:43 -0700)]
crmCaseType.js - Cleanup
Dave Greenberg [Thu, 22 May 2014 00:32:49 +0000 (17:32 -0700)]
Merge pull request #3216 from xurizaemon/CRM-14596
Issue CRM-14596. Expose modified_date and created_date to CiviCRM API.
Tim Otten [Wed, 21 May 2014 22:48:08 +0000 (15:48 -0700)]
Update Service.php
Tim Otten [Wed, 21 May 2014 22:47:14 +0000 (15:47 -0700)]
Update Service.php
Kurund Jalmi [Wed, 21 May 2014 13:35:52 +0000 (19:05 +0530)]
Merge pull request #3323 from kurund/CRM-14476
added test to save xml file, CRM-14476
kurund [Wed, 21 May 2014 13:28:45 +0000 (18:58 +0530)]
added test to save xml file, CRM-14476
----------------------------------------
* CRM-14476: Extend CaseType API to return/save XML
https://issues.civicrm.org/jira/browse/CRM-14476
Eileen McNaughton [Wed, 21 May 2014 09:43:41 +0000 (21:43 +1200)]
Merge pull request #3320 from eileenmcnaughton/ufcleanup
Monish kindly QAd this (& picked up a since fixed error)
Eileen McNaughton [Wed, 21 May 2014 09:38:01 +0000 (21:38 +1200)]
add a few comment blocks
Eileen McNaughton [Wed, 21 May 2014 08:06:28 +0000 (20:06 +1200)]
separation of concerns - move uf specific code to uf classes
Eileen McNaughton [Wed, 21 May 2014 04:38:25 +0000 (16:38 +1200)]
Merge pull request #3319 from eileenmcnaughton/testfix
I accidentally added this file - removing again (broken tests)
Eileen McNaughton [Wed, 21 May 2014 04:36:27 +0000 (16:36 +1200)]
I accidentally added this file - removing again (broken tests)
Tim Otten [Wed, 21 May 2014 00:56:43 +0000 (17:56 -0700)]
Merge pull request #3315 from eileenmcnaughton/codetidying
Codetidying - remove a couple of unused params
Eileen McNaughton [Wed, 21 May 2014 00:39:51 +0000 (12:39 +1200)]
minor code tidyups
Dave Greenberg [Wed, 21 May 2014 00:22:20 +0000 (17:22 -0700)]
Merge pull request #3316 from davecivicrm/commentAndDropdownFix
Fix incomplete comment and add placeholder to duration_unit in Membershi...
Dave Greenberg [Wed, 21 May 2014 00:21:34 +0000 (17:21 -0700)]
Fix incomplete comment and add placeholder to duration_unit in Membership Type form.
Dave Greenberg [Wed, 21 May 2014 00:09:21 +0000 (17:09 -0700)]
Merge pull request #3314 from davecivicrm/CRM-14716
CRM-14716 - Change default Visibility for Mailings for Public Pages.
Dave Greenberg [Tue, 20 May 2014 23:52:37 +0000 (16:52 -0700)]
CRM-14716 - Change default Visibility for Mailings for Public Pages.
----------------------------------------
* CRM-14716:
https://issues.civicrm.org/jira/browse/CRM-14716
Tim Otten [Tue, 20 May 2014 23:32:48 +0000 (16:32 -0700)]
Merge pull request #3313 from eileenmcnaughton/CRM-14197
towards CRM-14197 separate out building contribution Params array
Eileen McNaughton [Tue, 20 May 2014 00:09:00 +0000 (12:09 +1200)]
clarify isSeparatePayment into it's own function
Eileen McNaughton [Tue, 20 May 2014 22:54:31 +0000 (10:54 +1200)]
CRM-14197 derive paymentrequired status more clearly
Eileen McNaughton [Tue, 20 May 2014 22:51:17 +0000 (10:51 +1200)]
CRM-14197 membership post process refactor CMS usermove CMS create user back out of process membership & pass membership id to renewmembership
Eileen McNaughton [Tue, 20 May 2014 22:36:45 +0000 (10:36 +1200)]
towards CRM-14197 separate out building contribution Params array
Tim Otten [Tue, 20 May 2014 22:40:37 +0000 (15:40 -0700)]
Merge pull request #3312 from eileenmcnaughton/CRM-14197
CRM-14197 code refactor of membership post process
Eileen McNaughton [Mon, 19 May 2014 11:03:20 +0000 (23:03 +1200)]
CRM-14197 towards refactoring form specific actions back onto the form as part of
figuring out how to set membership entity id on line item (preliminary simplication
Eileen McNaughton [Tue, 20 May 2014 04:30:56 +0000 (16:30 +1200)]
comment fixes & spelling
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
jitendrapurohit [Tue, 20 May 2014 14:19:07 +0000 (19:49 +0530)]
CRM-12872
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
Divya Jose [Tue, 20 May 2014 07:07:18 +0000 (12:37 +0530)]
--removed the variable context
Divya Jose [Mon, 12 May 2014 12:06:12 +0000 (17:36 +0530)]
--Added closure and changes cj to $
Divya Jose [Wed, 7 May 2014 13:55:47 +0000 (19:25 +0530)]
--CRM-14636 Datatables implimentation causes dom collisions
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
projects / civicrm-core.git / log