colemanw [Mon, 25 Aug 2014 09:08:53 +0000 (10:08 +0100)]
Merge pull request #3934 from civicrm/master
Merge master into 4.5
colemanw [Mon, 25 Aug 2014 09:02:02 +0000 (10:02 +0100)]
Merge pull request #3933 from colemanw/Fix
Fix payment processor form unsaved changes warning
Coleman Watts [Mon, 25 Aug 2014 09:01:32 +0000 (10:01 +0100)]
Fix payment processor form unsaved changes warning
Monish Deb [Mon, 25 Aug 2014 08:20:32 +0000 (13:50 +0530)]
Merge pull request #3902 from atif-shaikh/CRM-15120
CRM-15120 - Mailing labels Prefix missing for Merge labels for contacts ...
atif-shaikh [Mon, 25 Aug 2014 08:18:43 +0000 (13:48 +0530)]
indentation fix
Kurund Jalmi [Mon, 25 Aug 2014 05:43:23 +0000 (11:13 +0530)]
Merge pull request #3931 from yashodha/version-fix
version fixes
Kurund Jalmi [Mon, 25 Aug 2014 05:41:07 +0000 (11:11 +0530)]
Merge pull request #3910 from deepak-srivastava/pull-clickatell-out-of-core
Pull clickatell extension out of core (to veda repo)
Kurund Jalmi [Mon, 25 Aug 2014 05:37:58 +0000 (11:07 +0530)]
Merge pull request #3930 from eileenmcnaughton/whitespace
Whitespace
kurund [Mon, 25 Aug 2014 05:30:50 +0000 (11:00 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-25-10-57-01
Conflicts:
tests/phpunit/CiviTest/CiviUnitTestCase.php
CiviCRM [Mon, 25 Aug 2014 05:18:30 +0000 (10:48 +0530)]
version fixes
Eileen McNaughton [Mon, 25 Aug 2014 04:33:21 +0000 (16:33 +1200)]
CRM-15168 remove inadvertantly added line break
Eileen McNaughton [Mon, 25 Aug 2014 04:29:09 +0000 (16:29 +1200)]
CRM-15168 remove inadvertantly added line break
Eileen McNaughton [Mon, 25 Aug 2014 04:19:56 +0000 (16:19 +1200)]
CRM-15168 remove inadvertantly added line break
Eileen McNaughton [Mon, 25 Aug 2014 04:17:43 +0000 (16:17 +1200)]
CRM-15168 remove inadvertantly added line break
Eileen McNaughton [Mon, 25 Aug 2014 04:13:32 +0000 (16:13 +1200)]
CRM-15168 remove inadvertantly added line break
Eileen McNaughton [Mon, 25 Aug 2014 01:36:38 +0000 (13:36 +1200)]
Merge pull request #3928 from eileenmcnaughton/CRM-15168
CRM-15168 increase test coverage
Eileen McNaughton [Mon, 25 Aug 2014 01:36:08 +0000 (13:36 +1200)]
CRM-15168 Update test to reflect almost all api are compliant
Eileen McNaughton [Mon, 25 Aug 2014 01:35:20 +0000 (13:35 +1200)]
CRM-15168 fix setting api metadata titles
Eileen McNaughton [Mon, 25 Aug 2014 01:29:38 +0000 (13:29 +1200)]
Merge pull request #3927 from eileenmcnaughton/CRM-15168
CRM-15168 add more titles to schema
Eileen McNaughton [Mon, 25 Aug 2014 01:29:03 +0000 (13:29 +1200)]
CRM-15168 add some more titles
Eileen McNaughton [Mon, 25 Aug 2014 01:23:16 +0000 (13:23 +1200)]
CRM-15168 add some more labels
Eileen McNaughton [Mon, 25 Aug 2014 01:21:55 +0000 (13:21 +1200)]
CRM-15168 add some titles inthe API layer
Eileen McNaughton [Mon, 25 Aug 2014 00:52:55 +0000 (12:52 +1200)]
Merge pull request #3926 from eileenmcnaughton/CRM-15168
CRM-15168 add more titles to schema
Eileen McNaughton [Mon, 25 Aug 2014 00:52:39 +0000 (12:52 +1200)]
CRM-15168 add more titles to schema
Eileen McNaughton [Mon, 25 Aug 2014 00:52:31 +0000 (12:52 +1200)]
Merge pull request #3925 from eileenmcnaughton/CRM-15168
CRM-15168 add some additional titles to schema
Eileen McNaughton [Mon, 25 Aug 2014 00:43:31 +0000 (12:43 +1200)]
CRM-15168 add some more titles
Eileen McNaughton [Mon, 25 Aug 2014 00:29:13 +0000 (12:29 +1200)]
CRM-15168 add titles for settings
Eileen McNaughton [Mon, 25 Aug 2014 00:28:23 +0000 (12:28 +1200)]
CRM-15168 as mailing api are non-standard we need to code the titles into the api - can't leverage schema
Eileen McNaughton [Mon, 25 Aug 2014 00:11:07 +0000 (12:11 +1200)]
CRM-15168 add some additional titles to schema
Eileen McNaughton [Sun, 24 Aug 2014 22:31:48 +0000 (10:31 +1200)]
CRM-15168 a few more titles
Eileen McNaughton [Sun, 24 Aug 2014 22:18:55 +0000 (10:18 +1200)]
Merge pull request #3924 from eileenmcnaughton/CRM-15168
CRM-15168 stdise whitespace across schema xml to make editing easier
Eileen McNaughton [Sun, 24 Aug 2014 22:18:39 +0000 (10:18 +1200)]
CRM-15168 stdise whitespace across schema xml to make editing easier
Eileen McNaughton [Sun, 24 Aug 2014 22:16:38 +0000 (10:16 +1200)]
Merge pull request #3923 from eileenmcnaughton/CRM-15168
CRM-15168 add titles to another entity
Eileen McNaughton [Sun, 24 Aug 2014 22:16:21 +0000 (10:16 +1200)]
CRM-15168 add titles to another entity
Eileen McNaughton [Sun, 24 Aug 2014 22:02:57 +0000 (10:02 +1200)]
Merge pull request #3922 from eileenmcnaughton/CRM-15168
CRM-15168 xml tidy ups
Eileen McNaughton [Sun, 24 Aug 2014 22:02:01 +0000 (10:02 +1200)]
CRM-15168 fix whitespace
Eileen McNaughton [Sun, 24 Aug 2014 22:01:45 +0000 (10:01 +1200)]
CRM-15168 add titles to Price Set Entities
Eileen McNaughton [Sun, 24 Aug 2014 21:48:28 +0000 (09:48 +1200)]
Merge pull request #3921 from eileenmcnaughton/CRM-15168
CRM-15168 add a few more xml titles
Eileen McNaughton [Sun, 24 Aug 2014 21:46:43 +0000 (09:46 +1200)]
CRM-15168 fix titles on a couple more entities
Eileen McNaughton [Sun, 24 Aug 2014 21:42:50 +0000 (09:42 +1200)]
CRM-15168 whitespace only
Kurund Jalmi [Sun, 24 Aug 2014 13:38:11 +0000 (19:08 +0530)]
Merge pull request #3920 from kurund/CRM-15133
fixes for CRM-15133
kurund [Sun, 24 Aug 2014 13:36:35 +0000 (19:06 +0530)]
fixes for CRM-15133
----------------------------------------
* CRM-15133: Do not display upgrade reminder in footer if versionAlert is false
https://issues.civicrm.org/jira/browse/CRM-15133
Kurund Jalmi [Sun, 24 Aug 2014 13:28:00 +0000 (18:58 +0530)]
Merge pull request #3919 from kurund/CRM-12772
fixed wrong merge forward, CRM-12772
kurund [Sun, 24 Aug 2014 13:26:47 +0000 (18:56 +0530)]
fixed merge forward, CRM-12772
----------------------------------------
* CRM-12772: Member Report (Detail) locks in DB with large membership/contribution sets
https://issues.civicrm.org/jira/browse/CRM-12772
Eileen McNaughton [Fri, 22 Aug 2014 23:36:05 +0000 (11:36 +1200)]
Merge pull request #3917 from eileenmcnaughton/CRM-15168
Crm 15168
Eileen McNaughton [Fri, 22 Aug 2014 23:35:55 +0000 (11:35 +1200)]
CRM-15168 open up test to include a few more entities
Eileen McNaughton [Fri, 22 Aug 2014 23:34:10 +0000 (11:34 +1200)]
CRM-15168 a few more titles
Eileen McNaughton [Fri, 22 Aug 2014 23:31:31 +0000 (11:31 +1200)]
CRM-15168 a few more titles
Eileen McNaughton [Fri, 22 Aug 2014 23:30:09 +0000 (11:30 +1200)]
CRM-15168 a couple more titles
Eileen McNaughton [Fri, 22 Aug 2014 23:27:58 +0000 (11:27 +1200)]
CRM-15168 a few more titles
Eileen McNaughton [Fri, 22 Aug 2014 23:25:50 +0000 (11:25 +1200)]
Merge pull request #3916 from eileenmcnaughton/CRM-15168
CRM-15168 fix intermittantly failing test that was highlighted by previous commits
Eileen McNaughton [Fri, 22 Aug 2014 23:25:09 +0000 (11:25 +1200)]
CRM-15168 test fix for bug highlighted by this issue
Eileen McNaughton [Fri, 22 Aug 2014 23:15:58 +0000 (11:15 +1200)]
CRM-15168 Fix Dashboard test failure (not caused by this issue - but started failing off this issues commit)
Eileen McNaughton [Fri, 22 Aug 2014 23:14:34 +0000 (11:14 +1200)]
CRM-15168 a few more titles
Eileen McNaughton [Fri, 22 Aug 2014 23:11:53 +0000 (11:11 +1200)]
CRM-15168 whitespace only
Eileen McNaughton [Fri, 22 Aug 2014 23:11:49 +0000 (11:11 +1200)]
Merge pull request #3915 from eileenmcnaughton/CRM-15168
CRM-15168 a few more titles
Eileen McNaughton [Fri, 22 Aug 2014 23:09:22 +0000 (11:09 +1200)]
CRM-15168 a few more titles
Eileen McNaughton [Fri, 22 Aug 2014 23:04:33 +0000 (11:04 +1200)]
Merge pull request #3914 from eileenmcnaughton/CRM-15168
CRM-15168 whitespace only
Eileen McNaughton [Fri, 22 Aug 2014 23:03:53 +0000 (11:03 +1200)]
CRM-15168 whitespace only
Dave Greenberg [Fri, 22 Aug 2014 22:53:57 +0000 (15:53 -0700)]
Merge pull request #3913 from davecivicrm/CRM-15145
CRM-15145 - Fundraising and membership program related changes to Config...
Dave Greenberg [Fri, 22 Aug 2014 22:52:08 +0000 (15:52 -0700)]
CRM-15145 - Fundraising and membership program related changes to Configuration Checklist and Upgrade Success screen.
----------------------------------------
* CRM-15145:
https://issues.civicrm.org/jira/browse/CRM-15145
Eileen McNaughton [Fri, 22 Aug 2014 22:39:44 +0000 (10:39 +1200)]
Merge pull request #3912 from eileenmcnaughton/CRM-15168
CRM-15168 whitespace only
Eileen McNaughton [Fri, 22 Aug 2014 22:39:17 +0000 (10:39 +1200)]
CRM-15168 whitespace only
Eileen McNaughton [Fri, 22 Aug 2014 22:28:52 +0000 (10:28 +1200)]
Merge pull request #3911 from eileenmcnaughton/CRM-15168
CRM-15168 add titles to ACL xml
Eileen McNaughton [Fri, 22 Aug 2014 22:28:31 +0000 (10:28 +1200)]
CRM-15168 add titles to ACL xml
Eileen McNaughton [Fri, 22 Aug 2014 21:29:37 +0000 (09:29 +1200)]
Merge pull request #3901 from eileenmcnaughton/CRM-15168
CRM-15168 add titles to some xml fields
Kurund Jalmi [Fri, 22 Aug 2014 19:39:27 +0000 (01:09 +0530)]
Merge pull request #3903 from atif-shaikh/CRM-15142
CRM-15142 - "Strict warning" when Manually executing Scheduled job
Dave Greenberg [Fri, 22 Aug 2014 17:56:10 +0000 (10:56 -0700)]
Merge pull request #3897 from totten/master-casetype-tweaks
CRM-15166 crmCaseType - Tighten control over "Standard Timeline" and "Open Case"
Dave Greenberg [Fri, 22 Aug 2014 17:55:28 +0000 (10:55 -0700)]
Merge pull request #3898 from totten/master-casetype-defaults
CRM-15167 - crmCaseType - Update default activity-types (Open Case, Email, Follow up, Meeting, Phone Call)
Deepak Srivastava [Fri, 22 Aug 2014 17:19:35 +0000 (18:19 +0100)]
remove clickatell zip file
Deepak Srivastava [Fri, 22 Aug 2014 17:16:35 +0000 (18:16 +0100)]
pull clickatell extension out of core (to veda repo)
Coleman Watts [Fri, 22 Aug 2014 17:00:44 +0000 (18:00 +0100)]
Improve hover-button visibility
Dave Greenberg [Fri, 22 Aug 2014 16:51:48 +0000 (09:51 -0700)]
Merge pull request #3909 from davecivicrm/optionLabelTweak
Tweak option label in Tags admin.
Dave Greenberg [Fri, 22 Aug 2014 16:49:05 +0000 (09:49 -0700)]
Tweak option label in Tags admin.
colemanw [Fri, 22 Aug 2014 16:43:35 +0000 (17:43 +0100)]
Merge pull request #3908 from colemanw/css
css fix for overriding cms table styles (e.g. Bartik)
Coleman Watts [Fri, 22 Aug 2014 16:43:21 +0000 (17:43 +0100)]
css fix for overriding cms table styles (e.g. Bartik)
colemanw [Fri, 22 Aug 2014 16:26:09 +0000 (17:26 +0100)]
Merge pull request #3907 from colemanw/reports
UI improvements for reports
Coleman Watts [Fri, 22 Aug 2014 16:18:29 +0000 (17:18 +0100)]
Re-order country/state/county to make more sense with chainselect
Coleman Watts [Fri, 22 Aug 2014 16:15:43 +0000 (17:15 +0100)]
Ensure reports use nested group selector and remove boilerplate
colemanw [Fri, 22 Aug 2014 15:51:09 +0000 (16:51 +0100)]
Merge pull request #3906 from colemanw/CRM-15141
CRM-15141 - Fill smart group cache if empty
Coleman Watts [Fri, 22 Aug 2014 15:49:33 +0000 (16:49 +0100)]
CRM-15141 - Fill smart group cache if empty
colemanw [Fri, 22 Aug 2014 15:36:50 +0000 (16:36 +0100)]
Merge pull request #3905 from colemanw/Use
Use select2 for report forms
Coleman Watts [Fri, 22 Aug 2014 15:36:23 +0000 (16:36 +0100)]
Use select2 for report forms
colemanw [Fri, 22 Aug 2014 15:20:26 +0000 (16:20 +0100)]
Merge pull request #3904 from colemanw/locSearch
Cleanup and rearrange adv search location pane
Coleman Watts [Fri, 22 Aug 2014 15:09:57 +0000 (16:09 +0100)]
Cleanup and rearrange adv search location pane
Coleman Watts [Fri, 22 Aug 2014 12:44:55 +0000 (13:44 +0100)]
Remove obsolete style
Coleman Watts [Fri, 22 Aug 2014 12:43:39 +0000 (13:43 +0100)]
Switch search address location to select2 widget
Coleman Watts [Fri, 22 Aug 2014 12:01:24 +0000 (13:01 +0100)]
Update state/county placeholder
atif-shaikh [Fri, 22 Aug 2014 11:05:11 +0000 (16:35 +0530)]
CRM-15142 - "Strict warning" when Manually executing Scheduled job
https://issues.civicrm.org/jira/browse/CRM-15142
atif-shaikh [Fri, 22 Aug 2014 10:50:25 +0000 (16:20 +0530)]
CRM-15120 - Mailing labels Prefix missing for Merge labels for contacts with the same address
https://issues.civicrm.org/jira/browse/CRM-15120
Coleman Watts [Fri, 22 Aug 2014 10:49:16 +0000 (11:49 +0100)]
Location.tpl - whitespace cleanup
Eileen McNaughton [Fri, 22 Aug 2014 10:01:14 +0000 (22:01 +1200)]
CRM-15168 a few more titles
Eileen McNaughton [Fri, 22 Aug 2014 09:55:45 +0000 (21:55 +1200)]
CRM-15168 add some more emails
Eileen McNaughton [Fri, 22 Aug 2014 09:52:39 +0000 (21:52 +1200)]
more whitespace
Eileen McNaughton [Fri, 22 Aug 2014 09:47:38 +0000 (21:47 +1200)]
whitespace only
Eileen McNaughton [Fri, 22 Aug 2014 09:43:35 +0000 (21:43 +1200)]
CRM-15168 add line-in-the-sand title test
Eileen McNaughton [Fri, 22 Aug 2014 09:42:20 +0000 (21:42 +1200)]
metadata fix
Eileen McNaughton [Fri, 22 Aug 2014 09:37:12 +0000 (21:37 +1200)]
whitespace
Eileen McNaughton [Fri, 22 Aug 2014 09:35:51 +0000 (21:35 +1200)]
whitespace only
Eileen McNaughton [Fri, 22 Aug 2014 09:35:11 +0000 (21:35 +1200)]
CRM-15168 more metadata titles (& whitespace
projects / civicrm-core.git / log