Eileen McNaughton [Fri, 3 Apr 2015 03:51:28 +0000 (16:51 +1300)]
minor preliminary cleanup
Kurund Jalmi [Wed, 1 Apr 2015 08:59:24 +0000 (14:29 +0530)]
Merge pull request #5529 from pradpnayak/CRM-13793
-- CRM-13793, removed cruft for website type id for profiles
Kurund Jalmi [Wed, 1 Apr 2015 08:45:35 +0000 (14:15 +0530)]
Merge pull request #5524 from atif-shaikh/CRM-16087
CRM-16087 - Changes in relationship status are not invoking updates to m...
Kurund Jalmi [Wed, 1 Apr 2015 08:17:16 +0000 (13:47 +0530)]
Merge pull request #5516 from monishdeb/4.6Webtests
Webtest for new AB Test Mailing
atif-shaikh [Wed, 1 Apr 2015 07:13:28 +0000 (12:43 +0530)]
CRM-16087 - Relation Api test break fix
----------------------------------------
* CRM-16087: Changes in relationship status are not invoking updates to membership status
https://issues.civicrm.org/jira/browse/CRM-16087
Dave Greenberg [Wed, 1 Apr 2015 00:06:50 +0000 (17:06 -0700)]
Merge pull request #5530 from davecivicrm/fixGenerated
Fix bad copy of civicrm_generated.mysql.
Dave Greenberg [Tue, 31 Mar 2015 22:39:26 +0000 (15:39 -0700)]
Fix bad copy of civicrm_generated.mysql.
Dave Greenberg [Tue, 31 Mar 2015 22:25:27 +0000 (15:25 -0700)]
Merge pull request #5483 from pradpnayak/CRM-15848
-- CRM-15848, removed code to update financial_trxn table and create a n...
Dave Greenberg [Tue, 31 Mar 2015 22:08:34 +0000 (15:08 -0700)]
Merge pull request #5528 from pradpnayak/CRM-16198
Crm 16198
Dave Greenberg [Tue, 31 Mar 2015 21:54:26 +0000 (14:54 -0700)]
Merge pull request #5527 from agh1/joomlaxml-permission-desc
CRM-16201 permissions: fix processing of descriptions for Joomla
Pradeep Nayak [Tue, 31 Mar 2015 20:32:31 +0000 (02:02 +0530)]
-- CRM-13793, removed cruft for website type id for profiles
----------------------------------------
* CRM-13793: Miscellaneous code cleanups
https://issues.civicrm.org/jira/browse/CRM-13793
Pradeep Nayak [Tue, 31 Mar 2015 20:24:15 +0000 (01:54 +0530)]
-- CRM-16198, added aliaa for payment instrument in api
----------------------------------------
* CRM-16198: Financial Type search fails when searching Contributions using Search builder
https://issues.civicrm.org/jira/browse/CRM-16198
Andrew Hunt [Tue, 31 Mar 2015 20:21:51 +0000 (16:21 -0400)]
CRM-16201 permissions: fix processing of descriptions for Joomla
----------------------------------------
* CRM-16201: Permission descriptions and translation
https://issues.civicrm.org/jira/browse/CRM-16201
Dave Greenberg [Tue, 31 Mar 2015 20:13:48 +0000 (13:13 -0700)]
Merge pull request #5525 from agh1/perm-desc-2
CRM-16201 Descriptions and translation for permissions
Pradeep Nayak [Tue, 31 Mar 2015 20:05:14 +0000 (01:35 +0530)]
--CRM-16198, added blank line
Pradeep Nayak [Tue, 31 Mar 2015 20:04:11 +0000 (01:34 +0530)]
CRM-16198, removed white space
----------------------------------------
* CRM-16198: Financial Type search fails when searching Contributions using Search builder
https://issues.civicrm.org/jira/browse/CRM-16198
Pradeep Nayak [Tue, 31 Mar 2015 18:12:46 +0000 (23:42 +0530)]
--removed white space, CRM-15848
----------------------------------------
* CRM-15848: Civiaccounts inconsistent with spec when adding partial event payment
https://issues.civicrm.org/jira/browse/CRM-15848
Pradeep Nayak [Tue, 31 Mar 2015 18:01:58 +0000 (23:31 +0530)]
--CRM-15848, fixed code for regression caused by
77e18ec7
Andrew Hunt [Tue, 31 Mar 2015 16:11:35 +0000 (12:11 -0400)]
whitespace
Andrew Hunt [Mon, 30 Mar 2015 19:01:13 +0000 (15:01 -0400)]
CRM-16201 permissions - add permission descriptions to Joomla distmaker
Andrew Hunt [Mon, 30 Mar 2015 16:37:05 +0000 (12:37 -0400)]
CRM-16201 display permission descriptions in WordPress
Andrew Hunt [Tue, 31 Mar 2015 15:06:33 +0000 (11:06 -0400)]
CRM-16201 permissions: add descriptions and make translatable
Pradeep Nayak [Mon, 30 Mar 2015 07:34:28 +0000 (13:04 +0530)]
--CRM-16198, fix for search builder
Pradeep Nayak [Tue, 31 Mar 2015 14:07:46 +0000 (19:37 +0530)]
-- CRM-15848, fixed code to point civicrm_financial_item to latest financial trxn
----------------------------------------
* CRM-15848: Civiaccounts inconsistent with spec when adding partial event payment
https://issues.civicrm.org/jira/browse/CRM-15848
Pradeep Nayak [Wed, 25 Mar 2015 19:01:15 +0000 (00:31 +0530)]
--CRM-15848, removed white spaces
Pradeep Nayak [Wed, 25 Mar 2015 18:16:20 +0000 (23:46 +0530)]
--CRM-15848, modified code to use latest financial_trxn_id in civicrm_entity_financial_trxn for entity civicrm_financial_item
Pradeep Nayak [Wed, 25 Mar 2015 17:33:04 +0000 (23:03 +0530)]
--CRM-15848, removed white space
Pradeep Nayak [Wed, 25 Mar 2015 15:33:35 +0000 (21:03 +0530)]
-- CRM-15848, removed code to update financial_trxn table and create a new entry
----------------------------------------
* CRM-15848: Civiaccounts inconsistent with spec when adding partial event payment
https://issues.civicrm.org/jira/browse/CRM-15848
atif-shaikh [Tue, 31 Mar 2015 13:27:25 +0000 (18:57 +0530)]
CRM-16087 Failing test fix
----------------------------------------
* CRM-16087: Changes in relationship status are not invoking updates to membership status
https://issues.civicrm.org/jira/browse/CRM-16087
colemanw [Tue, 31 Mar 2015 13:20:32 +0000 (09:20 -0400)]
Merge pull request #5523 from eileenmcnaughton/4.6
minor phpcs fixes
atif-shaikh [Tue, 31 Mar 2015 12:13:10 +0000 (17:43 +0530)]
CRM-16087 - Changes in relationship status are not invoking updates to membership status
https://issues.civicrm.org/jira/browse/CRM-16087
Eileen McNaughton [Tue, 31 Mar 2015 04:33:08 +0000 (17:33 +1300)]
minor phpcs fixes
Tim Otten [Mon, 30 Mar 2015 22:03:04 +0000 (15:03 -0700)]
Merge pull request #5499 from colemanw/CRM-16155
CRM-16155 - Improve scalability of CiviMail UI
Dave Greenberg [Mon, 30 Mar 2015 21:16:32 +0000 (14:16 -0700)]
Merge pull request #5514 from pradpnayak/CRM-16197
-- CRM-16197, fixed onbehalf profile code to use contact sub type
colemanw [Mon, 30 Mar 2015 14:24:26 +0000 (10:24 -0400)]
Merge pull request #5508 from colemanw/CRM-16194
CRM-16194 - Remove inappropriate params from api query object
monishdeb [Mon, 30 Mar 2015 13:43:07 +0000 (19:13 +0530)]
formatting fixes
monishdeb [Mon, 30 Mar 2015 12:53:21 +0000 (18:23 +0530)]
formatting fixes
monishdeb [Mon, 30 Mar 2015 12:45:46 +0000 (18:15 +0530)]
formatting fixes
Eileen McNaughton [Mon, 30 Mar 2015 02:35:48 +0000 (15:35 +1300)]
Merge pull request #5488 from eileenmcnaughton/CRM-16184
CRM-16184 CiviReport template - clarify accordians for fields & filters & remove dependence
colemanw [Mon, 30 Mar 2015 02:01:45 +0000 (22:01 -0400)]
Merge pull request #5518 from colemanw/css
Css fix
Coleman Watts [Mon, 30 Mar 2015 02:01:16 +0000 (22:01 -0400)]
Css fix
Coleman Watts [Mon, 30 Mar 2015 00:00:12 +0000 (20:00 -0400)]
Merge branch 4.5 into 4.6
Coleman Watts [Sun, 29 Mar 2015 23:56:49 +0000 (19:56 -0400)]
Fix escaped quotes in translated string
colemanw [Sun, 29 Mar 2015 23:56:08 +0000 (19:56 -0400)]
Merge pull request #5517 from colemanw/menu
Fix interaction with quicksearch when popup is open
Coleman Watts [Sun, 29 Mar 2015 23:22:03 +0000 (19:22 -0400)]
Fix interaction with quicksearch when popup is open
colemanw [Sun, 29 Mar 2015 23:20:55 +0000 (19:20 -0400)]
Merge pull request #5509 from colemanw/CRM-16148
CRM-16148 - Translate untranslated option labels
monishdeb [Sun, 29 Mar 2015 22:20:05 +0000 (03:50 +0530)]
Webtest for new AB Test Mailing
pratikshad [Fri, 27 Mar 2015 13:18:05 +0000 (18:48 +0530)]
../tests/phpunit/WebTest/Mailing/ABMailingTest.php
Pradeep Nayak [Sun, 29 Mar 2015 20:01:59 +0000 (01:31 +0530)]
-- CRM-16197, fixed onbehalf profile code to use contact sub type
----------------------------------------
* CRM-16197: OnBehalf profile doesn't respect contact sub type
https://issues.civicrm.org/jira/browse/CRM-16197
Coleman Watts [Sat, 28 Mar 2015 01:06:12 +0000 (21:06 -0400)]
CRM-16148 - Translate untranslated option labels
Coleman Watts [Sat, 28 Mar 2015 00:55:23 +0000 (20:55 -0400)]
CRM-16194 - Remove inappropriate params from api query object
Dave Greenberg [Sat, 28 Mar 2015 00:24:00 +0000 (17:24 -0700)]
Merge pull request #5507 from relldoesphp/CRM-16107-New
CRM-16107 fixes blank error with new payment and balance fields on participant report
Dave Greenberg [Fri, 27 Mar 2015 22:16:36 +0000 (15:16 -0700)]
Merge pull request #5453 from colemanw/CRM-16148
CRM-16148 - Show option names instead of ids in api explorer
Tyrell Cook [Fri, 27 Mar 2015 22:12:55 +0000 (18:12 -0400)]
Fixed errors with CRM-16107
Coleman Watts [Fri, 27 Mar 2015 01:26:19 +0000 (21:26 -0400)]
Update copyright date in comments
Coleman Watts [Fri, 27 Mar 2015 01:08:44 +0000 (21:08 -0400)]
Update version in comments
Coleman Watts [Fri, 27 Mar 2015 00:55:22 +0000 (20:55 -0400)]
Merge branch 4.5 into 4.6
Conflicts:
CRM/Event/Form/ManageEvent/Conference.php
Coleman Watts [Thu, 26 Mar 2015 18:17:37 +0000 (14:17 -0400)]
CRM-16155 - Use enityRef for mailing campaigns widget
Coleman Watts [Thu, 26 Mar 2015 16:51:15 +0000 (12:51 -0400)]
CRM-16155 - Limit past mailing selection
Coleman Watts [Thu, 26 Mar 2015 16:21:47 +0000 (12:21 -0400)]
CRM-16155 - Cleanup and optimize api calls to prefetch mailing data
Coleman Watts [Thu, 26 Mar 2015 15:50:26 +0000 (11:50 -0400)]
MailingUI - Fix display of campaigns
colemanw [Thu, 26 Mar 2015 14:18:26 +0000 (10:18 -0400)]
Merge pull request #5491 from colemanw/CRM-16186
CRM-16186 - Fix checkbox values
Coleman Watts [Thu, 26 Mar 2015 14:16:39 +0000 (10:16 -0400)]
CRM-16186 - Fix checkbox values
Coleman Watts [Thu, 26 Mar 2015 14:12:44 +0000 (10:12 -0400)]
CRM-16141 - String fix
colemanw [Thu, 26 Mar 2015 13:56:17 +0000 (09:56 -0400)]
Merge pull request #5486 from colemanw/CRM-16141
CRM-16141 - Fix untranslated strings in CaseType UI
Eileen McNaughton [Thu, 26 Mar 2015 11:53:39 +0000 (00:53 +1300)]
whitespace
Eileen McNaughton [Thu, 26 Mar 2015 11:43:57 +0000 (00:43 +1300)]
CRM-16184 CiviReport template, break connection between filters & fields for accordian display
Sometimes fields are not present and filters are and this can break the layout
Eileen McNaughton [Thu, 26 Mar 2015 11:28:29 +0000 (00:28 +1300)]
whitespace only
Eileen McNaughton [Thu, 26 Mar 2015 11:22:30 +0000 (00:22 +1300)]
CRM-16184 explicitly declare when to use an accordian rather than using magic
Kurund Jalmi [Thu, 26 Mar 2015 10:38:14 +0000 (16:08 +0530)]
Merge pull request #5485 from eileenmcnaughton/4.6
CRM-16182 strip with rollup from sql in add2group function
Kurund Jalmi [Thu, 26 Mar 2015 10:37:15 +0000 (16:07 +0530)]
Merge pull request #5487 from eileenmcnaughton/CRM-16165
CRM-16183 only format dates as dates and allow datetime fields (& presum...
Eileen McNaughton [Thu, 26 Mar 2015 02:49:04 +0000 (15:49 +1300)]
CRM-16183 Report datetime fields: display as datetime if specified as datetime (not date)
Coleman Watts [Thu, 26 Mar 2015 01:49:15 +0000 (21:49 -0400)]
CRM-16141 - Fix untranslated strings in CaseType UI
Eileen McNaughton [Thu, 26 Mar 2015 00:47:44 +0000 (13:47 +1300)]
a couple of comment fixes
Eileen McNaughton [Thu, 26 Mar 2015 00:45:05 +0000 (13:45 +1300)]
CRM-16182 strip with rollup from sql in add2group function
colemanw [Wed, 25 Mar 2015 19:42:15 +0000 (15:42 -0400)]
Merge pull request #5403 from eileenmcnaughton/CRM-16055-task-fixes
CRM-16055 fixes from broken relationship form
Coleman Watts [Wed, 25 Mar 2015 00:38:05 +0000 (20:38 -0400)]
CRM-16148 - Add missing option names to database
Coleman Watts [Tue, 24 Mar 2015 14:44:52 +0000 (10:44 -0400)]
Make api.getoptons contexts more discoverable
Coleman Watts [Fri, 20 Mar 2015 19:49:24 +0000 (15:49 -0400)]
CRM-16148 - Show option names instead of ids in api explorer
This adds a new context option to getoptions - "match"
Monish Deb [Wed, 25 Mar 2015 13:21:49 +0000 (18:51 +0530)]
Merge pull request #5480 from jitendrapurohit/CRM-16152
CRM-16152 - County is Not Saved When Sharing an Address the First Time
Monish Deb [Wed, 25 Mar 2015 13:21:03 +0000 (18:51 +0530)]
Merge pull request #5481 from jitendrapurohit/webtest46
webtest fixes
jitendrapurohit [Wed, 25 Mar 2015 13:03:55 +0000 (18:33 +0530)]
webtest fixes
jitendrapurohit [Wed, 25 Mar 2015 11:57:03 +0000 (17:27 +0530)]
CRM-16152 - County is Not Saved When Sharing an Address the First Time
CiviCRM [Wed, 25 Mar 2015 11:37:41 +0000 (04:37 -0700)]
Update version to 4.6.0
Eileen McNaughton [Wed, 25 Mar 2015 09:06:21 +0000 (22:06 +1300)]
Merge pull request #5479 from eileenmcnaughton/4.6
phpcs formatting & comments
Eileen McNaughton [Wed, 25 Mar 2015 06:59:15 +0000 (19:59 +1300)]
phpcs formatting & comments
Monish Deb [Wed, 25 Mar 2015 06:38:53 +0000 (12:08 +0530)]
Merge pull request #5474 from rohankatkar/CRM-16157
Option Group - Paper Size Options lost edit ability
Web Access [Wed, 25 Mar 2015 06:37:34 +0000 (12:07 +0530)]
Minor changes to CRM-16157
Web Access [Tue, 24 Mar 2015 12:37:22 +0000 (18:07 +0530)]
Fix for CRM-16157
Monish Deb [Wed, 25 Mar 2015 05:26:22 +0000 (10:56 +0530)]
Merge pull request #5475 from rohankatkar/CRM-16162
drupal-notices when geocoding addresses
Dave Greenberg [Tue, 24 Mar 2015 23:56:09 +0000 (16:56 -0700)]
Merge pull request #5468 from giant-rabbit/CRM-16100
Fix conference slot does not seem to save parent item. CRM-16100
Dave Greenberg [Tue, 24 Mar 2015 22:57:40 +0000 (15:57 -0700)]
Merge pull request #5477 from monishdeb/4.6
CRM-15605 minor fix
monishdeb [Tue, 24 Mar 2015 14:49:10 +0000 (20:19 +0530)]
minor fix
colemanw [Tue, 24 Mar 2015 14:02:13 +0000 (10:02 -0400)]
Merge pull request #5476 from colemanw/Api
Api explorer options improvements
Coleman Watts [Tue, 24 Mar 2015 13:56:16 +0000 (09:56 -0400)]
Api explorer options improvements
Web Access [Tue, 24 Mar 2015 13:45:12 +0000 (19:15 +0530)]
Fix for CRM-16162
Eileen McNaughton [Tue, 24 Mar 2015 07:24:07 +0000 (20:24 +1300)]
Merge pull request #5415 from eileenmcnaughton/4.6
CRM-16124, CRM-16125 fixes to support api complete_transaction
Kurund Jalmi [Tue, 24 Mar 2015 05:46:28 +0000 (11:16 +0530)]
Merge pull request #5466 from colemanw/Use
Use minified select2 css
Kurund Jalmi [Tue, 24 Mar 2015 05:46:11 +0000 (11:16 +0530)]
Merge pull request #5469 from colemanw/explorer
API Explorer - fix metadata lookup problem caused by unique names
Eileen McNaughton [Tue, 24 Mar 2015 05:34:34 +0000 (18:34 +1300)]
whitespace fix
projects / civicrm-core.git / log