kurund [Mon, 30 Dec 2013 19:03:36 +0000 (11:03 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-30-11-03-32
Kurund Jalmi [Mon, 30 Dec 2013 18:10:23 +0000 (10:10 -0800)]
Merge pull request #2251 from deepak-srivastava/4.4.CRM-13838
CRM-13838 - Fixed bug that caused participants to be listed twice.
Kurund Jalmi [Mon, 30 Dec 2013 18:06:45 +0000 (10:06 -0800)]
Merge pull request #2244 from dakshayani/hr-212
-- HR-212 modification to resolve notices
Kurund Jalmi [Mon, 30 Dec 2013 17:45:13 +0000 (09:45 -0800)]
Merge pull request #2242 from eileenmcnaughton/CRM-13707
CRM-13707 api test generated examples - fix escaping in output
Kurund Jalmi [Mon, 30 Dec 2013 17:42:40 +0000 (09:42 -0800)]
Merge pull request #2240 from totten/4.4-setCriteriaModel
HR-226 - CRM.Backbone.extendCollection - Add helper for representing "crmCriteria" as a full-fledged model
Kurund Jalmi [Mon, 30 Dec 2013 17:27:49 +0000 (09:27 -0800)]
Merge pull request #2227 from yashodha/4.4.CRM-13892
CRM-13892 -added new column for dashboard
Kurund Jalmi [Mon, 30 Dec 2013 17:18:13 +0000 (09:18 -0800)]
Merge pull request #2254 from monishdeb/CRM-13972
CRM-13972 related fix
monishdeb [Mon, 30 Dec 2013 12:46:34 +0000 (18:16 +0530)]
CRM-13972 related fix
----------------------------------------
* CRM-13972: Preferred Language reset after editing contact
http://issues.civicrm.org/jira/browse/CRM-13972
Coleman Watts [Sun, 29 Dec 2013 05:33:55 +0000 (21:33 -0800)]
CRM_Core_Session - allow empty string in setStatus
Coleman Watts [Sun, 29 Dec 2013 04:35:25 +0000 (20:35 -0800)]
Smarty API - Fix undefined index warning
colemanw [Sun, 29 Dec 2013 04:33:38 +0000 (20:33 -0800)]
Merge pull request #2252 from civicrm/4.4
Merge branch 4.4 into master
Deepak Srivastava [Sat, 28 Dec 2013 11:57:00 +0000 (17:27 +0530)]
CRM-13838 - Report filtering by price level
http://issues.civicrm.org/jira/browse/CRM-13838
Dave Greenberg [Fri, 27 Dec 2013 02:00:19 +0000 (18:00 -0800)]
Merge pull request #2250 from davecivicrm/CRM-14025
CRM-14025 committing PR-2247 to 4.4 branch as intended.
Dave Greenberg [Fri, 27 Dec 2013 01:56:14 +0000 (17:56 -0800)]
CRM-14025 committing PR-2247 to 4.4 branch as intended.
----------------------------------------
* CRM-14025: Manage registration pages don't call postProcess hook
http://issues.civicrm.org/jira/browse/CRM-14025
Dave Greenberg [Fri, 27 Dec 2013 01:41:15 +0000 (17:41 -0800)]
Merge pull request #2247 from eileenmcnaughton/CRM-14025
CRM-14025 call postProcess hook ManageEvent form
Eileen [Tue, 24 Dec 2013 00:38:04 +0000 (13:38 +1300)]
fix typo I spotted
Eileen [Tue, 24 Dec 2013 00:36:38 +0000 (13:36 +1300)]
CRM-14025 call postProcess hook ManageEvent form - per comment on function there are alternative ways to do this that should be considered in a later restructure
----------------------------------------
* CRM-14025: Manage registration pages don't call postProcess hook
http://issues.civicrm.org/jira/browse/CRM-14025
Dave Greenberg [Mon, 23 Dec 2013 21:35:23 +0000 (13:35 -0800)]
Merge pull request #2245 from davecivicrm/CRM-13945
CRM-13945 - Editing website field via profile creates new entry
Dave Greenberg [Mon, 23 Dec 2013 21:34:38 +0000 (13:34 -0800)]
CRM-13945 - Editing website field via profile creates new entry
http://issues.civicrm.org/jira/browse/CRM-13945
Dave Greenberg [Mon, 23 Dec 2013 21:32:08 +0000 (13:32 -0800)]
Merge pull request #2237 from lcdservices/CRM-14016
CRM-14016 remove report instance from nav bar
Tested patch, works as expected.
Dakshayani Chinchwadkar [Mon, 23 Dec 2013 13:02:18 +0000 (18:32 +0530)]
-- HR-212 modification to resolve notices
Dave Greenberg [Sun, 22 Dec 2013 23:02:26 +0000 (15:02 -0800)]
Merge pull request #2241 from eileenmcnaughton/invalid-html
html fix-up - replace <-> with >-><
Eileen [Fri, 8 Nov 2013 04:09:38 +0000 (17:09 +1300)]
CRM-13707 api test generated examples - fix escaping in output
----------------------------------------
* CRM-13707: api\v3\examples\SettingGetFields has syntax errors, due unescaped '
http://issues.civicrm.org/jira/browse/CRM-13707
Eileen [Sun, 22 Dec 2013 08:21:26 +0000 (21:21 +1300)]
CRM-14017 - html validation issues on relationship type admin page
----------------------------------------
* CRM-14017: html validation issues on relationship type admin page
http://issues.civicrm.org/jira/browse/CRM-14017
Eileen [Sun, 22 Dec 2013 08:08:49 +0000 (21:08 +1300)]
html fix-up - replace <-> with >-><
Coleman Watts [Sun, 22 Dec 2013 06:04:37 +0000 (22:04 -0800)]
Update .gitignore
Tim Otten [Sun, 22 Dec 2013 03:07:48 +0000 (21:07 -0600)]
HR-226 - CRM.Backbone.extendCollection - Unit test for "crmCriteriaModel"
Tim Otten [Sat, 21 Dec 2013 23:28:03 +0000 (17:28 -0600)]
HR-226 - CRM.Backbone.extendCollection - Add helper for representing "crmCriteria" as a full-fledged model
colemanw [Fri, 20 Dec 2013 22:40:01 +0000 (14:40 -0800)]
Merge pull request #2239 from colemanw/4.4
CRM-12464 - Add campaign pseudoconstants
Coleman Watts [Fri, 20 Dec 2013 22:39:41 +0000 (14:39 -0800)]
CRM-12464 - Add campaign pseudoconstants
Brian Shaughnessy [Fri, 20 Dec 2013 21:52:46 +0000 (16:52 -0500)]
CRM-14016 remove report instance from nav bar
dlobo [Fri, 20 Dec 2013 19:59:41 +0000 (11:59 -0800)]
Merge pull request #2225 from lcdservices/CRM-13994
CRM-13994 delete entity_tag records when deleting activity
Kurund Jalmi [Wed, 18 Dec 2013 19:25:26 +0000 (11:25 -0800)]
Merge pull request #2233 from monishdeb/CRM-13937
CRM-13937 fix - Lifetime memberships created with a start date older than 3 months ago have a status of expired.
monishdeb [Wed, 18 Dec 2013 06:32:30 +0000 (12:02 +0530)]
CRM-13937 fix - Lifetime memberships created with a start date older than 3 months ago have a status of expired.
http://issues.civicrm.org/jira/browse/CRM-13937
colemanw [Tue, 17 Dec 2013 23:49:51 +0000 (15:49 -0800)]
Merge pull request #2232 from colemanw/master
CRM-12578 - Cleanup duplicated stylesheets in standalone forms
Coleman Watts [Tue, 17 Dec 2013 23:47:22 +0000 (15:47 -0800)]
CRM-12578 - Cleanup duplicated stylesheets in standalone forms
colemanw [Tue, 17 Dec 2013 23:29:35 +0000 (15:29 -0800)]
Merge pull request #2231 from colemanw/master
CRM-12578 - Cleanup references to unused stylesheets
Coleman Watts [Tue, 17 Dec 2013 23:28:56 +0000 (15:28 -0800)]
CRM-12578 - Cleanup references to unused stylesheets
Coleman Watts [Tue, 17 Dec 2013 23:24:27 +0000 (15:24 -0800)]
css cleanup
Dave Greenberg [Tue, 17 Dec 2013 18:03:27 +0000 (10:03 -0800)]
Merge pull request #2207 from lcdservices/CRM-13920
CRM-13920 add "any" option to getCaseActivityQuery and use when checking...
yashodha [Tue, 17 Dec 2013 10:04:37 +0000 (15:34 +0530)]
CRM-13892 -added new column for dashboard
kurund [Tue, 17 Dec 2013 05:52:38 +0000 (21:52 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-16-21-42-04
Conflicts:
CRM/Event/BAO/Participant.php
templates/CRM/common/Navigation.tpl
colemanw [Tue, 17 Dec 2013 03:54:27 +0000 (19:54 -0800)]
Merge pull request #2224 from colemanw/4.4
CRM-13929 - fix drupal jQuery vs cj collision
Coleman Watts [Tue, 17 Dec 2013 03:53:51 +0000 (19:53 -0800)]
CRM-13929 - fix drupal jQuery vs cj collision
Brian Shaughnessy [Tue, 17 Dec 2013 03:00:56 +0000 (22:00 -0500)]
CRM-13920 fix case count and activity creation perm check
Brian Shaughnessy [Tue, 17 Dec 2013 01:54:21 +0000 (20:54 -0500)]
CRM-13994 delete entity_tag records when deleting activity
Kurund Jalmi [Mon, 16 Dec 2013 18:26:02 +0000 (10:26 -0800)]
Merge pull request #2221 from monishdeb/CRM-13924
CRM-13924 fix - notices
monishdeb [Mon, 16 Dec 2013 09:37:23 +0000 (15:07 +0530)]
CRM-13924 fix - notices
http://issues.civicrm.org/jira/browse/CRM-13924
deepak-srivastava [Mon, 16 Dec 2013 08:19:23 +0000 (00:19 -0800)]
Merge pull request #2170 from eileenmcnaughton/CRM-13918
CRM-13918 add report_template.getrows, report_template.getstatistics api functions
Coleman Watts [Sun, 15 Dec 2013 03:58:37 +0000 (19:58 -0800)]
CRM-13979 - Fix tag name display during delete
Graylin Kim [Sun, 15 Dec 2013 02:15:38 +0000 (21:15 -0500)]
Fixes CRM-13979 by moving the status update out of the BAO layer.
Kurund Jalmi [Fri, 13 Dec 2013 16:45:26 +0000 (08:45 -0800)]
Merge pull request #2212 from davecivicrm/participantBAONoticeFix
Notice fix in CRM_Participant_BAO_Participant::add
Kurund Jalmi [Fri, 13 Dec 2013 16:44:50 +0000 (08:44 -0800)]
Merge pull request #2213 from pratik-joshi/CRM-13961
CRM-13961
Kurund Jalmi [Fri, 13 Dec 2013 16:43:28 +0000 (08:43 -0800)]
Merge pull request #2214 from pratik-joshi/CRM-13963
CRM-13963
Kurund Jalmi [Fri, 13 Dec 2013 16:42:08 +0000 (08:42 -0800)]
Merge pull request #2215 from monishdeb/CRM-13972
Crm 13972 fix
Kurund Jalmi [Fri, 13 Dec 2013 16:41:16 +0000 (08:41 -0800)]
Merge pull request #2216 from monishdeb/CRM-13738-fix
CRM-13738 related fix
monishdeb [Fri, 13 Dec 2013 16:32:48 +0000 (22:02 +0530)]
CRM-13738 related fix
----------------------------------------
* CRM-13738: Activity Report fails if filtering on any contact
http://issues.civicrm.org/jira/browse/CRM-13738
monishdeb [Fri, 13 Dec 2013 16:25:26 +0000 (21:55 +0530)]
CRM-13972 fix - Preferred Language reset after editing contact
http://issues.civicrm.org/jira/browse/CRM-13972
Kurund Jalmi [Fri, 13 Dec 2013 16:09:47 +0000 (08:09 -0800)]
Merge pull request #2193 from monishdeb/CRM-13734
CRM-13734 fix - Some basic case activities are not reserved
Pratik Joshi [Fri, 13 Dec 2013 10:14:22 +0000 (15:44 +0530)]
CRM-13963
Pratik Joshi [Fri, 13 Dec 2013 09:53:33 +0000 (15:23 +0530)]
CRM-13961
Dave Greenberg [Fri, 13 Dec 2013 04:29:18 +0000 (20:29 -0800)]
Notice fix in CRM_Participant_BAO_Participant::add
colemanw [Thu, 12 Dec 2013 23:19:05 +0000 (15:19 -0800)]
Merge pull request #2211 from colemanw/master
CRM-10693 - Fix ajaxFormError bug
Coleman Watts [Thu, 12 Dec 2013 23:18:31 +0000 (15:18 -0800)]
CRM-10693 - Fix ajaxFormError bug
colemanw [Thu, 12 Dec 2013 22:36:24 +0000 (14:36 -0800)]
Merge pull request #2209 from colemanw/ajax
CRM-13863 - Allow sorting to happen through ajax
colemanw [Thu, 12 Dec 2013 22:34:24 +0000 (14:34 -0800)]
Merge pull request #2185 from jaapjansma/CRM-13946
fixed CRM-13946 set default database connection to UTF-8
colemanw [Thu, 12 Dec 2013 22:29:44 +0000 (14:29 -0800)]
Merge pull request #2210 from colemanw/4.4
CRM-13969 - Fix error if no tags defined
Coleman Watts [Thu, 12 Dec 2013 22:28:45 +0000 (14:28 -0800)]
CRM-13969 - Fix error if no tags defined
Coleman Watts [Thu, 12 Dec 2013 22:13:58 +0000 (14:13 -0800)]
CRM-13863 - Ajaxify option value admin screens
Coleman Watts [Thu, 12 Dec 2013 22:13:29 +0000 (14:13 -0800)]
CRM-13863 - Allow sorting to happen through ajax
Dave Greenberg [Thu, 12 Dec 2013 19:44:35 +0000 (11:44 -0800)]
Merge pull request #2206 from pratik-joshi/CRM-13907
CRM-13907
Kurund Jalmi [Thu, 12 Dec 2013 18:18:27 +0000 (10:18 -0800)]
Merge pull request #1869 from monishdeb/CRM-13630
CRM-13630 fixes and Premium improvement
colemanw [Thu, 12 Dec 2013 17:28:30 +0000 (09:28 -0800)]
Merge pull request #2204 from eileenmcnaughton/CRM-13711
CRM-13711 fix - Price-set validation break in noAmount and noLabel case ...
Brian Shaughnessy [Thu, 12 Dec 2013 15:33:24 +0000 (10:33 -0500)]
CRM-13920 add "any" option to getCaseActivityQuery and use when checking case perms for user
dlobo [Thu, 12 Dec 2013 15:19:25 +0000 (07:19 -0800)]
Merge pull request #2196 from lcdservices/CRM-13954
CRM-13954 processGreetings contact object query condition
Kurund Jalmi [Thu, 12 Dec 2013 15:17:52 +0000 (07:17 -0800)]
Merge pull request #2205 from pratik-joshi/CRM-13926
CRM-13926 : fix
Kurund Jalmi [Thu, 12 Dec 2013 15:11:45 +0000 (07:11 -0800)]
Merge pull request #2191 from monishdeb/CRM-13710
CRM-13710 fix - Required prices sets still required even when not active
Pratik Joshi [Thu, 12 Dec 2013 10:13:05 +0000 (15:43 +0530)]
CRM-13907
Jaap Jansma [Thu, 12 Dec 2013 08:55:48 +0000 (09:55 +0100)]
Fixed indentation
Pratik Joshi [Thu, 12 Dec 2013 06:06:29 +0000 (11:36 +0530)]
CRM-13926 : FIX
monishdeb [Fri, 8 Nov 2013 13:18:50 +0000 (18:48 +0530)]
CRM-13711 fix - Price-set validation break in noAmount and noLabel case for non Text type price field
http://issues.civicrm.org/jira/browse/CRM-13711
dlobo [Thu, 12 Dec 2013 03:14:47 +0000 (19:14 -0800)]
Merge pull request #2194 from eileenmcnaughton/CRM-13948
CRM-13948 Hook alter mail params needs more info (id)
dlobo [Thu, 12 Dec 2013 03:13:37 +0000 (19:13 -0800)]
Merge pull request #2198 from jmcclelland/undefined-index-import
CRM-13957 - import - undefined index when mapping fields
dlobo [Thu, 12 Dec 2013 03:12:27 +0000 (19:12 -0800)]
Merge pull request #2201 from jmcclelland/import-empty-custom-boolean
CRM-13960 - import - ensure empty fields don't throw validation errors
Jamie McClelland [Wed, 11 Dec 2013 21:46:43 +0000 (16:46 -0500)]
CRM-13960 - import - ensure empty fields don't throw validation errors
----------------------------------------
* CRM-13960: importing an empty custom data value for bolean type results in validation error
http://issues.civicrm.org/jira/browse/CRM-13960
Jamie McClelland [Wed, 11 Dec 2013 21:40:26 +0000 (16:40 -0500)]
CRM-13957 - import - avoid non-object error
----------------------------------------
* CRM-13957: 2nd page of Import script reports undefined index
http://issues.civicrm.org/jira/browse/CRM-13957
colemanw [Wed, 11 Dec 2013 21:32:08 +0000 (13:32 -0800)]
Merge pull request #2200 from colemanw/CRM-13497
CRM-13497 - Update CodeGen to handle xml mods
Coleman Watts [Wed, 11 Dec 2013 21:30:37 +0000 (13:30 -0800)]
CRM-13497 - Additional xml updates
Coleman Watts [Wed, 11 Dec 2013 21:25:44 +0000 (13:25 -0800)]
CRM-13497 - Update CodeGen to handle xml mods
colemanw [Wed, 11 Dec 2013 21:27:17 +0000 (13:27 -0800)]
Merge pull request #1765 from lynndanzig/master
CRM-13497 - Add html type to schema xml
Jamie McClelland [Wed, 11 Dec 2013 18:32:44 +0000 (13:32 -0500)]
CRM-13957 - import - undefined index when mapping fields
----------------------------------------
* CRM-13957: 2nd page of Import script reports undefined index
http://issues.civicrm.org/jira/browse/CRM-13957
colemanw [Wed, 11 Dec 2013 18:29:15 +0000 (10:29 -0800)]
Merge pull request #2195 from clandmeter/master
CRM-13859 - set database connection to UTF-8
Kurund Jalmi [Wed, 11 Dec 2013 17:20:00 +0000 (09:20 -0800)]
Merge pull request #2192 from monishdeb/CRM-13756
CRM-13756 fix - Create Profile - do not check 'Standalone Form or Directory' by default
Brian Shaughnessy [Wed, 11 Dec 2013 15:42:04 +0000 (10:42 -0500)]
CRM-13954 processGreetings contact object query condition
Carlo Landmeter [Wed, 11 Dec 2013 11:09:27 +0000 (11:09 +0000)]
CRM-13859 - set database connection to UTF-8
Eileen [Wed, 11 Dec 2013 08:32:12 +0000 (08:32 +0000)]
CRM-13948
Hook alter mail params needs more info (id)
monishdeb [Wed, 11 Dec 2013 07:06:14 +0000 (12:36 +0530)]
CRM-13734 fix - Some basic case activities are not reserved
http://issues.civicrm.org/jira/browse/CRM-13734
monishdeb [Wed, 11 Dec 2013 06:32:22 +0000 (12:02 +0530)]
CRM-13756 fix - Create Profile - do not check 'Standalone Form or Directory' by default
http://issues.civicrm.org/jira/browse/CRM-13756
monishdeb [Wed, 11 Dec 2013 06:00:56 +0000 (11:30 +0530)]
CRM-13710 fix - Required prices sets still required even when not active
http://issues.civicrm.org/jira/browse/CRM-13710
Dave Greenberg [Wed, 11 Dec 2013 01:05:19 +0000 (17:05 -0800)]
Merge pull request #2190 from totten/master-add-these
CRM_Report_Form - Use consistent capitalization (title-case)
projects / civicrm-core.git / log