Johan Vervloet [Fri, 6 Mar 2015 08:07:29 +0000 (09:07 +0100)]
Fixed whitespace issues.
Johan Vervloet [Fri, 6 Mar 2015 07:53:56 +0000 (08:53 +0100)]
Free the query DAO.
Not sure whether this is really necessary. But I just did to
be safe.
Johan Vervloet [Thu, 5 Mar 2015 15:11:22 +0000 (16:11 +0100)]
Sort and limit options.
Johan Vervloet [Thu, 5 Mar 2015 14:37:02 +0000 (15:37 +0100)]
Support other filters than '='.
Johan Vervloet [Thu, 5 Mar 2015 13:10:10 +0000 (14:10 +0100)]
Populate $select_fields more efficiently.
Johan Vervloet [Thu, 5 Mar 2015 12:31:50 +0000 (13:31 +0100)]
Return all fields if no return option is given.
Johan Vervloet [Thu, 5 Mar 2015 12:12:36 +0000 (13:12 +0100)]
Changed key and values of the $select_fields array.
Because that seems to be more intuitive.
Johan Vervloet [Thu, 5 Mar 2015 11:35:22 +0000 (12:35 +0100)]
Some code refactoring.
Johan Vervloet [Wed, 4 Mar 2015 20:47:57 +0000 (21:47 +0100)]
Return fields as requested by the return option.
Johan Vervloet [Wed, 4 Mar 2015 09:33:46 +0000 (10:33 +0100)]
Some documentation, and better handling of fields to select.
The fields to select are still hard coded. But this is work
in progress.
Johan Vervloet [Tue, 3 Mar 2015 21:00:50 +0000 (22:00 +0100)]
Filter on custom fields.
civicrm_api3_get_using_query_object_simple now allows filtering on custom fields.
Johan Vervloet [Tue, 3 Mar 2015 20:31:23 +0000 (21:31 +0100)]
Created a custom civicrm_api3_get_using_query_object.
One to work around the issue. Still lots of TODOs.
If you filter on a custom field using the api, the custom
get_using_query_object is used. And it still ignores the
custom fields :-)
Johan Vervloet [Mon, 2 Mar 2015 10:39:43 +0000 (11:39 +0100)]
CRM-16036 - unit test: search event on custom field.
This test fails.
----------------------------------------
* CRM-16036: API: searching events on custom fields does not work
https://issues.civicrm.org/jira/browse/CRM-16036
Eileen McNaughton [Wed, 12 Aug 2015 23:18:39 +0000 (11:18 +1200)]
Merge pull request #6471 from eileenmcnaughton/master
CRM-16996 fix regression on form rule
Tim Otten [Wed, 12 Aug 2015 22:01:00 +0000 (15:01 -0700)]
Merge pull request #6457 from GinkgoFJG/angular_snippets
Fixes for CRM-16994 and CRM-16995.
Frank J. Gómez [Wed, 12 Aug 2015 19:21:50 +0000 (15:21 -0400)]
CRM-16994: Removed code that made too many assumptions about what the link passed to the tabset would be.
Frank J. Gómez [Wed, 12 Aug 2015 19:00:33 +0000 (15:00 -0400)]
CRM-16995: Documentation improvements.
Frank J. Gómez [Wed, 12 Aug 2015 18:49:24 +0000 (14:49 -0400)]
CRM-16995: Addressed XSS vulnerability.
Yashodha Chaku [Wed, 12 Aug 2015 10:51:41 +0000 (16:21 +0530)]
Merge pull request #6482 from sudhabisht/CRM-17005
Upgrade changes for renaming Palestinian Territory in country list
Kurund Jalmi [Wed, 12 Aug 2015 10:50:08 +0000 (16:20 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-12-15-44-44
Conflicts:
CRM/Contribute/BAO/Contribution/Utils.php
templates/CRM/Contribute/Form/Contribution/Main.tpl
tests/phpunit/CiviTest/CiviSeleniumTestCase.php
Yashodha Chaku [Wed, 12 Aug 2015 08:25:33 +0000 (13:55 +0530)]
Merge pull request #6350 from PalanteJon/CRM-16939-4.6
CRM-16939 - Allow exporting current employers > 64 characters
Monish Deb [Wed, 12 Aug 2015 07:32:58 +0000 (13:02 +0530)]
Merge pull request #6470 from monishdeb/CRM-17006
CRM-17006 fix - Advanced search on radio custom fields broken
Monish Deb [Wed, 12 Aug 2015 06:49:30 +0000 (12:19 +0530)]
Merge pull request #6427 from eileenmcnaughton/CRM-16975
CRM-16975 fix for membership price set config - backport 4.7 code tha…
Kurund Jalmi [Wed, 12 Aug 2015 06:40:33 +0000 (12:10 +0530)]
Merge pull request #6477 from shawnholt/country-update
CRM-17005 Removed word "Occupied" from Country PS
Monish Deb [Wed, 12 Aug 2015 06:27:32 +0000 (11:57 +0530)]
Merge pull request #6481 from yashodha/CRM-16985
CRM-16985: Inline edit LABEL on Option Value selector updates NAME in…
Sudha Bisht [Wed, 12 Aug 2015 06:22:04 +0000 (11:52 +0530)]
Upgrade changes
Kurund Jalmi [Wed, 12 Aug 2015 04:40:24 +0000 (10:10 +0530)]
Merge pull request #6441 from monishdeb/4.6
CRM-14536 fix - Free Membership still submits to payment processor
colemanw [Wed, 12 Aug 2015 01:38:23 +0000 (21:38 -0400)]
Merge pull request #6475 from colemanw/CRM-16806
CRM-16806 - Additional cleanup
colemanw [Wed, 12 Aug 2015 01:37:53 +0000 (21:37 -0400)]
Merge pull request #6436 from seamuslee001/msgtemplate_dynamic_load
CRM-16983 Dynamically load the content of Message templates in CiviMail when se…
Eileen McNaughton [Tue, 11 Aug 2015 21:42:04 +0000 (09:42 +1200)]
Merge pull request #6468 from eileenmcnaughton/CRM-17010
CRM-17010 add data info to price-set-class
Seamus Lee [Tue, 11 Aug 2015 21:11:56 +0000 (21:11 +0000)]
Move to getsingle api and associated changes
shawnholt [Tue, 11 Aug 2015 21:06:42 +0000 (17:06 -0400)]
Removed word "Occupied" from Country PS
eileenmcnaugton [Tue, 11 Aug 2015 12:34:53 +0000 (00:34 +1200)]
CRM-16996 instead of requiring a financial_type_id when a priceset is selected use the price set one
Eileen McNaughton [Tue, 11 Aug 2015 20:36:45 +0000 (08:36 +1200)]
Merge pull request #6473 from colemanw/CRM-16809
CRM-16809 - Don't generate qfKey for payment snippet
Coleman Watts [Tue, 11 Aug 2015 19:12:30 +0000 (15:12 -0400)]
CRM-16806 - Additional cleanup
colemanw [Tue, 11 Aug 2015 19:03:16 +0000 (15:03 -0400)]
Merge pull request #6177 from xurizaemon/CRM-16806
CRM-16806: Validate supplied entity type.
Coleman Watts [Tue, 11 Aug 2015 17:16:51 +0000 (13:16 -0400)]
Merge branch '4.6' into master
Conflicts:
CRM/Member/Form/Membership.php
colemanw [Tue, 11 Aug 2015 17:16:13 +0000 (13:16 -0400)]
Merge pull request #6462 from eileenmcnaughton/4.6
CRM-16993 actual fix on not crashing when recurring is paid …
Coleman Watts [Tue, 11 Aug 2015 17:15:26 +0000 (13:15 -0400)]
Merge branch '4.6' into master
Coleman Watts [Tue, 11 Aug 2015 15:02:06 +0000 (11:02 -0400)]
CRM-16809 - Don't generate qfKey for payment snippet
colemanw [Tue, 11 Aug 2015 14:40:40 +0000 (10:40 -0400)]
Merge pull request #6472 from colemanw/CRM-16809
CRM-16809 - Hide contribution submit buttons for paypal express
Coleman Watts [Tue, 11 Aug 2015 14:29:06 +0000 (10:29 -0400)]
CRM-16809 - Hide contribution submit buttons for paypal express
yashodha [Tue, 11 Aug 2015 13:09:35 +0000 (18:39 +0530)]
CRM-16985: Inline edit LABEL on Option Value selector updates NAME instead
----------------------------------------
* CRM-16985: Inline edit LABEL on Option Value selector updates NAME instead
https://issues.civicrm.org/jira/browse/CRM-16985
monishdeb [Tue, 11 Aug 2015 12:54:50 +0000 (18:24 +0530)]
Format fix
eileenmcnaugton [Tue, 11 Aug 2015 12:10:15 +0000 (00:10 +1200)]
CRM-16996 fix regression on form rule
monishdeb [Tue, 11 Aug 2015 11:27:22 +0000 (16:57 +0530)]
CRM-17006 fix - Advanced search on radio custom fields broken
https://issues.civicrm.org/jira/browse/CRM-17006
eileenmcnaugton [Tue, 11 Aug 2015 05:46:37 +0000 (17:46 +1200)]
CRM-17010 add data info to price-set-class
colemanw [Tue, 11 Aug 2015 01:52:16 +0000 (21:52 -0400)]
Merge pull request #6466 from seamuslee001/permisssion_fixup_4.6
CRM-17003 Output Administer Multiple Organisation permission as an ar…
Tim Otten [Tue, 11 Aug 2015 01:24:01 +0000 (18:24 -0700)]
Merge pull request #6339 from cividesk/Fortify_Fixes
Fortify fixes
Seamus Lee [Mon, 10 Aug 2015 21:38:47 +0000 (21:38 +0000)]
CRM-17003 Output Administer Multiple Organisation permission as an array not as string
Coleman Watts [Mon, 10 Aug 2015 18:10:29 +0000 (14:10 -0400)]
CRM-13823 - Remove unused file
Coleman Watts [Mon, 10 Aug 2015 17:07:43 +0000 (13:07 -0400)]
Merge https://github.com/civicrm/civicrm-core/pull/6276
Conflicts:
CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
colemanw [Mon, 10 Aug 2015 16:43:48 +0000 (12:43 -0400)]
Merge pull request #6465 from colemanw/CRM-16689
CRM-16689 - Add case number to unclosed case autocomplete results
Coleman Watts [Mon, 10 Aug 2015 16:37:43 +0000 (12:37 -0400)]
CRM-16689 - Add case number to unclosed case autocomplete results
Yashodha Chaku [Mon, 10 Aug 2015 12:43:12 +0000 (18:13 +0530)]
Merge pull request #6459 from yashodha/CRM-12081
CRM-12081: Label on field is wrong for recurring contributions
Yashodha Chaku [Mon, 10 Aug 2015 11:52:11 +0000 (17:22 +0530)]
Merge pull request #6460 from yashodha/CRM-16943
notice fix
eileenmcnaugton [Mon, 10 Aug 2015 04:17:01 +0000 (16:17 +1200)]
CRM-16993 avoid fatal when line items are created & then altered to completed
monishdeb [Mon, 10 Aug 2015 10:31:22 +0000 (16:01 +0530)]
Webtests and improvisations
monishdeb [Fri, 7 Aug 2015 17:43:07 +0000 (23:13 +0530)]
CRM-14536 fix - Free Membership still submits to payment processor
https://issues.civicrm.org/jira/browse/CRM-14536
Kurund Jalmi [Mon, 10 Aug 2015 10:14:07 +0000 (15:44 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-10-15-41-33
Eileen McNaughton [Mon, 10 Aug 2015 10:05:24 +0000 (22:05 +1200)]
Merge pull request #6456 from eileenmcnaughton/CRM-16993
CRM-16993 Back-office membership form: fix fatal on recur with instant processor
Eileen McNaughton [Mon, 10 Aug 2015 07:45:53 +0000 (19:45 +1200)]
Merge pull request #6455 from eileenmcnaughton/master
CRM-16692 follow-up fix, move assumptions back to calling-form
Tim Otten [Mon, 10 Aug 2015 07:08:17 +0000 (00:08 -0700)]
Merge pull request #6458 from totten/4.6-toxic-list
INFRA-142 - Add .toxic.json
Tim Otten [Mon, 10 Aug 2015 06:27:38 +0000 (23:27 -0700)]
INFRA-142 - distmaker - (Precaution) Exclude .toxic.json
This file shouldn't show up in the root (since dm_install_core uses a
whitelist), but if we add it to other repos, it could show there.
yashodha [Mon, 10 Aug 2015 06:15:27 +0000 (11:45 +0530)]
notice fix
yashodha [Mon, 10 Aug 2015 06:03:09 +0000 (11:33 +0530)]
CRM-12081: Label on field is wrong for recurring contributions
----------------------------------------
* CRM-12081: Label on field is wrong for recurring contributions
https://issues.civicrm.org/jira/browse/CRM-12081
Monish Deb [Mon, 10 Aug 2015 05:36:18 +0000 (11:06 +0530)]
Merge pull request #6037 from colemanw/CRM-16512
CRM-16512 - Hide dashboard related contact table for users without 'view my contact'
Yashodha Chaku [Mon, 10 Aug 2015 05:11:09 +0000 (10:41 +0530)]
Merge pull request #6438 from yashodha/CRM-16943
CRM-16943: CRM_Core_Form_Search assumes a checkbox. CiviGrant dashboa…
Monish Deb [Mon, 10 Aug 2015 04:39:13 +0000 (10:09 +0530)]
Merge pull request #6439 from sudhabisht/CRM-16978
Fix for multiple role assignment between same contact cases
Frank J. Gómez [Mon, 10 Aug 2015 03:58:43 +0000 (23:58 -0400)]
Resolved notice when URL has no fragment.
Frank J. Gómez [Mon, 10 Aug 2015 03:57:51 +0000 (23:57 -0400)]
Removed unnecessary flag variable in template.
Frank J. Gómez [Mon, 10 Aug 2015 03:55:29 +0000 (23:55 -0400)]
Cleaned up comments and whitespace.
eileenmcnaugton [Mon, 10 Aug 2015 03:52:16 +0000 (15:52 +1200)]
CRM-16993 actual fix on not crashing when recurring is paid
eileenmcnaugton [Mon, 10 Aug 2015 02:38:48 +0000 (14:38 +1200)]
CRM-16993 test to replicate failure
eileenmcnaugton [Mon, 10 Aug 2015 02:31:03 +0000 (14:31 +1200)]
CRM-16692 follow-up fix, move assumptions back to calling-form
eileenmcnaugton [Mon, 10 Aug 2015 01:42:25 +0000 (13:42 +1200)]
CRM-16692 follow up removal of unused variables
Eileen McNaughton [Mon, 10 Aug 2015 03:44:31 +0000 (15:44 +1200)]
Merge pull request #6454 from eileenmcnaughton/master
CRM-16992 preliminary tidy-up - push extraction of parameters back to form
eileenmcnaugton [Mon, 10 Aug 2015 01:33:46 +0000 (13:33 +1200)]
CRM-16692 fix for incorrect line items
eileenmcnaugton [Mon, 10 Aug 2015 01:20:25 +0000 (13:20 +1200)]
CRM-16692 test
eileenmcnaugton [Mon, 10 Aug 2015 00:56:55 +0000 (12:56 +1200)]
CRM-16992 preliminary tidy-up - push extraction of parameters back to the form layer
eileenmcnaugton [Tue, 4 Aug 2015 11:59:29 +0000 (23:59 +1200)]
remove unused fn (did this
'come back' from a 4.6 merge - I thought it was gone
Eileen McNaughton [Mon, 10 Aug 2015 01:07:22 +0000 (13:07 +1200)]
Merge pull request #6450 from civicrm/4.6
Merge 4.6 to master
colemanw [Sun, 9 Aug 2015 21:59:15 +0000 (17:59 -0400)]
Merge pull request #6453 from colemanw/i18n
CRM-15375 - Fix incorrect default language in i18n form
Coleman Watts [Sun, 9 Aug 2015 02:16:39 +0000 (22:16 -0400)]
CRM-15375 - Fix incorrect default language in i18n form
colemanw [Sun, 9 Aug 2015 21:05:22 +0000 (17:05 -0400)]
Merge pull request #6451 from colemanw/i18n
CRM-13301 - Add multilingual popup to participant status label
colemanw [Sun, 9 Aug 2015 19:35:27 +0000 (15:35 -0400)]
Merge pull request #6435 from seamuslee001/mailing_ui_tidy_up
CRM-16991 Order Header and Footer lists by name field not by table id
Monish Deb [Sun, 9 Aug 2015 10:49:01 +0000 (16:19 +0530)]
Merge pull request #6440 from jitendrapurohit/CRM-14706
CRM-14706 -- Relationship contact reports with group and relation typ…
Monish Deb [Sun, 9 Aug 2015 10:38:16 +0000 (16:08 +0530)]
Merge pull request #6449 from monishdeb/master
Resolved merge conflict on CustomQuery file
monishdeb [Sun, 9 Aug 2015 10:35:44 +0000 (16:05 +0530)]
Resolved merge conflict on CustomQuery file
Seamus Lee [Sun, 9 Aug 2015 05:13:49 +0000 (05:13 +0000)]
Fix issue of now not already filterinng down to object within values array
Coleman Watts [Sun, 9 Aug 2015 02:14:22 +0000 (22:14 -0400)]
CRM-13301 - Add multilingual popup to participant status label
colemanw [Sat, 8 Aug 2015 14:27:40 +0000 (10:27 -0400)]
Merge pull request #6429 from mallezie/crm-16976
CRM-16976 allow to filter campaigns based on active state
colemanw [Sat, 8 Aug 2015 14:20:32 +0000 (10:20 -0400)]
Merge pull request #6381 from colemanw/CRM-14055
CRM-14055 - Allow creating an event template via api
colemanw [Sat, 8 Aug 2015 14:18:36 +0000 (10:18 -0400)]
Merge pull request #6394 from colemanw/CRM-14599
CRM-14599 - Exclude deleted contacts from test mailing
Tim Otten [Sat, 8 Aug 2015 04:04:53 +0000 (21:04 -0700)]
INFRA-142 - Add .toxic.json
colemanw [Sat, 8 Aug 2015 01:33:49 +0000 (21:33 -0400)]
Merge pull request #6443 from colemanw/CRM-12527
CRM-12527 - Don't let devel footer break json responses
Coleman Watts [Sat, 8 Aug 2015 00:04:46 +0000 (20:04 -0400)]
CRM-12527 - Show devel footer in api explorer output
colemanw [Fri, 7 Aug 2015 20:57:51 +0000 (16:57 -0400)]
Merge pull request #6442 from colemanw/CRM-12021
CRM-12021 - Don't allow no default location type
Coleman Watts [Fri, 7 Aug 2015 20:23:57 +0000 (16:23 -0400)]
CRM-12527 - Set http headers in CMS-compatible way
Coleman Watts [Fri, 7 Aug 2015 18:43:50 +0000 (14:43 -0400)]
CRM-12021 - Don't allow no default location type
projects / civicrm-core.git / log