civicrm-core.git
8 years agoCRM-13823 - Use popup menu for snooze options
Coleman Watts [Sat, 24 Oct 2015 16:52:09 +0000 (12:52 -0400)]
CRM-13823 - Use popup menu for snooze options

8 years agoCRM-13823 - Show icons in Angular tabs
Coleman Watts [Fri, 23 Oct 2015 19:03:15 +0000 (15:03 -0400)]
CRM-13823 - Show icons in Angular tabs

8 years agoCRM-13823 - Show count in Angular tabs
Coleman Watts [Fri, 23 Oct 2015 18:42:31 +0000 (14:42 -0400)]
CRM-13823 - Show count in Angular tabs

8 years agoCRM-13823 - Snooze/hush cleanup
Coleman Watts [Fri, 23 Oct 2015 12:43:19 +0000 (08:43 -0400)]
CRM-13823 - Snooze/hush cleanup

8 years agoCRM-13823 - Simplify data loading
Coleman Watts [Fri, 23 Oct 2015 02:31:18 +0000 (22:31 -0400)]
CRM-13823 - Simplify data loading

8 years agoCRM-13823 - Remove unused api calls
Coleman Watts [Thu, 22 Oct 2015 21:18:22 +0000 (17:18 -0400)]
CRM-13823 - Remove unused api calls

8 years agoCRM-13823 - Switch statusPage to use tabbed interface
Coleman Watts [Thu, 22 Oct 2015 19:33:47 +0000 (15:33 -0400)]
CRM-13823 - Switch statusPage to use tabbed interface

8 years agoCRM-13823 - Show help for system status page
Coleman Watts [Thu, 22 Oct 2015 16:24:43 +0000 (12:24 -0400)]
CRM-13823 - Show help for system status page

8 years agoCRM-13823 - Cleanup and add icons to system status messages
Coleman Watts [Thu, 22 Oct 2015 15:42:14 +0000 (11:42 -0400)]
CRM-13823 - Cleanup and add icons to system status messages

8 years agoMerge pull request #7024 from colemanw/CRM-13823
colemanw [Thu, 22 Oct 2015 13:49:00 +0000 (09:49 -0400)]
Merge pull request #7024 from colemanw/CRM-13823

CRM-13823 - Better extension error handling

8 years agoMerge pull request #7028 from eileenmcnaughton/comments-2
Eileen McNaughton [Thu, 22 Oct 2015 07:19:52 +0000 (20:19 +1300)]
Merge pull request #7028 from eileenmcnaughton/comments-2

comment fixes

8 years agoMerge pull request #7029 from eileenmcnaughton/CRM-17426-pay-later
Eileen McNaughton [Thu, 22 Oct 2015 03:48:26 +0000 (16:48 +1300)]
Merge pull request #7029 from eileenmcnaughton/CRM-17426-pay-later

CRM-17426 fix paylater showing when not configured to

8 years agocomment fixes
eileenmcnaughton [Thu, 22 Oct 2015 01:51:56 +0000 (01:51 +0000)]
comment fixes
wq!
comment fixes

f

8 years agoCRM-17426 fix paylater showing when not configured to
eileenmcnaugton [Thu, 22 Oct 2015 02:29:01 +0000 (15:29 +1300)]
CRM-17426 fix paylater showing when not configured to

8 years agoCRM-13823 - Better extension error handling
Coleman Watts [Wed, 21 Oct 2015 22:33:36 +0000 (18:33 -0400)]
CRM-13823 - Better extension error handling

8 years agoMerge pull request #7022 from davecivicrm/CRM-17428
Dave Greenberg [Wed, 21 Oct 2015 18:58:14 +0000 (11:58 -0700)]
Merge pull request #7022 from davecivicrm/CRM-17428

CRM-17428 - Fix test processor and editing of processor type.

8 years agoMerge pull request #7023 from yurg/patch-1
colemanw [Wed, 21 Oct 2015 18:17:55 +0000 (14:17 -0400)]
Merge pull request #7023 from yurg/patch-1

check.gif not visible due to code formatting issue

8 years agocheck.gif not visible due to code formatting issue
yurg [Wed, 21 Oct 2015 18:10:14 +0000 (20:10 +0200)]
check.gif not visible due to code formatting issue

Carriage return should be added at #56 between closing curly bracket  and start of image tag, it gives check.gif path error thus icon is not visible at civicrm/admin/labelFormats?reset=1

8 years agoCRM-17428 - Fix test processor and editing of processor type.
Dave Greenberg [Wed, 21 Oct 2015 17:40:04 +0000 (10:40 -0700)]
CRM-17428 - Fix test processor and editing of processor type.

----------------------------------------
* CRM-17428: Wrong payment processor type for 'dummy' processor AND can not change processor type when editing existing processor
  https://issues.civicrm.org/jira/browse/CRM-17428

8 years agoMerge pull request #7019 from jitendrapurohit/CRM-17395
Monish Deb [Wed, 21 Oct 2015 14:16:04 +0000 (19:46 +0530)]
Merge pull request #7019 from jitendrapurohit/CRM-17395

CRM-17395 - Activities report - filter by target contact

8 years agoCRM-17395 - Activities report - filter by target contact
jitendrapurohit [Wed, 21 Oct 2015 11:45:10 +0000 (17:15 +0530)]
CRM-17395 - Activities report - filter by target contact

8 years agoMerge pull request #7017 from yashodha/CRM-16990
Monish Deb [Wed, 21 Oct 2015 11:20:25 +0000 (16:50 +0530)]
Merge pull request #7017 from yashodha/CRM-16990

CRM-16990: Custom fields are NOT being saved for some component custo…

8 years agoMerge pull request #7007 from monishdeb/CRM-17422
Monish Deb [Wed, 21 Oct 2015 10:43:16 +0000 (16:13 +0530)]
Merge pull request #7007 from monishdeb/CRM-17422

Crm 17422 fix

8 years agoUpdate version to 4.7.beta1
CiviCRM [Wed, 21 Oct 2015 10:32:55 +0000 (03:32 -0700)]
Update version to 4.7.beta1

8 years agoCRM-16990: Custom fields are NOT being saved for some component custom data (activiti...
yashodha [Wed, 21 Oct 2015 10:18:21 +0000 (15:48 +0530)]
CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)

----------------------------------------
* CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
  https://issues.civicrm.org/jira/browse/CRM-16990

8 years agoCRM-16990: Custom fields are NOT being saved for some component custom data (activiti...
yashodha [Wed, 21 Oct 2015 09:55:38 +0000 (15:25 +0530)]
CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)

----------------------------------------
* CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
  https://issues.civicrm.org/jira/browse/CRM-16990

8 years agoCRM-16990: Custom fields are NOT being saved for some component custom data (activiti...
yashodha [Wed, 21 Oct 2015 09:19:33 +0000 (14:49 +0530)]
CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)

----------------------------------------
* CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
  https://issues.civicrm.org/jira/browse/CRM-16990

8 years agominor fix
monishdeb [Wed, 21 Oct 2015 07:57:45 +0000 (13:27 +0530)]
minor fix

8 years agominor fix
monishdeb [Tue, 20 Oct 2015 08:25:12 +0000 (13:55 +0530)]
minor fix

8 years agoCRM-17422 fix - Change in custom field search behaviour impacting on performance
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

8 years agoMerge pull request #7011 from saurabhbatra96/comment-fixes-financial
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.

8 years agoMerge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-21-12-07-36
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

8 years agoMerge pull request #7016 from monishdeb/4.6-master-2015-10-21-10-54-28
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

8 years agoCRM-17419 fix exception error condition
Brian Shaughnessy [Mon, 19 Oct 2015 15:25:10 +0000 (11:25 -0400)]
CRM-17419 fix exception error condition

8 years agoCRM-17402: Defer loading Google Maps API
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

8 years agoMerge pull request #7009 from jitendrapurohit/CRM-11084
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

8 years agoMerge pull request #7015 from seamuslee001/CRM-17303-futher
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

8 years agoMerge pull request #6963 from agileware/4.6-CRM-17402
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

8 years agoMerge pull request #6979 from eileenmcnaughton/master
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 …

8 years agoMerge pull request #6981 from eileenmcnaughton/CRM-17411
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

8 years agoMerge pull request #7012 from colemanw/css
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

8 years agoMerge pull request #7014 from colemanw/CRM-11782
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

8 years agoFix validtion when users time is before 9am
Seamus Lee [Tue, 20 Oct 2015 22:56:01 +0000 (22:56 +0000)]
Fix validtion when users time is before 9am

8 years agoAdd searchForm css wherever alpha pager is used
Coleman Watts [Tue, 20 Oct 2015 20:21:48 +0000 (16:21 -0400)]
Add searchForm css wherever alpha pager is used

8 years agoCRM-11782 - Get rid of VALUE_SEPARATOR character in saved search form values
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

8 years agoComment fixes and function clean-up for CRM/Financial directory.
Saurabh Batra [Tue, 20 Oct 2015 17:58:07 +0000 (23:28 +0530)]
Comment fixes and function clean-up for CRM/Financial directory.

8 years agowarning fixes
jitendrapurohit [Tue, 20 Oct 2015 13:21:35 +0000 (18:51 +0530)]
warning fixes

8 years agoCRM-11084 -- Custom Membership Field not populating in membership form
jitendrapurohit [Tue, 20 Oct 2015 13:16:07 +0000 (18:46 +0530)]
CRM-11084 -- Custom Membership Field not populating in membership form

8 years agoMerge pull request #7008 from jitendrapurohit/CRM-16990
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…

8 years agoMerge pull request #6975 from herbdool/master-redis
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

8 years agoCRM-16990 -- Custom fields are NOT being saved for some component custom data (activi...
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 ...)

8 years agoMerge pull request #7005 from jitendrapurohit/CRM-17280
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 …

8 years agostyle fix: removed space
Herb [Mon, 19 Oct 2015 20:17:14 +0000 (16:17 -0400)]
style fix: removed space

8 years agoMerge pull request #7006 from lcdservices/CRM-17419
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

8 years agoMerge pull request #6986 from saurabhbatra96/CRM-17120-function-caching-test
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.

8 years agoCRM-17419 fix exception error condition
Brian Shaughnessy [Mon, 19 Oct 2015 15:25:10 +0000 (11:25 -0400)]
CRM-17419 fix exception error condition

8 years agoMerge pull request #6985 from jitendrapurohit/CRM-17361
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

8 years agoMerge pull request #7001 from colemanw/CRM-16415
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

8 years agoMerge pull request #7004 from seamuslee001/CRM-17303-test
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 …

8 years agoMerge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-19-19-40-00
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

8 years agoCRM-16415 - Fix crmSelect2 placeholder icons
Coleman Watts [Mon, 19 Oct 2015 02:22:16 +0000 (22:22 -0400)]
CRM-16415 - Fix crmSelect2 placeholder icons

8 years agoFixed indentation.
Saurabh Batra [Mon, 19 Oct 2015 07:38:33 +0000 (13:08 +0530)]
Fixed indentation.

8 years agominor fix
jitendrapurohit [Mon, 19 Oct 2015 11:17:07 +0000 (16:47 +0530)]
minor fix

8 years agowarning fix
jitendrapurohit [Mon, 19 Oct 2015 11:09:14 +0000 (16:39 +0530)]
warning fix

8 years agominor fix
jitendrapurohit [Mon, 19 Oct 2015 11:08:22 +0000 (16:38 +0530)]
minor fix

8 years agoCRM-17280 - contribution detail report: error when sorting by custom contrib field
jitendrapurohit [Mon, 19 Oct 2015 11:02:57 +0000 (16:32 +0530)]
CRM-17280 - contribution detail report: error when sorting by custom contrib field

8 years agoCRM-17303 Make new test more stable by deliberately moving the day a whole day forwar...
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

8 years agoMerge pull request #7002 from monishdeb/CRM-17396
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…

8 years agoMerge pull request #6982 from eileenmcnaughton/CRM-17412
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

8 years agoMerge pull request #7003 from yashodha/CRM-17414
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

8 years agoMerge pull request #6995 from saurabhbatra96/CRM-16842
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).

8 years agoCRM-17414: fix comments
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

8 years agoCRM-17414: minor fixes
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

8 years agoMerge pull request #6983 from yashodha/CRM-17354
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

8 years agoCRM-17414: Add to and from dates to the Relationship Report filter
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

8 years agoCRM-17396 fix - Editing a membership price set breaks auto-renew functionality
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

8 years agoMerge pull request #6970 from monishdeb/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

8 years agoMerge pull request #6999 from colemanw/CRM-17416
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

8 years agoMerge pull request #6992 from colemanw/icons
colemanw [Mon, 19 Oct 2015 00:54:05 +0000 (20:54 -0400)]
Merge pull request #6992 from colemanw/icons

Icon and css updates/cleanup

8 years agoMake clientside CRM.config.resourceBase absolute
Coleman Watts [Mon, 19 Oct 2015 00:06:11 +0000 (20:06 -0400)]
Make clientside CRM.config.resourceBase absolute

8 years agoRemove unused wysiwyg settings from angular callback
Coleman Watts [Mon, 19 Oct 2015 00:02:39 +0000 (20:02 -0400)]
Remove unused wysiwyg settings from angular callback

8 years agoLazy-load ckeditor.js
Coleman Watts [Sun, 18 Oct 2015 21:16:34 +0000 (17:16 -0400)]
Lazy-load ckeditor.js

8 years agoMerge pull request #6989 from seamuslee001/CRM-17415
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

8 years agoMerge pull request #6993 from eileenmcnaughton/tests
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.

8 years agoMerge pull request #6996 from eileenmcnaughton/t
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

8 years agominor test classes idy-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

8 years agominor test class tidy-up
eileenmcnaughton [Sun, 18 Oct 2015 20:45:13 +0000 (20:45 +0000)]
minor test class tidy-up

8 years agocrm.ckeditor.js code cleanup
Coleman Watts [Sun, 18 Oct 2015 19:25:51 +0000 (15:25 -0400)]
crm.ckeditor.js code cleanup

8 years agoCRM-17416 - Wait for wysiwyg to be ready
Coleman Watts [Sun, 18 Oct 2015 19:11:54 +0000 (15:11 -0400)]
CRM-17416 - Wait for wysiwyg to be ready

8 years agoCRM-16842 add EntityBatch API fixed.
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

8 years agoUnit test for makeBatchSummary function final.
Saurabh Batra [Fri, 16 Oct 2015 16:59:02 +0000 (22:29 +0530)]
Unit test for makeBatchSummary function final.

8 years agoCleanup css files and remove unused styles
Coleman Watts [Sat, 17 Oct 2015 18:59:07 +0000 (14:59 -0400)]
Cleanup css files and remove unused styles

8 years agoCRM-16415 - Move hamburger menu icon to left side
Coleman Watts [Sat, 17 Oct 2015 21:22:45 +0000 (17:22 -0400)]
CRM-16415 - Move hamburger menu icon to left side

8 years agoFix Template file
Seamus Lee [Sat, 17 Oct 2015 22:28:43 +0000 (22:28 +0000)]
Fix Template file

8 years agoCRM-16415 - Replace editable icons
Coleman Watts [Sat, 17 Oct 2015 18:58:47 +0000 (14:58 -0400)]
CRM-16415 - Replace editable icons

8 years agoCRM-16415 - UI icon updates
Coleman Watts [Sat, 17 Oct 2015 18:14:26 +0000 (14:14 -0400)]
CRM-16415 - UI icon updates

8 years agoMerge pull request #6991 from kcristiano/CRM-16421
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'

8 years agoCRM-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

8 years agoMerge pull request #6988 from colemanw/CRM-16415
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

8 years agoPHPCS fixes
Seamus Lee [Fri, 16 Oct 2015 22:50:29 +0000 (22:50 +0000)]
PHPCS fixes