Eileen McNaughton [Tue, 6 Jan 2015 20:37:18 +0000 (09:37 +1300)]
Merge pull request #4859 from eileenmcnaughton/CRM-15771-fix
CRM-15771 fix inconsistencies with test vs live instances by making key ...
Kurund Jalmi [Tue, 6 Jan 2015 19:06:02 +0000 (00:36 +0530)]
Merge pull request #4858 from eileenmcnaughton/CRM-15786-master
CRM-15781 further tidy-ups
Kurund Jalmi [Tue, 6 Jan 2015 18:58:01 +0000 (00:28 +0530)]
Merge pull request #4857 from atif-shaikh/CRM-15203
Crm 15203
Eileen McNaughton [Tue, 6 Jan 2015 14:18:29 +0000 (03:18 +1300)]
whitespace
Eileen McNaughton [Tue, 6 Jan 2015 14:10:56 +0000 (03:10 +1300)]
CRM-15771 fix inconsistencies with test vs live instances by making key more complex
Eileen McNaughton [Tue, 6 Jan 2015 14:14:52 +0000 (03:14 +1300)]
CRM-15786-master api now basic, BAO::create looks like a create
Eileen McNaughton [Tue, 6 Jan 2015 13:05:17 +0000 (02:05 +1300)]
CRM-15781 further tidy-ups
Eileen McNaughton [Tue, 6 Jan 2015 12:54:21 +0000 (01:54 +1300)]
Merge pull request #4856 from eileenmcnaughton/CRM-15786-master
Crm 15786 test for existing functionality
atif-shaikh [Tue, 6 Jan 2015 12:36:36 +0000 (18:06 +0530)]
CRM-15203 - Typo Fix
----------------------------------------
* CRM-15203: Recurring contributions don't create MembershipPayment records
https://issues.civicrm.org/jira/browse/CRM-15203
atif-shaikh [Tue, 6 Jan 2015 12:34:27 +0000 (18:04 +0530)]
CRM-15203 - Recurring contributions don't create MembershipPayment records
https://issues.civicrm.org/jira/browse/CRM-15203
Eileen McNaughton [Tue, 6 Jan 2015 10:27:10 +0000 (23:27 +1300)]
fix run-on formatting
Eileen McNaughton [Tue, 6 Jan 2015 09:58:05 +0000 (22:58 +1300)]
CRM-15786 refactor relationship create function to createMultiple & 'stput std create in it's place
Conflicts:
CRM/Contact/BAO/Relationship.php
tests/phpunit/api/v3/AddressTest.php
Eileen McNaughton [Tue, 6 Jan 2015 10:11:49 +0000 (23:11 +1300)]
Merge pull request #4855 from atif-shaikh/CRM-15780
Crm 15780
Eileen McNaughton [Tue, 6 Jan 2015 10:08:35 +0000 (23:08 +1300)]
formatting fix
Eileen McNaughton [Tue, 6 Jan 2015 07:29:46 +0000 (20:29 +1300)]
CRM-15786 add extra tests for address relationship management
Conflicts:
tests/phpunit/api/v3/AddressTest.php
atif-shaikh [Tue, 6 Jan 2015 07:43:11 +0000 (13:13 +0530)]
added comment
atif-shaikh [Tue, 6 Jan 2015 07:38:39 +0000 (13:08 +0530)]
CRM-15780 - Remove duplicate function
https://issues.civicrm.org/jira/browse/CRM-15780
Eileen McNaughton [Tue, 6 Jan 2015 04:43:06 +0000 (17:43 +1300)]
Merge pull request #4838 from eileenmcnaughton/CRM-15780
remove duplicate mergeSameAddress
Eileen McNaughton [Tue, 6 Jan 2015 03:17:01 +0000 (16:17 +1300)]
remove duplicate mergeSameAddress
colemanw [Tue, 6 Jan 2015 02:48:26 +0000 (21:48 -0500)]
Merge pull request #4606 from johanv/CRM-15636-price_set_event_and_contribution
CRM-15636: API Unit test: price set for events and contributions.
Tim Otten [Tue, 6 Jan 2015 02:38:38 +0000 (18:38 -0800)]
Merge pull request #4696 from colemanw/CRM-15669
CRM-15669 - Call post hook after merging contacts
colemanw [Tue, 6 Jan 2015 02:38:28 +0000 (21:38 -0500)]
Merge pull request #4607 from samuelsov/CRM-15637
CRM-15637 - remove CMSUser block if checksum is defined
colemanw [Tue, 6 Jan 2015 02:34:36 +0000 (21:34 -0500)]
Merge pull request #4814 from atif-shaikh/CRM-14199Improvement
CRM-14199 Improvements
colemanw [Tue, 6 Jan 2015 02:31:42 +0000 (21:31 -0500)]
Merge pull request #4831 from williamtheaker/master
CRM-15784 Made message template form layout mirror email composition layout
Tim Otten [Tue, 6 Jan 2015 02:27:50 +0000 (18:27 -0800)]
Merge pull request #4847 from totten/master-jshint
INFRA-132 - js/* - Misc cleanup
colemanw [Tue, 6 Jan 2015 02:15:56 +0000 (21:15 -0500)]
Merge pull request #4850 from colemanw/CRM-15409
CRM-15409 - Form button cleanup
Coleman Watts [Tue, 6 Jan 2015 02:05:31 +0000 (21:05 -0500)]
CRM-15409 - Form button cleanup
Eileen McNaughton [Tue, 6 Jan 2015 01:35:51 +0000 (14:35 +1300)]
Merge pull request #4819 from eileenmcnaughton/CRM-15680
CRM-15680 campaign custom data
Tim Otten [Tue, 6 Jan 2015 00:41:33 +0000 (16:41 -0800)]
CRM-15578 - civicrm/ajax/attachment - Fix for attachments when debugging is disabled.
The isAJAX() XSS check doesn't work correctly with the Angular file-upload
client. This wasn't previously observed because most development was done in
debug mode.
Remove the isAJAX() XSS check. Instead, protect against XSS with a secure
token.
eileenmcnaughton [Tue, 6 Jan 2015 00:13:25 +0000 (00:13 +0000)]
disable case custom data test, I fixed the custom datat
but couldn't find my way through the post-process hooks to prevent it failing
on an e-notice.
Tim Otten [Tue, 6 Jan 2015 00:03:24 +0000 (16:03 -0800)]
js/angular-crmCaseType.js - Fix regression in promise
This line was written when crmApi() return jQuery-style promises. It returns
Angular-style promises.
Tim Otten [Mon, 5 Jan 2015 23:50:21 +0000 (15:50 -0800)]
Merge pull request #4829 from totten/master-composer
composer - Move composer.json into civicrm-core.git
eileenmcnaughton [Mon, 5 Jan 2015 23:27:12 +0000 (23:27 +0000)]
CRM-15680 fix custom data on survey & campaign
Tim Otten [Mon, 5 Jan 2015 21:53:42 +0000 (13:53 -0800)]
INFRA-132 - js/angular-crm-util.js - Ignore warning about eval
The eval call uses data generated by an implicitly trusted service -- the
local JSON encoder.
Tim Otten [Mon, 5 Jan 2015 21:53:32 +0000 (13:53 -0800)]
INFRA-132 - js/angular-crmMailing.js - Cleanup empty checks to satisfy jshint
Tim Otten [Mon, 5 Jan 2015 21:53:32 +0000 (13:53 -0800)]
INFRA-132 - js/angular-crmCaseType.js - Cleanup empty checks to satisfy jshint
Tim Otten [Mon, 5 Jan 2015 21:53:32 +0000 (13:53 -0800)]
INFRA-132 - js/angular-crm-ui.js - Cleanup empty checks to satisfy jshint
Tim Otten [Mon, 5 Jan 2015 21:45:11 +0000 (13:45 -0800)]
INFRA-132 - js/view/crm.profile-selector.js - Cleanup empty checks to satisfy jshint
Tim Otten [Mon, 5 Jan 2015 21:45:11 +0000 (13:45 -0800)]
INFRA-132 - js/view/crm.designer.js - Cleanup empty checks to satisfy jshint
Tim Otten [Mon, 5 Jan 2015 21:45:11 +0000 (13:45 -0800)]
INFRA-132 - js/model/crm.uf.js - Cleanup empty checks to satisfy jshint
Tim Otten [Mon, 5 Jan 2015 21:45:11 +0000 (13:45 -0800)]
INFRA-132 - js/crm.backbone.js - Cleanup empty checks to satisfy jshint
Tim Otten [Sat, 3 Jan 2015 22:59:12 +0000 (14:59 -0800)]
INFRA-132 - Fix jshint warnings in js/*.js
Eileen McNaughton [Mon, 5 Jan 2015 21:46:22 +0000 (10:46 +1300)]
Merge pull request #4842 from eileenmcnaughton/CRM-15746-master
CRM-15749 allow changing of membership entity in hook
Tim Otten [Sat, 3 Jan 2015 22:58:48 +0000 (14:58 -0800)]
INFRA-132 - Fix jshint warnings in js/jquery/*.js
Tim Otten [Sat, 3 Jan 2015 22:58:25 +0000 (14:58 -0800)]
INFRA-132 - Fix jshint warnings in Backbone-based code
Tim Otten [Sat, 3 Jan 2015 22:57:44 +0000 (14:57 -0800)]
INFRA-132 - Fix jshint warnings in js/angular*.js
colemanw [Mon, 5 Jan 2015 20:18:20 +0000 (15:18 -0500)]
Merge pull request #4845 from colemanw/CRM-15409
CRM-15409 - Fix handling of traditional links in popups
Eileen McNaughton [Mon, 5 Jan 2015 05:45:01 +0000 (18:45 +1300)]
CRM-15746 add test
Eileen McNaughton [Mon, 5 Jan 2015 05:19:17 +0000 (18:19 +1300)]
whitespace fixes
Eileen McNaughton [Mon, 5 Jan 2015 03:28:17 +0000 (16:28 +1300)]
comment fixes
Eileen McNaughton [Mon, 22 Dec 2014 03:00:46 +0000 (16:00 +1300)]
CRM-15749 minimal patch allowing alteration of
Eileen McNaughton [Mon, 5 Jan 2015 02:34:20 +0000 (15:34 +1300)]
move declaraion of hook class into parent class for re-use
acl fix
Coleman Watts [Mon, 5 Jan 2015 18:40:25 +0000 (13:40 -0500)]
CRM-15409 - Fix handling of traditional links in popups
kurund [Mon, 5 Jan 2015 17:58:47 +0000 (23:28 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-05-23-28-33
colemanw [Mon, 5 Jan 2015 17:49:03 +0000 (12:49 -0500)]
Merge pull request #4836 from colemanw/edit
Support editable multi-value custom data
Kurund Jalmi [Mon, 5 Jan 2015 17:35:49 +0000 (23:05 +0530)]
Merge pull request #4839 from rohankatkar/Webtests-4.6
Webtests and CRM test fix
Yashodha Chaku [Mon, 5 Jan 2015 11:04:22 +0000 (16:34 +0530)]
Merge pull request #4830 from PalanteJon/CRM-15774
CRM-15774 - Core - Call BAO not DAO on contact create via profile
Yashodha Chaku [Mon, 5 Jan 2015 09:37:20 +0000 (15:07 +0530)]
Merge pull request #4837 from eileenmcnaughton/CRM-15779
CRM-15779 remove duplicate code block
Yashodha Chaku [Mon, 5 Jan 2015 08:54:55 +0000 (14:24 +0530)]
Merge pull request #4841 from civicrm/CRM-14461
CRM-14461: note fields not handled properly for components during export
Yashodha Chaku [Mon, 5 Jan 2015 08:53:51 +0000 (14:23 +0530)]
Merge pull request #4840 from eileenmcnaughton/tidy-ups
minor tidyups
Yashodha Chaku [Mon, 5 Jan 2015 07:13:52 +0000 (12:43 +0530)]
Merge pull request #4832 from williamtheaker/CRM-14749
CRM-14749 Add insert token to Address Display Format
yashodha [Mon, 5 Jan 2015 06:25:02 +0000 (11:55 +0530)]
CRM-14461: note fields not handled properly for components during export
----------------------------------------
* CRM-14461: Participant notes incomplete when exporting participants
https://issues.civicrm.org/jira/browse/CRM-14461
Eileen McNaughton [Mon, 5 Jan 2015 06:07:25 +0000 (19:07 +1300)]
minor tidyups
Rohan Katkar [Mon, 5 Jan 2015 06:04:28 +0000 (11:34 +0530)]
Webtests and CRM test fix
Eileen McNaughton [Mon, 5 Jan 2015 03:23:02 +0000 (16:23 +1300)]
CRM-15779 remove duplicate code block
Coleman Watts [Mon, 5 Jan 2015 03:05:40 +0000 (22:05 -0500)]
CRM-15759 - Improve crmEditable api validation and error handling
Coleman Watts [Mon, 5 Jan 2015 03:04:09 +0000 (22:04 -0500)]
CRM-15759 - Support editable multi-value custom data
Coleman Watts [Mon, 5 Jan 2015 03:00:17 +0000 (22:00 -0500)]
Fix button markup
Eileen McNaughton [Mon, 5 Jan 2015 02:07:21 +0000 (15:07 +1300)]
Merge pull request #4834 from eileenmcnaughton/tidy-up
remove a bunch of unused variable assignments
Eileen McNaughton [Mon, 5 Jan 2015 01:52:45 +0000 (14:52 +1300)]
a couple of comment block fixes
Eileen McNaughton [Mon, 5 Jan 2015 01:14:27 +0000 (14:14 +1300)]
remove a bunch of unused variable assignments
Tim Otten [Sat, 3 Jan 2015 23:03:01 +0000 (15:03 -0800)]
Merge pull request #3857 from totten/master-donquixote
Docblocks and misc cleanup
Tim Otten [Sat, 16 Aug 2014 00:21:19 +0000 (17:21 -0700)]
CRM_Contribute_Page_ContributionPage - Campaign IDs
Fix for case where count()==1. Simplify.
Andreas Hennings [Tue, 11 Feb 2014 22:35:28 +0000 (23:35 +0100)]
CRM_Contribute_Page_ContributionPage: Robust handling of campaign ids.
Andreas Hennings [Tue, 11 Feb 2014 19:41:22 +0000 (20:41 +0100)]
Remove unused.
Andreas Hennings [Tue, 11 Feb 2014 19:35:41 +0000 (20:35 +0100)]
Explicit checks for external symbols.
Andreas Hennings [Tue, 11 Feb 2014 19:35:23 +0000 (20:35 +0100)]
Explicit return NULL.
Andreas Hennings [Tue, 11 Feb 2014 19:35:08 +0000 (20:35 +0100)]
Indentation, whitespace and wrapping.
Andreas Hennings [Tue, 11 Feb 2014 19:30:54 +0000 (20:30 +0100)]
More @todo
Andreas Hennings [Tue, 11 Feb 2014 19:30:20 +0000 (20:30 +0100)]
Docblock improvements
Andreas Hennings [Tue, 11 Feb 2014 18:21:19 +0000 (19:21 +0100)]
Add type conversion to constants, because IDE cannot know for sure they are integer. This might be controversial.
Andreas Hennings [Tue, 11 Feb 2014 18:20:33 +0000 (19:20 +0100)]
More @todo items, possible bugs.
Andreas Hennings [Tue, 11 Feb 2014 18:19:57 +0000 (19:19 +0100)]
More docblock stuff.
Andreas Hennings [Tue, 11 Feb 2014 17:02:01 +0000 (18:02 +0100)]
Add @todo tags in CRM_Utils_Request and CRM_Utils_Type.
Andreas Hennings [Tue, 11 Feb 2014 16:58:22 +0000 (17:58 +0100)]
More docblock improvements.
Tim Otten [Sat, 3 Jan 2015 21:38:59 +0000 (13:38 -0800)]
tools/scripts/npm/postinstall.sh - Comment
Tim Otten [Sat, 3 Jan 2015 21:24:04 +0000 (13:24 -0800)]
setup.sh - Adapt to local version of composer/bower/karma
* For developers who work with many builds, it's better to have one copy of
bower/karma rather than reinstalling an extra 50mb for each build.
If a system already has a copy of these, then don't forcibly download them.
(If you really want extra copies, you can run "npm install" yourself.)
* Documentation for composer is historically a bit inconsistent about
whether to use "composer" or "composer.phar". Work with either.
Tim Otten [Sat, 3 Jan 2015 03:05:48 +0000 (19:05 -0800)]
setup.sh - Make each step optional (but enabled by default)
The question of running "composer install", "npm install", etc., as part of
setup.sh is a bit curious:
* For most Civi developers and automated tasks tasks, they run
"git pull && setup.sh" once a day to get up-to-date. This
implies that automatic downloading ("composer install") is good.
* For a developer who's explicitly testing/changing dependencies,
it may be useful to reset the DB without re-downloading (because
re-downloading would trample their changes).
This patch takes each major step in setup.sh ("download dependencies", "run
gencode", "init DB") and allows them to be run separately.
Tim Otten [Sat, 3 Jan 2015 02:03:14 +0000 (18:03 -0800)]
composer - Remove + ignore composer.lock
See discussion: https://github.com/totten/civicrm-core/commit/
6ad46a832
Tim Otten [Fri, 2 Jan 2015 20:41:44 +0000 (12:41 -0800)]
composer, setup.sh - Automatically call "composer install"
Tim Otten [Fri, 2 Jan 2015 20:22:00 +0000 (12:22 -0800)]
composer, distmaker - Generate and include the vendor/ folder
Tim Otten [Fri, 2 Jan 2015 18:01:37 +0000 (10:01 -0800)]
composer - Use classloader from civicrm-core.git instead of civicrm-packages.git.
Tim Otten [Fri, 2 Jan 2015 17:53:21 +0000 (09:53 -0800)]
composer - Import composer.json, composer.lock
Tim Otten [Sat, 3 Jan 2015 17:53:03 +0000 (09:53 -0800)]
Merge branch 'giant-rabbit-angular-tests'
Tim Otten [Sat, 3 Jan 2015 17:46:00 +0000 (09:46 -0800)]
crmApp, crmUtil - Tighten scope of crmApp. Move services to crmUtil. Avoid cyclic dependencies.
All services, routes, controllers, and directives should live in specific
Angular modules. When it comes time to display a complete web page, these
modules are aggregated to form crmApp. crmApp is a thin piece of glue whose
sole purpose is aggregation.
Tim Otten [Sat, 3 Jan 2015 17:41:04 +0000 (09:41 -0800)]
crmUtil - Alphabetize services
Tim Otten [Sat, 3 Jan 2015 17:25:25 +0000 (09:25 -0800)]
CRM_Core_Page_Angular - Fix badly merged list of modules.
Also: Alphabetize list so that future issues with modules are easier to recognize.
Tim Otten [Sat, 3 Jan 2015 17:23:58 +0000 (09:23 -0800)]
Merge branch 'angular-tests' of https://github.com/giant-rabbit/civicrm-core into giant-rabbit-angular-tests
williamtheaker [Sat, 3 Jan 2015 06:29:50 +0000 (22:29 -0800)]
CRM-14749 Add insert token to Address Display Format
willie [Sat, 3 Jan 2015 05:34:54 +0000 (21:34 -0800)]
Made message template form layout consistent with email composition layout
projects / civicrm-core.git / log