Coleman Watts [Tue, 3 Feb 2015 13:50:35 +0000 (08:50 -0500)]
Merge branch 4.5 into master
Conflicts:
CRM/Core/BAO/CustomValueTable.php
colemanw [Tue, 3 Feb 2015 13:44:06 +0000 (08:44 -0500)]
Merge pull request #5071 from colemanw/CRM-15906
CRM-15906 - Fix js error on pledge payment form
Dave Greenberg [Tue, 3 Feb 2015 03:16:26 +0000 (19:16 -0800)]
Merge pull request #5068 from colemanw/CRM-13624
CRM-13624 - Fix api regression - format link in display layer instead of data layer
Eileen McNaughton [Tue, 3 Feb 2015 02:26:56 +0000 (15:26 +1300)]
Merge pull request #5060 from eileenmcnaughton/api-comment-fixes
Api comment fixes
Eileen McNaughton [Tue, 3 Feb 2015 00:59:39 +0000 (13:59 +1300)]
more comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 23:11:51 +0000 (12:11 +1300)]
More comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 19:24:21 +0000 (08:24 +1300)]
Further comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 10:24:59 +0000 (23:24 +1300)]
fix for previously introduced format issue + more comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 09:23:39 +0000 (22:23 +1300)]
remove internal param refs
Eileen McNaughton [Mon, 2 Feb 2015 09:21:33 +0000 (22:21 +1300)]
more comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 09:11:36 +0000 (22:11 +1300)]
a few more comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 09:04:32 +0000 (22:04 +1300)]
various comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 08:40:51 +0000 (21:40 +1300)]
more comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 08:11:17 +0000 (21:11 +1300)]
more api comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 07:46:44 +0000 (20:46 +1300)]
more comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 07:23:29 +0000 (20:23 +1300)]
comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 07:05:45 +0000 (20:05 +1300)]
api comment improvements
Eileen McNaughton [Mon, 2 Feb 2015 06:40:51 +0000 (19:40 +1300)]
comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 06:23:46 +0000 (19:23 +1300)]
more comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 05:22:07 +0000 (18:22 +1300)]
some more comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 04:35:04 +0000 (17:35 +1300)]
some more comment fixes
Tim Otten [Tue, 3 Feb 2015 00:27:19 +0000 (16:27 -0800)]
Merge pull request #5059 from totten/master-validation
CRM-15856 - Validation for schedule (date/time widgets)
Coleman Watts [Mon, 2 Feb 2015 22:55:16 +0000 (17:55 -0500)]
CRM-15906 - Related tpl cleanup
Coleman Watts [Mon, 2 Feb 2015 22:52:13 +0000 (17:52 -0500)]
CRM-15906 - Related js cleanup
Coleman Watts [Mon, 2 Feb 2015 22:49:19 +0000 (17:49 -0500)]
CRM-15906 - Remove call to non-existant function
colemanw [Mon, 2 Feb 2015 22:20:55 +0000 (17:20 -0500)]
Merge pull request #5052 from colemanw/CRM-15903
CRM-15903 - Cleanup class inheritance of CRM_Utils_System_* functions
Coleman Watts [Mon, 2 Feb 2015 20:39:15 +0000 (15:39 -0500)]
CRM-15903 - Modify CRM_Utils_System_UnitTests to not extend Drupal
----------------------------------------
* CRM-15903: Restructure UF classes so that CRM_Utils_System_UnitTests does not extend Drupal
https://issues.civicrm.org/jira/browse/CRM-15903
Coleman Watts [Mon, 2 Feb 2015 20:35:35 +0000 (15:35 -0500)]
CRM-13624 - Fix api regression - format link in display layer instead of data layer
Eileen McNaughton [Mon, 2 Feb 2015 19:21:54 +0000 (08:21 +1300)]
Merge pull request #5058 from eileenmcnaughton/test-examples
remove examples that are not generated by existing tests
Coleman Watts [Mon, 2 Feb 2015 18:03:37 +0000 (13:03 -0500)]
Fix for older versions of php-l
colemanw [Mon, 2 Feb 2015 17:48:21 +0000 (12:48 -0500)]
Merge pull request #5062 from eileenmcnaughton/CRM-15707
CRM-15707 fix test generated documentation iinstance
colemanw [Mon, 2 Feb 2015 17:46:58 +0000 (12:46 -0500)]
Merge pull request #5057 from cividesk/CRM-15901-4.5
CRM-15901: Turn off PHP errors display for all ajax calls
kurund [Mon, 2 Feb 2015 13:10:24 +0000 (18:40 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-02-18-36-16
Conflicts:
CRM/Dedupe/Merger.php
eileenmcnaughton [Mon, 2 Feb 2015 11:12:18 +0000 (11:12 +0000)]
fix spelling error
eileenmcnaughton [Mon, 2 Feb 2015 10:09:30 +0000 (10:09 +0000)]
CRM-15707 fix test generated documentation iinstance
Eileen McNaughton [Mon, 2 Feb 2015 07:26:08 +0000 (20:26 +1300)]
Merge pull request #5054 from eileenmcnaughton/comments
a few comment fixes
Yashodha Chaku [Mon, 2 Feb 2015 06:41:45 +0000 (12:11 +0530)]
Merge pull request #5038 from civicrm/CRM-15877
CRM-15877: fix for truncated prefix/suffix in export csv
Tim Otten [Mon, 2 Feb 2015 05:24:47 +0000 (21:24 -0800)]
CRM-15856 - crmMailing - Submit button
Distinguish between blockage based on invalid data from blockage based on
pending AJAX.
Tim Otten [Mon, 2 Feb 2015 04:59:09 +0000 (20:59 -0800)]
CRM-15856 - Convert date/time widgets to use ngModel (which supports validation).
Tim Otten [Mon, 2 Feb 2015 04:42:44 +0000 (20:42 -0800)]
crmExample - Hidden Angular module for testing custom widgets in various configs.
eileenmcnaughton [Mon, 2 Feb 2015 05:08:01 +0000 (05:08 +0000)]
remove examples that are not generated by existing tests
Tim Otten [Mon, 2 Feb 2015 04:46:45 +0000 (20:46 -0800)]
Merge pull request #5048 from totten/master-mailing-misc
CRM-15578, CRM-15705 - crmMailing fixes/cleanup
Eileen McNaughton [Mon, 2 Feb 2015 04:13:56 +0000 (17:13 +1300)]
Merge pull request #5056 from eileenmcnaughton/master
Master
Eileen McNaughton [Mon, 2 Feb 2015 04:13:43 +0000 (17:13 +1300)]
fix comments, capitalization
Nicolas Ganivet [Sun, 1 Feb 2015 18:24:17 +0000 (11:24 -0700)]
CRM-15901: Turn off PHP errors display for all ajax calls
Eileen McNaughton [Mon, 2 Feb 2015 03:54:00 +0000 (16:54 +1300)]
comment fixes
Coleman Watts [Sun, 1 Feb 2015 22:24:01 +0000 (17:24 -0500)]
CRM-15903 - Cleanup class inheritance of CRM_Utils_System_* functions
----------------------------------------
* CRM-15903: Restructure UF classes so that CRM_Utils_System_UnitTests does not extend Drupal
https://issues.civicrm.org/jira/browse/CRM-15903
Eileen McNaughton [Mon, 2 Feb 2015 03:38:15 +0000 (16:38 +1300)]
A few comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 03:31:27 +0000 (16:31 +1300)]
a few comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 03:14:26 +0000 (16:14 +1300)]
comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 03:11:44 +0000 (16:11 +1300)]
comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 02:57:11 +0000 (15:57 +1300)]
comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 02:49:18 +0000 (15:49 +1300)]
some comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 02:15:48 +0000 (15:15 +1300)]
a few comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 02:45:01 +0000 (15:45 +1300)]
whitespace only
Eileen McNaughton [Mon, 2 Feb 2015 02:21:46 +0000 (15:21 +1300)]
CRM-15659 fix reference 'every one month(s).' to 'every month.'
Eileen McNaughton [Mon, 2 Feb 2015 00:43:33 +0000 (13:43 +1300)]
Merge pull request #5053 from eileenmcnaughton/comments
a few comment fixes
Eileen McNaughton [Sun, 1 Feb 2015 23:32:51 +0000 (12:32 +1300)]
further comment fixes
Eileen McNaughton [Sun, 1 Feb 2015 23:20:25 +0000 (12:20 +1300)]
a few comment fixes
Eileen McNaughton [Sun, 1 Feb 2015 23:02:09 +0000 (12:02 +1300)]
Merge pull request #5051 from eileenmcnaughton/comments
Comment fixes
Eileen McNaughton [Sun, 1 Feb 2015 21:52:40 +0000 (10:52 +1300)]
comment fix
Eileen McNaughton [Sun, 1 Feb 2015 21:39:41 +0000 (10:39 +1300)]
a few comment fixes
Eileen McNaughton [Sun, 1 Feb 2015 21:31:54 +0000 (10:31 +1300)]
fix a few comments
Eileen McNaughton [Sun, 1 Feb 2015 21:27:57 +0000 (10:27 +1300)]
add a few comment blocks
Eileen McNaughton [Sun, 1 Feb 2015 21:17:38 +0000 (10:17 +1300)]
Comment fixes
colemanw [Sat, 31 Jan 2015 13:27:47 +0000 (08:27 -0500)]
Merge pull request #5041 from colemanw/CRM-15890
CRM-15890 - Switch jQuery to use bower version
colemanw [Sat, 31 Jan 2015 13:21:35 +0000 (08:21 -0500)]
Merge pull request #5047 from colemanw/CRM-15898
CRM-15898 - Use simpler version of title as global
Tim Otten [Fri, 30 Jan 2015 08:10:46 +0000 (00:10 -0800)]
CRM-15578 - crmMailing - Fix checkboxes
Tim Otten [Fri, 30 Jan 2015 06:37:33 +0000 (22:37 -0800)]
CRM-15705 - edit,edit-wizard - Move mailing-name next to subject/recipients/etc
Tim Otten [Fri, 30 Jan 2015 03:25:34 +0000 (19:25 -0800)]
crmMailing - Comments/cleanup
Tim Otten [Fri, 30 Jan 2015 03:00:09 +0000 (19:00 -0800)]
CRM-15705 - "Template" field - Remove colored background.
Tim Otten [Sat, 31 Jan 2015 03:08:17 +0000 (19:08 -0800)]
CRM-15890 - bin/setup.sh - Workaround for bower bug
Coleman Watts [Sat, 31 Jan 2015 03:06:45 +0000 (22:06 -0500)]
CRM-15898 - Use simpler version of title as global
----------------------------------------
* CRM-15898: Set <title> in wordpress header
https://issues.civicrm.org/jira/browse/CRM-15898
colemanw [Fri, 30 Jan 2015 22:49:55 +0000 (17:49 -0500)]
Merge pull request #5043 from colemanw/CRM-15868
CRM-15868 - Cleanup contact delete/trash hooks
Coleman Watts [Fri, 30 Jan 2015 21:42:41 +0000 (16:42 -0500)]
CRM-15890 - Make bower dependency version numbers more flexible
colemanw [Fri, 30 Jan 2015 21:35:55 +0000 (16:35 -0500)]
Merge pull request #5044 from colemanw/Comment
Comment cleanup - remove @access tag
Coleman Watts [Fri, 30 Jan 2015 21:34:18 +0000 (16:34 -0500)]
INFRA-132 - Comment cleanup - remove @access tag
Coleman Watts [Fri, 30 Jan 2015 21:26:05 +0000 (16:26 -0500)]
CRM-15868 - Cleanup contact delete/trash hooks
Coleman Watts [Fri, 30 Jan 2015 16:59:29 +0000 (11:59 -0500)]
CRM-15890 - Add lo-dash to bower_components
Dave Greenberg [Fri, 30 Jan 2015 16:52:46 +0000 (08:52 -0800)]
Merge pull request #5040 from atif-shaikh/CRM-15835
CRM-15835 - Event registrations total amounts with decimals stored incor...
Coleman Watts [Fri, 30 Jan 2015 16:47:44 +0000 (11:47 -0500)]
CRM-15890 - accomodate js outside of packages
Coleman Watts [Fri, 30 Jan 2015 16:19:05 +0000 (11:19 -0500)]
Delete unused tpl file
Coleman Watts [Fri, 30 Jan 2015 16:18:39 +0000 (11:18 -0500)]
CRM-15890 - Switch jQuery to use bower version
atif-shaikh [Fri, 30 Jan 2015 13:55:02 +0000 (19:25 +0530)]
CRM-15835 - Event registrations total amounts with decimals stored incorrectly when CiviCRM thousands separator is a dot
https://issues.civicrm.org/jira/browse/CRM-15835
yashodha [Fri, 30 Jan 2015 11:24:05 +0000 (16:54 +0530)]
space fix
yashodha [Fri, 30 Jan 2015 11:21:02 +0000 (16:51 +0530)]
CRM-15877: fix for truncated prefix/suffix in export csv
----------------------------------------
* CRM-15877: prefix_id truncated on contacts export
https://issues.civicrm.org/jira/browse/CRM-15877
Tim Otten [Fri, 30 Jan 2015 06:34:13 +0000 (22:34 -0800)]
Merge pull request #5036 from totten/master-ang-php53
CRM-15832 - Civi\Angular\Page\Main - Fix PHP 5.3
Dave Greenberg [Fri, 30 Jan 2015 01:19:43 +0000 (17:19 -0800)]
Merge pull request #5037 from davecivicrm/CRM-15721
CRM-15721 - Add Payment Processor Name to View Contribution page.
Dave Greenberg [Thu, 29 Jan 2015 23:50:43 +0000 (15:50 -0800)]
Merge pull request #5030 from davecivicrm/CRM-15883
CRM-15883 - Suppressing Stationery path field from PDF Letter action sin...
Dave Greenberg [Thu, 29 Jan 2015 23:48:20 +0000 (15:48 -0800)]
CRM-15721 - Add Payment Processor Name to View Contribution page.
----------------------------------------
* CRM-15721: Associate contributions with the payment processor used to make it
https://issues.civicrm.org/jira/browse/CRM-15721
Tim Otten [Thu, 29 Jan 2015 23:25:40 +0000 (15:25 -0800)]
CRM-15832 - Civi\Angular\Page\Main - Fix PHP 5.3
Dave Greenberg [Thu, 29 Jan 2015 22:31:15 +0000 (14:31 -0800)]
CRM-15883 - Suppressing Stationery path field from PDF Letter action since it is not currently supported. New commit to fix formatting compaints related to commenting out a section of code.
----------------------------------------
* CRM-15883: Need to remove inoperative "stationery" box from page format when using Print PDF letter?
https://issues.civicrm.org/jira/browse/CRM-15883
Eileen McNaughton [Thu, 29 Jan 2015 19:32:05 +0000 (08:32 +1300)]
Merge pull request #5031 from eileenmcnaughton/infra-fix
infra updated incorrectly set public functions to private on payment cla...
Dave Greenberg [Thu, 29 Jan 2015 17:52:35 +0000 (09:52 -0800)]
Merge pull request #5029 from davecivicrm/CRM-15884
CRM-15884 fix typo in variable name related to earlier code cleanup.
colemanw [Thu, 29 Jan 2015 14:01:57 +0000 (09:01 -0500)]
Merge pull request #5027 from colemanw/CRM-15705
CRM-15705 - Mailing UI improvements
Yashodha Chaku [Thu, 29 Jan 2015 12:03:29 +0000 (17:33 +0530)]
Merge pull request #5028 from jmcclelland/merge-address-overwrite
Merge address overwrite
Yashodha Chaku [Thu, 29 Jan 2015 04:19:07 +0000 (09:49 +0530)]
Merge pull request #5025 from JohnFF/patch-7
Fixed incorrect CSS tag
Yashodha Chaku [Thu, 29 Jan 2015 04:18:41 +0000 (09:48 +0530)]
Merge pull request #5026 from JohnFF/patch-8
Fixed incorrect CSS tag
Yashodha Chaku [Thu, 29 Jan 2015 04:18:13 +0000 (09:48 +0530)]
Merge pull request #5024 from JohnFF/patch-6
Fixed incorrect CSS tag
Yashodha Chaku [Thu, 29 Jan 2015 04:17:11 +0000 (09:47 +0530)]
Merge pull request #5023 from JohnFF/patch-5
Fixed incorrect CSS tag
projects / civicrm-core.git / log