kurund [Tue, 25 Feb 2014 10:30:49 +0000 (16:00 +0530)]
Revert "Merge pull request #2543 from kurund/CRM-14241"
This reverts commit
05288fce26229abf39dec0166075e388d56b1848, reversing
changes made to
516ee52acea65cc19face3cf3e3e880457ce125a.
Kurund Jalmi [Tue, 25 Feb 2014 10:25:52 +0000 (15:55 +0530)]
Merge pull request #2543 from kurund/CRM-14241
CRM-14241, added entities generated from xml
Dave Greenberg [Tue, 25 Feb 2014 00:42:19 +0000 (16:42 -0800)]
Merge pull request #2553 from davecivicrm/CRM-14227
CRM-14227 - add Order By Registration Date to Participant Listing report...
Dave Greenberg [Tue, 25 Feb 2014 00:41:12 +0000 (16:41 -0800)]
CRM-14227 - add Order By Registration Date to Participant Listing report.
----------------------------------------
* CRM-14227: Enable sorting the participant listing report by register date
http://issues.civicrm.org/jira/browse/CRM-14227
Dave Greenberg [Mon, 24 Feb 2014 20:13:08 +0000 (12:13 -0800)]
Merge pull request #2539 from PalanteJon/CRM-14223
CRM-14223 - CiviEvent - don't count test registrations when returning pa...
Dave Greenberg [Mon, 24 Feb 2014 18:05:43 +0000 (10:05 -0800)]
Merge pull request #2546 from brylie/master
Moved "Top of page" profile below introductory text.
Kurund Jalmi [Mon, 24 Feb 2014 12:53:27 +0000 (18:23 +0530)]
Merge pull request #2549 from jitendrapurohit/CRM-13833
api_v3_ContributionTest for CRM-13833
jitendrapurohit [Mon, 24 Feb 2014 11:21:30 +0000 (16:51 +0530)]
api test for CRM-13833
Tim Otten [Sun, 23 Feb 2014 20:33:00 +0000 (12:33 -0800)]
Merge pull request #2548 from rcsheets/doc_improvements
Misc documentation improvements in CRM/Utils/System.php
Robert C. Sheets [Sun, 23 Feb 2014 15:49:12 +0000 (07:49 -0800)]
more phpdoc comment cleanup
Brylie Oxley [Sun, 23 Feb 2014 03:25:57 +0000 (19:25 -0800)]
Moved customPre below cidzero.tpl and addl participants. Moved CMSUser.tpl above customPre.
Brylie Oxley [Sat, 22 Feb 2014 21:42:23 +0000 (13:42 -0800)]
Moved "Top of page" profile below introductory text, to align with the documentation.
kurund [Fri, 21 Feb 2014 11:35:30 +0000 (17:05 +0530)]
CRM-14241, added more comments
----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
http://issues.civicrm.org/jira/browse/CRM-14241
kurund [Fri, 21 Feb 2014 11:02:14 +0000 (16:32 +0530)]
CRM-14241, skip case related entities
----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
http://issues.civicrm.org/jira/browse/CRM-14241
kurund [Fri, 21 Feb 2014 10:56:43 +0000 (16:26 +0530)]
CRM-14241, adding entities generated from xml files
----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
http://issues.civicrm.org/jira/browse/CRM-14241
kurund [Fri, 21 Feb 2014 10:45:02 +0000 (16:15 +0530)]
removed unwanted xml CRM-14241
----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
http://issues.civicrm.org/jira/browse/CRM-14241
kurund [Fri, 21 Feb 2014 10:43:25 +0000 (16:13 +0530)]
CRM-14241, more fixes to entity generation
----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
http://issues.civicrm.org/jira/browse/CRM-14241
kurund [Fri, 21 Feb 2014 05:07:26 +0000 (10:37 +0530)]
CRM-14241, fixes to entity generation: FK fixes
----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
http://issues.civicrm.org/jira/browse/CRM-14241
kurund [Fri, 21 Feb 2014 04:40:25 +0000 (10:10 +0530)]
CRM-14241, fixes to entity generation
----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
http://issues.civicrm.org/jira/browse/CRM-14241
Tim Otten [Thu, 20 Feb 2014 23:47:07 +0000 (15:47 -0800)]
Merge pull request #2542 from totten/master-gencode-uid
GenCode - Ensure separate temp dirs on multi-user system
Tim Otten [Thu, 20 Feb 2014 23:46:14 +0000 (15:46 -0800)]
GenCode - Ensure separate temp dirs on multi-user system
Tim Otten [Thu, 20 Feb 2014 23:22:30 +0000 (15:22 -0800)]
Merge pull request #2540 from eileenmcnaughton/CRM-14235
Crm 14235
Jon goldberg - Linux laptop [Sat, 15 Feb 2014 16:02:02 +0000 (11:02 -0500)]
CRM-14223 - CiviEvent - don't count test registrations when returning participant counts
----------------------------------------
* CRM-14223:
http://issues.civicrm.org/jira/browse/CRM-14223
Robert C. Sheets [Thu, 20 Feb 2014 08:44:36 +0000 (00:44 -0800)]
Tried to clean up comments a bit, following Drupal comment standards
kurund [Thu, 20 Feb 2014 07:32:24 +0000 (13:02 +0530)]
CRM-14241, fixes to generate both DAO and entities
----------------------------------------
* CRM-14241: setup new repo for doctrine integration work
http://issues.civicrm.org/jira/browse/CRM-14241
Eileen McNaughton [Thu, 20 Feb 2014 05:43:14 +0000 (18:43 +1300)]
towards drupal 8 - move common permissionDenied fn
Eileen McNaughton [Thu, 20 Feb 2014 03:44:31 +0000 (16:44 +1300)]
Add Drupal 8 UF classes
Eileen McNaughton [Thu, 20 Feb 2014 03:43:26 +0000 (16:43 +1300)]
Drupal 8 prep - refactor retrieval of uniqID in synch class
Eileen McNaughton [Thu, 20 Feb 2014 02:52:35 +0000 (15:52 +1300)]
Drupal 8 preparation - move userFramework ID retrieval to UF classes
Tim Otten [Wed, 19 Feb 2014 01:37:09 +0000 (17:37 -0800)]
Merge pull request #2535 from totten/master-symfony-ws
CRM-13986 - CRM_Core_Invoke - Handle HTML and WS requests differently
Tim Otten [Wed, 19 Feb 2014 01:33:24 +0000 (17:33 -0800)]
CRM-13986 - CRM_Core_Invoke - Handle HTML and WS requests differently
For HTML, use the CMS's output mechanism (with its theming, etc)
For web services (or any non-HTML content), use Symfony's output mechanism
Coleman Watts [Tue, 18 Feb 2014 16:50:21 +0000 (08:50 -0800)]
Batch entry label change
colemanw [Tue, 18 Feb 2014 15:14:55 +0000 (07:14 -0800)]
Merge pull request #2532 from colemanw/ac2
Work on refactoring autocompletes
Kurund Jalmi [Tue, 18 Feb 2014 12:41:51 +0000 (18:11 +0530)]
Merge pull request #2523 from mlutfy/4.5-crm14319
CRM-14219: templates/CRM/PCP/Form/Campaign.tpl: convert markup from tables to divs.
Coleman Watts [Tue, 18 Feb 2014 06:00:59 +0000 (22:00 -0800)]
CRM-13929 Cleanup activity form
Coleman Watts [Mon, 17 Feb 2014 23:55:46 +0000 (15:55 -0800)]
CRM-13929 Refactor contribution forms
Kurund Jalmi [Tue, 18 Feb 2014 02:36:29 +0000 (08:06 +0530)]
Merge pull request #2530 from monishdeb/CRM-14195
CRM-14195 fix - Fix buildACLClause for Activity Reports
kurund [Tue, 18 Feb 2014 02:32:16 +0000 (08:02 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-18-07-54-54
Conflicts:
CRM/Utils/Hook/Joomla.php
api/v3/examples/LocBlock/Create.php
api/v3/examples/LocBlock/CreateEntities.php
api/v3/examples/LocBlock/Get.php
api/v3/examples/LocBlock/createEntities.php
api/v3/examples/LocBlock/getEntities.php
api/v3/examples/LocBlock/simpleCreate.php
api/v3/examples/LocBlockCreate.php
api/v3/examples/LocBlockCreateEntities.php
api/v3/examples/LocBlockGet.php
Coleman Watts [Mon, 17 Feb 2014 22:17:53 +0000 (14:17 -0800)]
More icon fixes - should all be multiples of 16
Coleman Watts [Mon, 17 Feb 2014 05:31:44 +0000 (21:31 -0800)]
CRM-13929 Refactor membership forms
monishdeb [Mon, 17 Feb 2014 13:45:48 +0000 (19:15 +0530)]
CRM-14195 fix - Fix buildACLClause for Activity Reports
http://issues.civicrm.org/jira/browse/CRM-14195
Eileen McNaughton [Mon, 17 Feb 2014 05:31:13 +0000 (18:31 +1300)]
CRM-14235 Preparation for Drupal 8
fix permission hook class
Coleman Watts [Mon, 17 Feb 2014 04:49:51 +0000 (20:49 -0800)]
Make showHideByValue a bit less crash prone
dlobo [Mon, 17 Feb 2014 01:02:03 +0000 (17:02 -0800)]
Merge pull request #2528 from fuzionnz/CRM-14228
CRM-14228. Correct spelling of Waikato.
Chris Burgess [Sun, 16 Feb 2014 02:26:33 +0000 (15:26 +1300)]
CRM-14228. Correct spelling of Waikato.
Coleman Watts [Sun, 16 Feb 2014 00:53:23 +0000 (16:53 -0800)]
CRM-13929 Refactor shared address form
Coleman Watts [Sun, 16 Feb 2014 00:24:05 +0000 (16:24 -0800)]
CRM-13929 Refactor participant form
Coleman Watts [Sun, 16 Feb 2014 00:18:19 +0000 (16:18 -0800)]
CRM-13929 Refactor pledge form
Coleman Watts [Sun, 16 Feb 2014 00:09:21 +0000 (16:09 -0800)]
CRM-13929 Refactor grant form
Coleman Watts [Sat, 15 Feb 2014 23:48:24 +0000 (15:48 -0800)]
CRM-13929 Refactor case form
Coleman Watts [Sat, 15 Feb 2014 04:57:00 +0000 (20:57 -0800)]
CRM-13929 Refactor current employer field
Coleman Watts [Sat, 15 Feb 2014 01:29:16 +0000 (17:29 -0800)]
CRM-13929 Translate select2 stings for i18n
kurund [Wed, 18 Dec 2013 21:42:10 +0000 (13:42 -0800)]
minor fix for entity generation
kurund [Mon, 16 Dec 2013 18:33:47 +0000 (10:33 -0800)]
by default set entity generation to false CRM-13938
----------------------------------------
* CRM-13938: Create Annotations for entity files
http://issues.civicrm.org/jira/browse/CRM-13938
kurund [Fri, 13 Dec 2013 00:48:37 +0000 (16:48 -0800)]
CRM-13938, add fk / join annotation
----------------------------------------
* CRM-13938: Create Annotations for entity files
http://issues.civicrm.org/jira/browse/CRM-13938
kurund [Thu, 12 Dec 2013 23:41:34 +0000 (15:41 -0800)]
CRM-13938, added table info
----------------------------------------
* CRM-13938: Create Annotations for entity files
http://issues.civicrm.org/jira/browse/CRM-13938
kurund [Sat, 15 Feb 2014 01:04:14 +0000 (17:04 -0800)]
Coleman Watts [Sat, 15 Feb 2014 00:23:21 +0000 (16:23 -0800)]
Activity.tpl tweak
Coleman Watts [Sat, 15 Feb 2014 00:01:23 +0000 (16:01 -0800)]
CRM-13929 Select2 css tweaks
dlobo [Fri, 14 Feb 2014 19:42:50 +0000 (11:42 -0800)]
Merge pull request #2525 from mattrenner/payexpress-dps-strict-compatibility
CRM-14221 - Improving Payment Express/DPS payment processor strict stand...
Matt Renner [Fri, 14 Feb 2014 03:49:50 +0000 (16:49 +1300)]
CRM-14221 - Improving Payment Express/DPS payment processor strict standards compatibility
I'm running a fairly recent version of PHP, and have strict standards turned on.. so the Payment Express component was spewing warnings and errors about non-static functions being called statically and the singleton function not being compatible with its parent.
The solution, make the CRM_Core_Payment_PaymentExpressUtils functions static, and change the definition of the CRM_Core_Payment_PaymentExpress and CRM_Core_Payment_PaymentExpressIPN singleton() functions to match that in CRM_Core_Payment
I also discovered an undefined CURL option in CRM_Core_Payment_PaymentExpressUtils that was being set - This doesn't do anything and causes a warning so I removed it.
colemanw [Fri, 14 Feb 2014 02:50:50 +0000 (18:50 -0800)]
Merge pull request #2524 from colemanw/multiEntityRef
Autocomplete work
Coleman Watts [Fri, 14 Feb 2014 01:06:59 +0000 (17:06 -0800)]
CRM-13929 Add contact icon to autocomplete results
Coleman Watts [Fri, 14 Feb 2014 00:37:06 +0000 (16:37 -0800)]
CRM-13929 Fix add new js
Coleman Watts [Fri, 14 Feb 2014 00:26:03 +0000 (16:26 -0800)]
Actvity tpl cleanup
dlobo [Fri, 14 Feb 2014 00:31:01 +0000 (16:31 -0800)]
Merge pull request #2522 from mlutfy/4.4-crm14217
CRM-14217: Fixes for CSS of PCPAccount pages (also affects profiles) where the password/confirm fields are shown.
Mathieu Lutfy [Fri, 14 Feb 2014 00:27:45 +0000 (19:27 -0500)]
CRM-14219: templates/CRM/PCP/Form/Campaign.tpl: convert markup from tables to divs.
Coleman Watts [Fri, 14 Feb 2014 00:19:29 +0000 (16:19 -0800)]
Fix icon positioning - should all be multiples of 16
Coleman Watts [Fri, 14 Feb 2014 00:03:13 +0000 (16:03 -0800)]
CRM-13929 Decouple entityRef field rendering from CRM_Core_Form
Coleman Watts [Thu, 13 Feb 2014 23:54:46 +0000 (15:54 -0800)]
CRM-13929 Refactor activity form contactRef fields
Mathieu Lutfy [Thu, 13 Feb 2014 22:22:54 +0000 (17:22 -0500)]
CRM-14217: Fixes for CSS of PCPAccount pages (also affects profiles) where the password/confirm fields are shown.
Kurund Jalmi [Thu, 13 Feb 2014 21:52:11 +0000 (13:52 -0800)]
Merge pull request #2518 from PoonamNalawade/test-master
--Added contact_type parameter for ajax autocomplete field
Kurund Jalmi [Thu, 13 Feb 2014 21:51:13 +0000 (13:51 -0800)]
Merge pull request #2515 from colemanw/ac3
CRM-14165 - HR-221 Further abstract options editing to work with civiHR
Kurund Jalmi [Thu, 13 Feb 2014 21:32:16 +0000 (13:32 -0800)]
Merge pull request #2521 from kurund/CRM-14181
CRM-14181, migrate enum to varchar
kurund [Thu, 13 Feb 2014 21:28:13 +0000 (13:28 -0800)]
CRM-14181, more clean and fixes to support callback
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
Dave Greenberg [Thu, 13 Feb 2014 21:24:23 +0000 (13:24 -0800)]
Merge pull request #2520 from davecivicrm/CRM-14193
CRM-14193 - Add CiviMail component setting to control Dedupe Mailings op...
Dave Greenberg [Thu, 13 Feb 2014 21:21:11 +0000 (13:21 -0800)]
CRM-14193 - Add CiviMail component setting to control Dedupe Mailings option. This PR replaces PR 2497 which had fatal syntax error (missing comma) in Mailing.setting.php
----------------------------------------
* CRM-14193: Add option to default Civimail "dedupe e-mail" setting to true
http://issues.civicrm.org/jira/browse/CRM-14193
kurund [Thu, 13 Feb 2014 20:35:04 +0000 (12:35 -0800)]
CRM-14181, gencode fixes to generate correct DAO and modified pseudoconstant to handle callback
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
Coleman Watts [Thu, 13 Feb 2014 19:43:36 +0000 (11:43 -0800)]
CRM-13929 Update contactRef renderer
Kurund Jalmi [Thu, 13 Feb 2014 18:11:15 +0000 (10:11 -0800)]
Merge pull request #2519 from jitendrapurohit/CRM-13833
Removal of copy icon and is_default expose in edit form of Soft Credit t...
jitendrapurohit [Thu, 13 Feb 2014 12:58:46 +0000 (18:28 +0530)]
Removal of copy icon and is_default expose in edit form of Soft Credit type
Coleman Watts [Thu, 13 Feb 2014 07:06:11 +0000 (23:06 -0800)]
CRM-13929 - Develop entityRef create mode
Coleman Watts [Thu, 13 Feb 2014 07:03:06 +0000 (23:03 -0800)]
Update campaign field labels
Poonam [Thu, 13 Feb 2014 06:00:35 +0000 (11:30 +0530)]
--Added contact_type parameter for ajax autocomplete field
kurund [Thu, 13 Feb 2014 05:53:36 +0000 (21:53 -0800)]
CRM-14181, add callback function, so that enums are accessible via api etc
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
kurund [Thu, 13 Feb 2014 05:06:41 +0000 (21:06 -0800)]
CRM-14181, add callback function, so that enums are accessible via api etc
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
colemanw [Thu, 13 Feb 2014 02:33:52 +0000 (18:33 -0800)]
Merge pull request #2517 from eileenmcnaughton/examples
Examples
Dave Greenberg [Thu, 13 Feb 2014 01:48:16 +0000 (17:48 -0800)]
Merge pull request #2516 from davecivicrm/CRM-13965
CRM-13965 - label, status and display changes for AdditionalPayment form...
Dave Greenberg [Thu, 13 Feb 2014 01:47:26 +0000 (17:47 -0800)]
CRM-13965 - label, status and display changes for AdditionalPayment form.
----------------------------------------
* CRM-13965: Record additional payments or refunds for pending-pay later OR partially paid event registrations
http://issues.civicrm.org/jira/browse/CRM-13965
Eileen [Thu, 13 Feb 2014 00:55:49 +0000 (00:55 +0000)]
updated examples
Coleman Watts [Wed, 12 Feb 2014 23:47:30 +0000 (15:47 -0800)]
CRM-14165 - HR-221 Further abstract options editing to work with civiHR
colemanw [Wed, 12 Feb 2014 19:41:59 +0000 (11:41 -0800)]
Merge pull request #2514 from colemanw/ac2
CRM-13966 - Work on autocomplete refactoring
Coleman Watts [Wed, 12 Feb 2014 19:00:25 +0000 (11:00 -0800)]
CRM-13966 - Refactor group org autocomplete
dlobo [Wed, 12 Feb 2014 14:57:25 +0000 (06:57 -0800)]
Merge pull request #2512 from lcdservices/CRM-14208
CRM-14208
Kurund Jalmi [Wed, 12 Feb 2014 14:38:44 +0000 (06:38 -0800)]
Merge pull request #2513 from jitendrapurohit/CRM-14183
CRM-14183
jitendrapurohit [Wed, 12 Feb 2014 08:18:27 +0000 (13:48 +0530)]
CRM-14183
Brian Shaughnessy [Wed, 12 Feb 2014 04:10:17 +0000 (23:10 -0500)]
CRM-14208, CRM-14140 use more of jsproffitt patch to simplify logic
Brian Shaughnessy [Wed, 12 Feb 2014 03:37:35 +0000 (22:37 -0500)]
CRM-14208 support new joomla authentication method
Coleman Watts [Tue, 11 Feb 2014 05:15:40 +0000 (21:15 -0800)]
Reorganize and update api examples
Coleman Watts [Wed, 12 Feb 2014 00:55:39 +0000 (16:55 -0800)]
CRM-13966 - default size for entityRef fields
projects / civicrm-core.git / log