monishdeb [Tue, 20 Oct 2015 08:25:12 +0000 (13:55 +0530)]
minor fix
monishdeb [Tue, 20 Oct 2015 08:23:49 +0000 (13:53 +0530)]
CRM-17422 fix - Change in custom field search behaviour impacting on performance
https://issues.civicrm.org/jira/browse/CRM-17422
Eileen McNaughton [Wed, 21 Oct 2015 06:46:29 +0000 (19:46 +1300)]
Merge pull request #7011 from saurabhbatra96/comment-fixes-financial
Comment fixes and function clean-up for CRM/Financial directory.
Kurund Jalmi [Wed, 21 Oct 2015 06:38:04 +0000 (12:08 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-21-12-07-36
Monish Deb [Wed, 21 Oct 2015 05:34:13 +0000 (11:04 +0530)]
Merge pull request #7016 from monishdeb/4.6-master-2015-10-21-10-54-28
4.6-master merge forward
Brian Shaughnessy [Mon, 19 Oct 2015 15:25:10 +0000 (11:25 -0400)]
CRM-17419 fix exception error condition
Francis Whittle [Thu, 15 Oct 2015 00:00:32 +0000 (11:00 +1100)]
CRM-17402: Defer loading Google Maps API
----------------------------------------
* CRM-17402: Google Maps API sometimes tries to call initMap callback before it is defined.
https://issues.civicrm.org/jira/browse/CRM-17402
Monish Deb [Wed, 21 Oct 2015 04:53:47 +0000 (10:23 +0530)]
Merge pull request #7009 from jitendrapurohit/CRM-11084
CRM-11084 -- Custom Membership Field not populating in membership form
colemanw [Wed, 21 Oct 2015 01:16:49 +0000 (21:16 -0400)]
Merge pull request #7015 from seamuslee001/CRM-17303-futher
CRM 17303 Fix validtion when users time is before 9am
colemanw [Wed, 21 Oct 2015 01:04:46 +0000 (21:04 -0400)]
Merge pull request #6963 from agileware/4.6-CRM-17402
CRM-17402: Defer loading Google Maps API
colemanw [Wed, 21 Oct 2015 01:04:07 +0000 (21:04 -0400)]
Merge pull request #6979 from eileenmcnaughton/master
CRM-17352 fix strict error on non-static method …
colemanw [Wed, 21 Oct 2015 01:03:36 +0000 (21:03 -0400)]
Merge pull request #6981 from eileenmcnaughton/CRM-17411
CRM-17411 fix strict warning by removing empty override function
colemanw [Wed, 21 Oct 2015 00:42:24 +0000 (20:42 -0400)]
Merge pull request #7012 from colemanw/css
Add searchForm css wherever alpha pager is used
colemanw [Wed, 21 Oct 2015 00:41:27 +0000 (20:41 -0400)]
Merge pull request #7014 from colemanw/CRM-11782
CRM-11782 - Get rid of VALUE_SEPARATOR character in saved search form values
Seamus Lee [Tue, 20 Oct 2015 22:56:01 +0000 (22:56 +0000)]
Fix validtion when users time is before 9am
Coleman Watts [Tue, 20 Oct 2015 20:21:48 +0000 (16:21 -0400)]
Add searchForm css wherever alpha pager is used
Coleman Watts [Tue, 20 Oct 2015 21:24:11 +0000 (17:24 -0400)]
CRM-11782 - Get rid of VALUE_SEPARATOR character in saved search form values
Saurabh Batra [Tue, 20 Oct 2015 17:58:07 +0000 (23:28 +0530)]
Comment fixes and function clean-up for CRM/Financial directory.
jitendrapurohit [Tue, 20 Oct 2015 13:21:35 +0000 (18:51 +0530)]
warning fixes
jitendrapurohit [Tue, 20 Oct 2015 13:16:07 +0000 (18:46 +0530)]
CRM-11084 -- Custom Membership Field not populating in membership form
Kurund Jalmi [Tue, 20 Oct 2015 10:26:03 +0000 (15:56 +0530)]
Merge pull request #7008 from jitendrapurohit/CRM-16990
CRM-16990 -- Custom fields are NOT being saved for some component cus…
Kurund Jalmi [Tue, 20 Oct 2015 10:20:34 +0000 (15:50 +0530)]
Merge pull request #6975 from herbdool/master-redis
add support for Redis as caching server
jitendrapurohit [Tue, 20 Oct 2015 09:17:08 +0000 (14:47 +0530)]
CRM-16990 -- Custom fields are NOT being saved for some component custom data (activities, membership ...)
Monish Deb [Tue, 20 Oct 2015 08:33:32 +0000 (14:03 +0530)]
Merge pull request #7005 from jitendrapurohit/CRM-17280
CRM-17280 - contribution detail report: error when sorting by custom …
Herb [Mon, 19 Oct 2015 20:17:14 +0000 (16:17 -0400)]
style fix: removed space
Eileen McNaughton [Mon, 19 Oct 2015 19:36:26 +0000 (08:36 +1300)]
Merge pull request #7006 from lcdservices/CRM-17419
CRM-17419 fix exception error condition
Kurund Jalmi [Mon, 19 Oct 2015 17:32:18 +0000 (23:02 +0530)]
Merge pull request #6986 from saurabhbatra96/CRM-17120-function-caching-test
CRM-17120 Unit test to ensure replacing deprecated function (to get labels) does not cause regressions.
Brian Shaughnessy [Mon, 19 Oct 2015 15:25:10 +0000 (11:25 -0400)]
CRM-17419 fix exception error condition
Monish Deb [Mon, 19 Oct 2015 14:55:39 +0000 (20:25 +0530)]
Merge pull request #6985 from jitendrapurohit/CRM-17361
CRM-17361 - Fix Address fields when used in Contact get api
colemanw [Mon, 19 Oct 2015 14:27:37 +0000 (10:27 -0400)]
Merge pull request #7001 from colemanw/CRM-16415
CRM-16415 - Fix crmSelect2 placeholder icons
colemanw [Mon, 19 Oct 2015 14:17:35 +0000 (10:17 -0400)]
Merge pull request #7004 from seamuslee001/CRM-17303-test
CRM-17303 Make new test more stable by deliberately moving the day a …
Kurund Jalmi [Mon, 19 Oct 2015 14:10:20 +0000 (19:40 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-19-19-40-00
Coleman Watts [Mon, 19 Oct 2015 02:22:16 +0000 (22:22 -0400)]
CRM-16415 - Fix crmSelect2 placeholder icons
Saurabh Batra [Mon, 19 Oct 2015 07:38:33 +0000 (13:08 +0530)]
Fixed indentation.
jitendrapurohit [Mon, 19 Oct 2015 11:17:07 +0000 (16:47 +0530)]
minor fix
jitendrapurohit [Mon, 19 Oct 2015 11:09:14 +0000 (16:39 +0530)]
warning fix
jitendrapurohit [Mon, 19 Oct 2015 11:08:22 +0000 (16:38 +0530)]
minor fix
jitendrapurohit [Mon, 19 Oct 2015 11:02:57 +0000 (16:32 +0530)]
CRM-17280 - contribution detail report: error when sorting by custom contrib field
Seamus Lee [Mon, 19 Oct 2015 08:12:15 +0000 (08:12 +0000)]
CRM-17303 Make new test more stable by deliberately moving the day a whole day forward in a verfiable way
Fix another test based on new test
Fix text and increment the year also
Add another unit test to try to work out what is going on
Fix tests now working out the issue
Fix tests now working out the issue
Deliberately cause fail test to see values
Fix test by manually setting values
Monish Deb [Mon, 19 Oct 2015 09:45:55 +0000 (15:15 +0530)]
Merge pull request #7002 from monishdeb/CRM-17396
CRM-17396 fix - Editing a membership price set breaks auto-renew func…
Yashodha Chaku [Mon, 19 Oct 2015 09:34:07 +0000 (15:04 +0530)]
Merge pull request #6982 from eileenmcnaughton/CRM-17412
CRM-17412 strict notice fix
Yashodha Chaku [Mon, 19 Oct 2015 08:45:19 +0000 (14:15 +0530)]
Merge pull request #7003 from yashodha/CRM-17414
CRM-17414: Add to and from dates to the Relationship Report filter
Eileen McNaughton [Mon, 19 Oct 2015 08:12:11 +0000 (21:12 +1300)]
Merge pull request #6995 from saurabhbatra96/CRM-16842
CRM-16842 add EntityBatch API (fixed).
yashodha [Mon, 19 Oct 2015 06:41:36 +0000 (12:11 +0530)]
CRM-17414: fix comments
----------------------------------------
* CRM-17414: Add to and from dates to the Relationship Report filter
https://issues.civicrm.org/jira/browse/CRM-17414
yashodha [Mon, 19 Oct 2015 06:38:13 +0000 (12:08 +0530)]
CRM-17414: minor fixes
----------------------------------------
* CRM-17414: Add to and from dates to the Relationship Report filter
https://issues.civicrm.org/jira/browse/CRM-17414
Yashodha Chaku [Mon, 19 Oct 2015 06:28:13 +0000 (11:58 +0530)]
Merge pull request #6983 from yashodha/CRM-17354
CRM-17354: Tell a Friend email field should be trimmed
yashodha [Mon, 19 Oct 2015 06:17:18 +0000 (11:47 +0530)]
CRM-17414: Add to and from dates to the Relationship Report filter
----------------------------------------
* CRM-17414: Add to and from dates to the Relationship Report filter
https://issues.civicrm.org/jira/browse/CRM-17414
monishdeb [Mon, 19 Oct 2015 05:48:12 +0000 (11:18 +0530)]
CRM-17396 fix - Editing a membership price set breaks auto-renew functionality
https://issues.civicrm.org/jira/browse/CRM-17396
Monish Deb [Mon, 19 Oct 2015 04:49:03 +0000 (10:19 +0530)]
Merge pull request #6970 from monishdeb/CRM-17396
CRM-17396 fix - Editing a membership price set breaks auto-renew functionality
colemanw [Mon, 19 Oct 2015 02:23:35 +0000 (22:23 -0400)]
Merge pull request #6999 from colemanw/CRM-17416
CRM-17416 - Handle wysiwyg latency and add lazy-loading
colemanw [Mon, 19 Oct 2015 00:54:05 +0000 (20:54 -0400)]
Merge pull request #6992 from colemanw/icons
Icon and css updates/cleanup
Coleman Watts [Mon, 19 Oct 2015 00:06:11 +0000 (20:06 -0400)]
Make clientside CRM.config.resourceBase absolute
Coleman Watts [Mon, 19 Oct 2015 00:02:39 +0000 (20:02 -0400)]
Remove unused wysiwyg settings from angular callback
Coleman Watts [Sun, 18 Oct 2015 21:16:34 +0000 (17:16 -0400)]
Lazy-load ckeditor.js
Dave Greenberg [Sun, 18 Oct 2015 22:50:20 +0000 (15:50 -0700)]
Merge pull request #6989 from seamuslee001/CRM-17415
CRM-17415 Add in URL filtering to Click through report
Eileen McNaughton [Sun, 18 Oct 2015 22:06:13 +0000 (11:06 +1300)]
Merge pull request #6993 from eileenmcnaughton/tests
minor test classes tidy-up.
Eileen McNaughton [Sun, 18 Oct 2015 22:05:32 +0000 (11:05 +1300)]
Merge pull request #6996 from eileenmcnaughton/t
minor test class tidy-up
eileenmcnaugton [Sun, 18 Oct 2015 07:52:57 +0000 (20:52 +1300)]
minor test classes idy-up.
We have been moving from the create helper classes taking a range of parameters to them taking an array which
is merged with the defaults the functions provide in order to create the entity
eileenmcnaughton [Sun, 18 Oct 2015 20:45:13 +0000 (20:45 +0000)]
minor test class tidy-up
Coleman Watts [Sun, 18 Oct 2015 19:25:51 +0000 (15:25 -0400)]
crm.ckeditor.js code cleanup
Coleman Watts [Sun, 18 Oct 2015 19:11:54 +0000 (15:11 -0400)]
CRM-17416 - Wait for wysiwyg to be ready
Saurabh Batra [Sun, 18 Oct 2015 16:11:40 +0000 (21:41 +0530)]
CRM-16842 add EntityBatch API fixed.
----------------------------------------
* CRM-16842:
https://issues.civicrm.org/jira/browse/CRM-16842
Saurabh Batra [Fri, 16 Oct 2015 16:59:02 +0000 (22:29 +0530)]
Unit test for makeBatchSummary function final.
Coleman Watts [Sat, 17 Oct 2015 18:59:07 +0000 (14:59 -0400)]
Cleanup css files and remove unused styles
Coleman Watts [Sat, 17 Oct 2015 21:22:45 +0000 (17:22 -0400)]
CRM-16415 - Move hamburger menu icon to left side
Seamus Lee [Sat, 17 Oct 2015 22:28:43 +0000 (22:28 +0000)]
Fix Template file
Coleman Watts [Sat, 17 Oct 2015 18:58:47 +0000 (14:58 -0400)]
CRM-16415 - Replace editable icons
Coleman Watts [Sat, 17 Oct 2015 18:14:26 +0000 (14:14 -0400)]
CRM-16415 - UI icon updates
colemanw [Sat, 17 Oct 2015 17:40:38 +0000 (13:40 -0400)]
Merge pull request #6991 from kcristiano/CRM-16421
CRM-16421 Rid Code base of references to 'wp-content'
Kevin Cristiano [Sat, 17 Oct 2015 17:35:08 +0000 (13:35 -0400)]
CRM-16421 Rid Code base of references to 'wp-content'
----------------------------------------
* CRM-16421: Work to get CiviCRM for WordPress in WordPress' official Repository
https://issues.civicrm.org/jira/browse/CRM-16421
colemanw [Sat, 17 Oct 2015 02:04:54 +0000 (22:04 -0400)]
Merge pull request #6988 from colemanw/CRM-16415
CRM-16415 - Action icon updates
Seamus Lee [Fri, 16 Oct 2015 22:50:29 +0000 (22:50 +0000)]
PHPCS fixes
Seamus Lee [Fri, 16 Oct 2015 22:31:58 +0000 (22:31 +0000)]
CRM-17415 Add in URL filtering to Click through report
Coleman Watts [Fri, 16 Oct 2015 21:27:10 +0000 (17:27 -0400)]
CRM-16415 - Add icon to message template selector
Coleman Watts [Fri, 16 Oct 2015 20:48:42 +0000 (16:48 -0400)]
CRM-16415 - master accordion header help-icon color
colemanw [Fri, 16 Oct 2015 17:15:57 +0000 (13:15 -0400)]
Merge pull request #6957 from jdax/CRM_13823_Admin_Status_Page
CRM 13823 admin status page
colemanw [Fri, 16 Oct 2015 17:14:15 +0000 (13:14 -0400)]
Merge pull request #6980 from colemanw/entityRef
entityRef - Use deep-merge to combine data-params and options
Herb [Fri, 16 Oct 2015 13:48:50 +0000 (09:48 -0400)]
style correction
Herb [Fri, 16 Oct 2015 13:47:14 +0000 (09:47 -0400)]
style corrections
Herb [Fri, 16 Oct 2015 13:40:43 +0000 (09:40 -0400)]
add Redis as memory type of cache
jitendrapurohit [Fri, 16 Oct 2015 12:43:45 +0000 (18:13 +0530)]
fix contact get api with state using IN operator
jitendrapurohit [Fri, 16 Oct 2015 12:27:49 +0000 (17:57 +0530)]
remove hack and add test cases
jitendrapurohit [Wed, 14 Oct 2015 09:30:38 +0000 (15:00 +0530)]
CRM-17361 -- Extend Contact getoptions to include Address fields
yashodha [Fri, 16 Oct 2015 09:41:30 +0000 (15:11 +0530)]
CRM-17354: Tell a Friend email field should be trimmed
----------------------------------------
* CRM-17354: Tell a Friend email field should be trimmed
https://issues.civicrm.org/jira/browse/CRM-17354
Yashodha Chaku [Fri, 16 Oct 2015 09:07:05 +0000 (14:37 +0530)]
Merge pull request #6961 from colemanw/BorislavZlatanov-CRM-17357
CRM-17357 - Fix error on receipt PDF creation (rebased)
eileenmcnaugton [Fri, 16 Oct 2015 03:15:03 +0000 (16:15 +1300)]
CRM-17412 strict notice fix
eileenmcnaugton [Fri, 16 Oct 2015 03:04:41 +0000 (16:04 +1300)]
CRM-17411 fix strict warning by removing empty override function
colemanw [Fri, 16 Oct 2015 02:56:28 +0000 (22:56 -0400)]
Merge pull request #6978 from eileenmcnaughton/comments
comment fixes
colemanw [Fri, 16 Oct 2015 02:52:07 +0000 (22:52 -0400)]
Merge pull request #6852 from seamuslee001/CRM-17303
CRM-17303 Fix to ensure you cannot schedule Mailings for in the past
Coleman Watts [Fri, 16 Oct 2015 02:48:10 +0000 (22:48 -0400)]
entityRef - Use deep-merge to combine data-params and options
Coleman Watts [Thu, 15 Oct 2015 19:50:30 +0000 (15:50 -0400)]
CRM-16415 - Convert action menu icons
eileenmcnaugton [Fri, 16 Oct 2015 01:45:37 +0000 (14:45 +1300)]
CRM-17352 fix strict error on non-static method
I could only find one place where this is called & it didn't seem to be as a form in itself.
Arguably the class should go & just be a couple of functions on the one form that calls it
eileenmcnaugton [Fri, 16 Oct 2015 01:46:01 +0000 (14:46 +1300)]
comment fixes
Seamus Lee [Fri, 2 Oct 2015 22:25:52 +0000 (22:25 +0000)]
Fix old tests to reflect new validation and add new test to verify that new validation function works
Js Hint fixes
Js Hint fixes
Js Hint fixes
Fix typo found by Dave
Seamus Lee [Thu, 1 Oct 2015 00:54:46 +0000 (00:54 +0000)]
Remove debugging
js hint fixes
js hint fixes
Seamus Lee [Thu, 1 Oct 2015 00:49:49 +0000 (00:49 +0000)]
Shift validation testing to radioDate from crmUI
Minor fixes
Seamus Lee [Wed, 30 Sep 2015 04:12:16 +0000 (04:12 +0000)]
CRM-17303 Fix to ensure you cannot schedule Mailings for in the past
jshint fixes
colemanw [Thu, 15 Oct 2015 17:48:13 +0000 (13:48 -0400)]
Merge pull request #6973 from joannechester/CRM-17407
CRM-17407 renaming recaptcha keys
colemanw [Thu, 15 Oct 2015 17:45:06 +0000 (13:45 -0400)]
Merge pull request #6974 from colemanw/idHelp
Change 'help' id to a class
Herb [Thu, 15 Oct 2015 16:45:38 +0000 (12:45 -0400)]
add support for Redis as caching server
projects / civicrm-core.git / log