Coleman Watts [Wed, 4 Feb 2015 21:15:43 +0000 (16:15 -0500)]
Remove boilerplate from the top of api example files
The @file comment added no information and was detrimental to readability
of examples in the api explorer.
Coleman Watts [Wed, 4 Feb 2015 21:08:30 +0000 (16:08 -0500)]
Remove old ApiDoc page
Coleman Watts [Wed, 4 Feb 2015 20:14:55 +0000 (15:14 -0500)]
Add Examples to api explorer
colemanw [Wed, 4 Feb 2015 20:09:06 +0000 (15:09 -0500)]
Merge pull request #5079 from colemanw/getfields
getfields api - ensure 'name' property is set for every field
Dave Greenberg [Wed, 4 Feb 2015 20:05:00 +0000 (12:05 -0800)]
Merge pull request #5081 from NileemaJadhav/CRM-15821-work
CRM-15821 - Provide option to notify Personal Campaign Page "Owner" when...
Dave Greenberg [Wed, 4 Feb 2015 19:56:17 +0000 (11:56 -0800)]
Merge pull request #5086 from deepak-srivastava/CRM-15490
CRM-15490 repetition_start_date_display not being set due to change in dat...
Monish Deb [Wed, 4 Feb 2015 14:17:49 +0000 (19:47 +0530)]
Merge pull request #5035 from TeNNoX/master
Fixed weird while-each-loop.
CiviCRM [Wed, 4 Feb 2015 13:24:49 +0000 (05:24 -0800)]
Update version to 4.6.alpha6
deepak-srivastava [Wed, 4 Feb 2015 12:03:25 +0000 (12:03 +0000)]
fix for repetition_start_date_display not being set due to change in date widget input id pattern > parent and child activity with same dates
NileemaJadhav [Wed, 4 Feb 2015 07:09:58 +0000 (12:39 +0530)]
CRM-15821 - Provide option to notify Personal Campaign Page "Owner" when someone donates via their page
https://issues.civicrm.org/jira/browse/CRM-15821
Eileen McNaughton [Wed, 4 Feb 2015 06:38:27 +0000 (19:38 +1300)]
Merge pull request #5080 from eileenmcnaughton/comment-full-stops
Comment full stops
Eileen McNaughton [Wed, 4 Feb 2015 05:02:22 +0000 (18:02 +1300)]
INFRA-132 comments to end with full stops
Coleman Watts [Wed, 4 Feb 2015 02:42:47 +0000 (21:42 -0500)]
getfields api - ensure 'name' property is set for every field
colemanw [Wed, 4 Feb 2015 02:23:19 +0000 (21:23 -0500)]
Merge pull request #5076 from colemanw/Attachment
Attachment api - add custom field handling
Eileen McNaughton [Wed, 4 Feb 2015 02:08:09 +0000 (15:08 +1300)]
Merge pull request #5078 from eileenmcnaughton/comment-full-stops
INFRA-132 drupal standard has a full stop after short-description
Eileen McNaughton [Wed, 4 Feb 2015 01:08:48 +0000 (14:08 +1300)]
INFRA-132 add full stops
Eileen McNaughton [Wed, 4 Feb 2015 01:02:15 +0000 (14:02 +1300)]
INFRA-132 add full stops
Eileen McNaughton [Wed, 4 Feb 2015 00:58:49 +0000 (13:58 +1300)]
additional formatting fixes picked up by CI
Dave Greenberg [Wed, 4 Feb 2015 00:40:04 +0000 (16:40 -0800)]
Merge pull request #5050 from agh1/orderby-fields-mismatch
CRM-15899 - Reports: "order by" can contain mismatched table aliases
Eileen McNaughton [Wed, 4 Feb 2015 00:39:30 +0000 (13:39 +1300)]
INFRA-132 add full stops
Eileen McNaughton [Wed, 4 Feb 2015 00:08:49 +0000 (13:08 +1300)]
INFRA-132 add full-stops after comments
Eileen McNaughton [Wed, 4 Feb 2015 00:02:05 +0000 (13:02 +1300)]
INFRA-132 add full stop after comments
Eileen McNaughton [Tue, 3 Feb 2015 23:22:38 +0000 (12:22 +1300)]
Merge pull request #5077 from eileenmcnaughton/comment-full-stops
INFRA-132 Function comment short description must end with a full stop
Eileen McNaughton [Tue, 3 Feb 2015 22:22:47 +0000 (11:22 +1300)]
INFRA-132 Function comment short description must end with a full stop
regex (\*\*\n \* [A-Za-z ]*)\n replace with .\n
Eileen McNaughton [Tue, 3 Feb 2015 22:17:48 +0000 (11:17 +1300)]
minor tidy-ups
Coleman Watts [Tue, 3 Feb 2015 21:27:36 +0000 (16:27 -0500)]
Attachment api - add custom field handling
TeNNoX [Tue, 3 Feb 2015 21:09:47 +0000 (22:09 +0100)]
you gotta do it right :P
Eileen McNaughton [Tue, 3 Feb 2015 20:49:33 +0000 (09:49 +1300)]
Merge pull request #5073 from monishdeb/CRM-15905
CRM-15905 fix - API: problem sorting contacts on ID
Dave Greenberg [Tue, 3 Feb 2015 19:35:46 +0000 (11:35 -0800)]
Merge pull request #5066 from deepak-srivastava/CRM-15490
CRM-15490 Support recurring for separate activities
Tim Otten [Tue, 3 Feb 2015 19:00:32 +0000 (11:00 -0800)]
Merge pull request #5075 from totten/master-lodash-karma
CRM-15890 - Fix reference to lodash
Dave Greenberg [Tue, 3 Feb 2015 18:36:21 +0000 (10:36 -0800)]
Merge pull request #5072 from xurizaemon/CRM-15910
CRM-15910. Increase field length of external_identifier to 64 bytes.
Tim Otten [Tue, 3 Feb 2015 16:58:39 +0000 (08:58 -0800)]
CRM-15890 - Fix reference to lodash
Coleman Watts [Tue, 3 Feb 2015 16:38:03 +0000 (11:38 -0500)]
Improve option-group help text to be more concise
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
monishdeb [Tue, 3 Feb 2015 10:15:29 +0000 (15:45 +0530)]
CRM-15905 fix - API: problem sorting contacts on ID
https://issues.civicrm.org/jira/browse/CRM-15905
Chris Burgess [Tue, 3 Feb 2015 07:18:36 +0000 (20:18 +1300)]
CRM-15910. Increase field length of external_identifier to 64 bytes.
Eileen McNaughton [Tue, 3 Feb 2015 06:40:20 +0000 (19:40 +1300)]
a few phpcs fixups
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
deepak-srivastava [Mon, 2 Feb 2015 17:13:08 +0000 (17:13 +0000)]
support for multiple recurring activities
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
projects / civicrm-core.git / log