Kurund Jalmi [Sat, 29 Jun 2013 10:17:18 +0000 (03:17 -0700)]
Merge pull request #1069 from kurund/CRM-12964
CRM-2964
Kurund Jalmi [Fri, 28 Jun 2013 23:07:56 +0000 (04:37 +0530)]
more fixes for generate data, CRM-12964
Kurund Jalmi [Fri, 28 Jun 2013 22:47:45 +0000 (04:17 +0530)]
worked on CRM-12964, added option group for name_badge
Kurund Jalmi [Fri, 28 Jun 2013 10:54:27 +0000 (03:54 -0700)]
Merge pull request #1064 from ravishnair/CRM-12787
-- CRM-12787 applied patch and made some modifications
Kurund Jalmi [Fri, 28 Jun 2013 10:53:20 +0000 (03:53 -0700)]
Merge pull request #1066 from eileenmcnaughton/master
e notice fix
eileen [Fri, 28 Jun 2013 10:42:39 +0000 (22:42 +1200)]
e-notice fix
deepak-srivastava [Fri, 28 Jun 2013 07:52:26 +0000 (00:52 -0700)]
Merge pull request #1065 from deepak-srivastava/logs
CRM-12849, CRM-12274 prevent log reports from fatal
Deepak Srivastava [Fri, 28 Jun 2013 07:46:19 +0000 (13:16 +0530)]
CRM-12849, CRM-12274 prevent log reports from fatal
----------------------------------------
* CRM-12849: "Change log" tab crashes with "Table log_civicrm_activity_target doesn't exist"
http://issues.civicrm.org/jira/browse/CRM-12849
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
Ravish Nair [Fri, 28 Jun 2013 07:12:12 +0000 (12:42 +0530)]
-- CRM-12787 applied patch and made some modification
----------------------------------------
* CRM-12787: Case Detail report: add filter & display column for Deleted
http://issues.civicrm.org/jira/browse/CRM-12787
Dave Greenberg [Thu, 27 Jun 2013 18:08:22 +0000 (11:08 -0700)]
Merge pull request #1063 from JoeMurray/patch-2
Fix entity_table comment
JoeMurray [Thu, 27 Jun 2013 17:55:29 +0000 (13:55 -0400)]
Fix entity_table comment
Kurund Jalmi [Thu, 27 Jun 2013 11:42:39 +0000 (04:42 -0700)]
Merge pull request #1062 from kurund/CRM-12964
CRM-12964, add schema, meta data, sample data for label layouts
Kurund Jalmi [Thu, 27 Jun 2013 11:38:06 +0000 (17:08 +0530)]
worked on CRM-12964, added metadata, navigation menu and generate/sample data
Kurund Jalmi [Thu, 27 Jun 2013 10:44:40 +0000 (16:14 +0530)]
worked on CRM-12964, added new table for labels
Kurund Jalmi [Thu, 27 Jun 2013 06:07:44 +0000 (23:07 -0700)]
Merge pull request #1061 from davecivicrm/CRM-11861
CRM-11861 patch plus a variety of notice fixes in relatedContact form an...
Dave Greenberg [Thu, 27 Jun 2013 01:49:11 +0000 (18:49 -0700)]
CRM-11861 patch plus a variety of notice fixes in relatedContact form and postProcess. Added new setting - secondDegRelPermission to SettingsGetfields.php and fixed several syntax errors in that file due to unescaped single quotes.
----------------------------------------
* CRM-11861: Allow option for second-degree relation permissions
http://issues.civicrm.org/jira/browse/CRM-11861
Coleman Watts [Wed, 26 Jun 2013 18:08:11 +0000 (11:08 -0700)]
Cleanup GenerateData.php and make it possible to add contacts to an existing db
Kurund Jalmi [Tue, 25 Jun 2013 14:15:30 +0000 (07:15 -0700)]
Merge pull request #1058 from pratik-joshi/crm-10164
crm-10164 : more fixes
Pratik Joshi [Tue, 25 Jun 2013 12:56:17 +0000 (18:26 +0530)]
crm-10164 : more fixes
Kurund Jalmi [Tue, 25 Jun 2013 11:46:02 +0000 (04:46 -0700)]
Merge pull request #1051 from yashodha/hooks
Hooks
deepak-srivastava [Tue, 25 Jun 2013 11:35:02 +0000 (04:35 -0700)]
Merge pull request #1056 from deepak-srivastava/reportsapi
CRM-12877
Deepak Srivastava [Tue, 25 Jun 2013 11:27:25 +0000 (16:57 +0530)]
CRM-12877, fixed save-a-copy bug
----------------------------------------
* CRM-12877: Provide api for creating report instances
http://issues.civicrm.org/jira/browse/CRM-12877
Deepak Srivastava [Tue, 25 Jun 2013 10:46:19 +0000 (16:16 +0530)]
CRM-12877, splitting instance postprocess in BAO::create and add, and exposing hooks
----------------------------------------
* CRM-12877: Provide api for creating report instances
http://issues.civicrm.org/jira/browse/CRM-12877
colemanw [Tue, 25 Jun 2013 01:41:04 +0000 (18:41 -0700)]
Merge pull request #1049 from eileenmcnaughton/CRM-12887
Crm 12887 JS tidy up
Coleman Watts [Tue, 25 Jun 2013 01:39:58 +0000 (18:39 -0700)]
CRM-12887 simplify markup and js
----------------------------------------
* CRM-12887: Js tidy-up on Contribution dashboard
http://issues.civicrm.org/jira/browse/CRM-12887
Coleman Watts [Tue, 25 Jun 2013 01:13:14 +0000 (18:13 -0700)]
CRM-12887 simplify code
----------------------------------------
* CRM-12887: Js tidy-up on Contribution dashboard
http://issues.civicrm.org/jira/browse/CRM-12887
Coleman Watts [Mon, 24 Jun 2013 22:31:48 +0000 (15:31 -0700)]
CRM-12887 fix click handlers and respect hash
----------------------------------------
* CRM-12887: Js tidy-up on Contribution dashboard
http://issues.civicrm.org/jira/browse/CRM-12887
colemanw [Mon, 24 Jun 2013 21:57:15 +0000 (14:57 -0700)]
Merge pull request #1048 from eileenmcnaughton/master
test cleanups - make survey test good template, enotice compliance
Kurund Jalmi [Mon, 24 Jun 2013 18:13:57 +0000 (11:13 -0700)]
Merge pull request #1047 from davecivicrm/CRM-12880
CRM-12880 and CRM-11784 help text improvements.
Kurund Jalmi [Mon, 24 Jun 2013 14:27:31 +0000 (07:27 -0700)]
Merge pull request #1055 from pratik-joshi/CRM-12594
CRM-12594 : fix for point 11, 12. fixed in 4.4 as per CRM-12594 comment#51378
Pratik Joshi [Mon, 24 Jun 2013 13:58:15 +0000 (19:28 +0530)]
CRM-12594 : fix for point 11, 12. fixed in 4.4 as per CRM-12594 comment-51378
yashodha [Mon, 24 Jun 2013 13:01:17 +0000 (18:31 +0530)]
minor fix for campaign id
yashodha [Mon, 24 Jun 2013 12:48:00 +0000 (18:18 +0530)]
(generalised the links in tpl to use hooks)CRM-12864
Kurund Jalmi [Mon, 24 Jun 2013 11:29:06 +0000 (04:29 -0700)]
Merge pull request #1053 from totten/pull-request-1029-patches
CRM-12321 - SQL/Memcache coherency
Tim Otten [Mon, 24 Jun 2013 10:28:48 +0000 (06:28 -0400)]
CRM-12321 - CRM_Core_BAO_Cache - Clear statics when flushing system caches
Tim Otten [Mon, 24 Jun 2013 08:48:07 +0000 (04:48 -0400)]
CRM-12321 - CRM_Core_BAO_Cache - Clear static caches when setting items
Tim Otten [Mon, 24 Jun 2013 08:36:53 +0000 (04:36 -0400)]
CRM-12321 - CRM_Core_BAO_Cache::setItem - Cache coherency
Kurund Jalmi [Tue, 18 Jun 2013 11:06:15 +0000 (16:36 +0530)]
worked on CRM-12321, added memcache support for civicrm_cache table
Tim Otten [Mon, 24 Jun 2013 07:51:59 +0000 (00:51 -0700)]
Merge pull request #1052 from totten/master-invoke-fix-case
CRM_Core_Invoke - Fix bad class name (uppercase/lowercase)
Tim Otten [Mon, 24 Jun 2013 07:49:28 +0000 (03:49 -0400)]
CRM_Core_Invoke - Fix bad class name (uppercase/lowercase)
yashodha [Mon, 24 Jun 2013 07:31:55 +0000 (13:01 +0530)]
added comment (CRM-12864)
deepak-srivastava [Mon, 24 Jun 2013 06:30:53 +0000 (23:30 -0700)]
Merge pull request #1050 from deepak-srivastava/CRM-12623
CRM-12623, php 5.3 syntax error fix
yashodha [Mon, 24 Jun 2013 06:28:23 +0000 (11:58 +0530)]
CRM-12864
Deepak Srivastava [Mon, 24 Jun 2013 06:28:07 +0000 (11:58 +0530)]
CRM-12623, php 5.3 syntax error fix
----------------------------------------
* CRM-12623: Create CiviHR Report Template
http://issues.civicrm.org/jira/browse/CRM-12623
eileen [Mon, 24 Jun 2013 02:09:17 +0000 (14:09 +1200)]
CRM-12877 tidy up url
eileen [Mon, 24 Jun 2013 00:55:16 +0000 (12:55 +1200)]
CRM-12887 switch to use load function
eileen [Mon, 24 Jun 2013 00:34:22 +0000 (12:34 +1200)]
CRM-12887 make it jslint happy
http://stackoverflow.com/questions/
7357736/jslint-problems-declaring-variables
eileen [Mon, 24 Jun 2013 00:13:32 +0000 (12:13 +1200)]
CRM-12887 get jshint happy with our code
eileen [Sun, 23 Jun 2013 23:33:24 +0000 (11:33 +1200)]
CRM-12887 intial restructure into js file
colemanw [Sat, 22 Jun 2013 13:42:52 +0000 (06:42 -0700)]
Merge pull request #1018 from eileenmcnaughton/CRM-12619
CRM-12619 fix relationship search start end dates to be separate & don'...
eileen [Sat, 22 Jun 2013 11:21:32 +0000 (23:21 +1200)]
mark tests non-enotice=compliant
eileen [Sat, 22 Jun 2013 11:20:40 +0000 (23:20 +1200)]
update test generated examples
eileen [Sat, 22 Jun 2013 09:12:55 +0000 (21:12 +1200)]
update test generated examples
eileen [Sat, 22 Jun 2013 08:38:09 +0000 (20:38 +1200)]
update test generated examples
eileen [Sat, 22 Jun 2013 08:25:27 +0000 (20:25 +1200)]
mark ActionScheduleTest as non-compliant
eileen [Sat, 22 Jun 2013 08:14:21 +0000 (20:14 +1200)]
tidy up batch test to use new functions, truncate table & generate same example each time
eileen [Sat, 22 Jun 2013 07:41:38 +0000 (19:41 +1200)]
mark mailing group test as non-e-notice compliant
eileen [Sat, 22 Jun 2013 07:34:57 +0000 (19:34 +1200)]
survey respondent test = e-notice compliant
eileen [Sat, 22 Jun 2013 07:15:44 +0000 (19:15 +1200)]
make event api test e-notice compliant
eileen [Sat, 22 Jun 2013 07:12:54 +0000 (19:12 +1200)]
mark test as non-e-notice-compliant
eileen [Sat, 22 Jun 2013 03:55:16 +0000 (15:55 +1200)]
Make relationship api test ENotice Compliant
eileen [Sat, 22 Jun 2013 03:38:23 +0000 (15:38 +1200)]
api test e-notice compliance provide appropriate default for 'date_format' where appropriate
eileen [Sat, 22 Jun 2013 02:50:01 +0000 (14:50 +1200)]
don't treat 'debug=0' as set
eileen [Sat, 22 Jun 2013 00:45:58 +0000 (12:45 +1200)]
print debug on failure
eileen [Fri, 21 Jun 2013 22:24:51 +0000 (10:24 +1200)]
tidy up on survey test to make it a good template
eileen [Sat, 22 Jun 2013 07:22:28 +0000 (19:22 +1200)]
CRM-12619 - per comment remove obsolete variables
eileen [Tue, 28 May 2013 23:18:01 +0000 (11:18 +1200)]
CRM-12619 fix relationship search start end dates to be separate & don't require type
Dave Greenberg [Fri, 21 Jun 2013 22:57:58 +0000 (15:57 -0700)]
CRM-12880 and CRM-11784 help text improvements.
----------------------------------------
* CRM-12880: ACL help text could be slightly clearer?
http://issues.civicrm.org/jira/browse/CRM-12880
* CRM-11784: user text for civicrm/event/manage
http://issues.civicrm.org/jira/browse/CRM-11784
Dave Greenberg [Fri, 21 Jun 2013 22:27:00 +0000 (15:27 -0700)]
Merge pull request #995 from dpradeep/CRM-10146-commit
-- fixed for CRM-10146, Restricted the creation of same membership and a...
Recreated bug, applied patch and tested ok. Also reviewed and ran the new web test.
Tim Otten [Fri, 21 Jun 2013 18:56:02 +0000 (11:56 -0700)]
Merge pull request #1005 from GiantRobot/CRM-12804
Correct params to CRM_Upgrade_Form::doIncrementalUpgradeFinish().
deepak-srivastava [Fri, 21 Jun 2013 10:20:00 +0000 (03:20 -0700)]
Merge pull request #1044 from deepak-srivastava/CRM-12623
CRM-12623
Deepak Srivastava [Fri, 21 Jun 2013 10:11:32 +0000 (15:41 +0530)]
CRM-12623, support setting accordion title with groupings
----------------------------------------
* CRM-12623:
http://issues.civicrm.org/jira/browse/CRM-12623
Dave Greenberg [Thu, 20 Jun 2013 20:04:05 +0000 (13:04 -0700)]
Merge pull request #1036 from yashodha/fixes
CRM-12864
colemanw [Thu, 20 Jun 2013 17:23:08 +0000 (10:23 -0700)]
Merge pull request #1034 from totten/master-no-customgroups-warning
BAO_CustomGroup - Fix warning when displaying "Edit Contact" on a site w...
deepak-srivastava [Thu, 20 Jun 2013 12:31:55 +0000 (05:31 -0700)]
Merge pull request #1037 from deepak-srivastava/logs
CRM-12867
yashodha [Thu, 20 Jun 2013 12:07:45 +0000 (17:37 +0530)]
CRM-12864
Deepak Srivastava [Thu, 20 Jun 2013 12:07:27 +0000 (17:37 +0530)]
CRM-12867
----------------------------------------
* CRM-12867: Changelog enhanced summary report: pagination erroneous count
http://issues.civicrm.org/jira/browse/CRM-12867
Tim Otten [Thu, 20 Jun 2013 11:44:34 +0000 (17:14 +0530)]
BAO_CustomGroup - Fix warning when displaying "Edit Contact" on a site with no (visible, well-defined, single-value) CustomGroups.
Deepak Srivastava [Thu, 20 Jun 2013 07:12:20 +0000 (12:42 +0530)]
CRM-12623, count_distinct stat
----------------------------------------
* CRM-12623: Create CiviHR Report Template
http://issues.civicrm.org/jira/browse/CRM-12623
Tim Otten [Wed, 19 Jun 2013 14:27:02 +0000 (07:27 -0700)]
Merge pull request #1030 from eileenmcnaughton/master
fix api return bug highlighted by syntaxconformancetest
deepak-srivastava [Wed, 19 Jun 2013 11:27:01 +0000 (04:27 -0700)]
Merge pull request #1031 from deepak-srivastava/hr
CRM-12623
Deepak Srivastava [Wed, 19 Jun 2013 10:20:28 +0000 (15:50 +0530)]
CRM-12623
----------------------------------------
* CRM-12623: Create CiviHR Report Template
http://issues.civicrm.org/jira/browse/CRM-12623
eileen [Wed, 19 Jun 2013 01:45:16 +0000 (13:45 +1200)]
fix bug in handling unique fields as a return value highlighted by test
Kurund Jalmi [Tue, 18 Jun 2013 06:18:21 +0000 (23:18 -0700)]
Merge pull request #1026 from yashodha/fixes
fix custom group error
yashodha [Tue, 18 Jun 2013 06:03:19 +0000 (11:33 +0530)]
fix custom group error
Kurund Jalmi [Tue, 18 Jun 2013 05:36:19 +0000 (22:36 -0700)]
Merge pull request #1020 from lcdservices/CRM-12814
CRM-12814 optimize mailing tab clicks/opens calcualations
Kurund Jalmi [Tue, 18 Jun 2013 05:34:33 +0000 (22:34 -0700)]
Merge pull request #1023 from davecivicrm/CRM-9759
CRM-9759 clarifying Component dropdown labels for add/edit activity type...
Kurund Jalmi [Tue, 18 Jun 2013 05:32:59 +0000 (22:32 -0700)]
Merge pull request #1025 from eileenmcnaughton/master
tidy up of whitespace / fix white space regression
eileen [Tue, 18 Jun 2013 01:55:43 +0000 (13:55 +1200)]
remove new trailing spaces
eileen [Tue, 18 Jun 2013 01:41:35 +0000 (13:41 +1200)]
remove trailing whitespaces
eileen [Tue, 18 Jun 2013 01:39:52 +0000 (13:39 +1200)]
space tabs for double spaces
eileen [Tue, 18 Jun 2013 01:27:25 +0000 (13:27 +1200)]
remove newly added tabs (in favour of two spaces)
eileen [Tue, 18 Jun 2013 01:18:37 +0000 (13:18 +1200)]
remove trailing whitespaces en-masse
eileen [Tue, 18 Jun 2013 01:11:39 +0000 (13:11 +1200)]
tidy up trailing whitespace, add field titles
eileen [Tue, 18 Jun 2013 01:05:20 +0000 (13:05 +1200)]
xml tidy up, trailing whitespace, missing titles
Coleman Watts [Tue, 18 Jun 2013 00:30:34 +0000 (17:30 -0700)]
Code cleanup
Coleman Watts [Tue, 18 Jun 2013 00:30:23 +0000 (17:30 -0700)]
Fix CustomGroupTest
colemanw [Tue, 18 Jun 2013 00:02:33 +0000 (17:02 -0700)]
Merge pull request #1024 from davecivicrm/CRM-12521
CRM-12521 Adding first and last name fields to Your Registration Info pr...
Dave Greenberg [Mon, 17 Jun 2013 23:55:01 +0000 (16:55 -0700)]
CRM-12521 Adding first and last name fields to Your Registration Info profile since that is a better default for most use cases of event registration.
----------------------------------------
* CRM-12521: Your Registration Info default event profile should include First and Last Name
http://issues.civicrm.org/jira/browse/CRM-12521
Dave Greenberg [Mon, 17 Jun 2013 22:57:24 +0000 (15:57 -0700)]
CRM-9759 add missing ts.
----------------------------------------
* CRM-9759: Clarify Component field options when creating a new activity type
http://issues.civicrm.org/jira/browse/CRM-9759