Coleman Watts [Thu, 24 Apr 2014 04:54:27 +0000 (21:54 -0700)]
Api explorer - tweak defaults
Coleman Watts [Thu, 24 Apr 2014 04:44:23 +0000 (21:44 -0700)]
Api explorer - add options selector
Coleman Watts [Thu, 24 Apr 2014 03:33:09 +0000 (20:33 -0700)]
Api explorer - add return value selector
dlobo [Wed, 23 Apr 2014 16:27:36 +0000 (09:27 -0700)]
Merge pull request #2937 from seamuslee001/master
CRM-14505 Update CiviCRM API fix
seamuslee001 [Wed, 23 Apr 2014 16:12:18 +0000 (02:12 +1000)]
CRM-14505 Update CiviCRM API fix
Patch 4.5 code version with API dedupe rule fix as per Lobo's advice
Kurund Jalmi [Wed, 23 Apr 2014 16:08:13 +0000 (09:08 -0700)]
Merge pull request #2931 from pratik-joshi/CRM-14265-fix
CRM-14265
Kurund Jalmi [Wed, 23 Apr 2014 16:07:07 +0000 (09:07 -0700)]
Merge pull request #2934 from pratik-joshi/CRM-14436-fix
CRM-14436-fix
Kurund Jalmi [Wed, 23 Apr 2014 16:06:31 +0000 (09:06 -0700)]
Merge pull request #2936 from atif-shaikh/WebTextFix
Webtest Fix related to testCreateCampaign
colemanw [Wed, 23 Apr 2014 15:12:04 +0000 (08:12 -0700)]
Merge pull request #2935 from jitendrapurohit/Admin_Webtests
Web Test Fix
Atif Shaikh [Wed, 23 Apr 2014 14:53:08 +0000 (20:23 +0530)]
Webtest Fix related to testCreateCampaign
jitendrapurohit [Wed, 23 Apr 2014 12:12:42 +0000 (17:42 +0530)]
Web Test Fix
Pratik Joshi [Wed, 23 Apr 2014 11:21:20 +0000 (16:51 +0530)]
CRM-14436-fix : silly mistake, didn't included && inside if condition
Pratik Joshi [Wed, 23 Apr 2014 10:31:36 +0000 (16:01 +0530)]
CRM-14436-fix
pratik-joshi [Wed, 23 Apr 2014 08:16:22 +0000 (13:46 +0530)]
Merge pull request #2933 from pratik-joshi/CRM-14435
CRM-14435
Pratik Joshi [Wed, 23 Apr 2014 07:50:55 +0000 (13:20 +0530)]
CRM-14435
Pratik Joshi [Wed, 23 Apr 2014 06:22:23 +0000 (11:52 +0530)]
CRM-14265
Kurund Jalmi [Wed, 23 Apr 2014 05:05:56 +0000 (22:05 -0700)]
Merge pull request #2834 from pratik-joshi/CRM-14421
CRM-14421 : financial_type_id of contribution was not getting passed, so...
Kurund Jalmi [Wed, 23 Apr 2014 05:05:46 +0000 (22:05 -0700)]
Merge pull request #2927 from pratik-joshi/CRM-14269
CRM-14269 : as per the patch provide by eileen, a bit of improvement after select2 implementation
pratik-joshi [Wed, 23 Apr 2014 05:05:20 +0000 (10:35 +0530)]
Merge pull request #2923 from pratik-joshi/CRM-13973-comment
Crm 13973 #comment-59532
colemanw [Wed, 23 Apr 2014 04:10:17 +0000 (21:10 -0700)]
Merge pull request #2930 from colemanw/devel
Add developer docs and api explorer to menu
Coleman Watts [Wed, 23 Apr 2014 04:08:59 +0000 (21:08 -0700)]
Add developer docs and api explorer to menu
colemanw [Tue, 22 Apr 2014 19:57:39 +0000 (12:57 -0700)]
Merge pull request #2928 from jitendrapurohit/Activity_webtest
Web Test Fix
Coleman Watts [Tue, 22 Apr 2014 19:56:17 +0000 (12:56 -0700)]
Api Explorer - css tweak
jitendrapurohit [Tue, 22 Apr 2014 14:39:33 +0000 (20:09 +0530)]
Web Test Fix
Pratik Joshi [Tue, 22 Apr 2014 14:09:18 +0000 (19:39 +0530)]
CRM-14269 : as per the patch provide by eileen, a bit of improvement after select2 implementation
Pratik Joshi [Tue, 22 Apr 2014 08:45:36 +0000 (14:15 +0530)]
CRM-13973 : minor notice fix
Pratik Joshi [Mon, 21 Apr 2014 14:45:56 +0000 (20:15 +0530)]
CRM-13973-comment : we don't allow additional participant to record payment
Pratik Joshi [Mon, 21 Apr 2014 14:26:58 +0000 (19:56 +0530)]
CRM-13973-comment : pay later for additional participants
Pratik Joshi [Mon, 21 Apr 2014 08:52:16 +0000 (14:22 +0530)]
CRM-13973 -comment : additional participant fixes : additional payment form fixes, change selection link appearance, status updation upon completion of payment
Pratik Joshi [Sun, 20 Apr 2014 06:08:55 +0000 (11:38 +0530)]
CRM-13973-comment : fee amount block fix for change selection and edit/view particpant
colemanw [Tue, 22 Apr 2014 02:21:55 +0000 (19:21 -0700)]
Merge pull request #2924 from colemanw/explorer
Api explorer rewrite
Coleman Watts [Tue, 22 Apr 2014 02:16:31 +0000 (19:16 -0700)]
Api Explorer - dynamically fetch actions
Coleman Watts [Mon, 21 Apr 2014 22:06:19 +0000 (15:06 -0700)]
Api Explorer - add syntax highlighting
Coleman Watts [Mon, 21 Apr 2014 21:45:10 +0000 (14:45 -0700)]
Api Explorer - add support for chaining
Coleman Watts [Mon, 21 Apr 2014 06:19:00 +0000 (23:19 -0700)]
Api Explorer - rewrite for 4.5
Dave Greenberg [Mon, 21 Apr 2014 16:09:51 +0000 (09:09 -0700)]
Merge pull request #2889 from atif-shaikh/CRM-13833
CRM-13833 Further Improvements
kurund [Mon, 21 Apr 2014 15:51:45 +0000 (08:51 -0700)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-21-08-12-12
Conflicts:
CRM/Contact/Page/AJAX.php
CRM/Core/Payment.php
CRM/Event/Form/Registration/Register.php
api/v3/Membership.php
api/v3/utils.php
sql/civicrm_generated.mysql
xml/version.xml
colemanw [Mon, 21 Apr 2014 14:12:51 +0000 (07:12 -0700)]
Merge pull request #2922 from jitendrapurohit/Pledge_Webtest
Web Test Fix
jitendrapurohit [Mon, 21 Apr 2014 13:57:17 +0000 (19:27 +0530)]
Web Test Fix
Coleman Watts [Mon, 21 Apr 2014 06:18:37 +0000 (23:18 -0700)]
API - Cleanup getfield return values
colemanw [Mon, 21 Apr 2014 05:55:05 +0000 (22:55 -0700)]
Merge pull request #2919 from NileemaJadhav/HR-316
Add region to Case Activity form
Nileema [Mon, 21 Apr 2014 05:51:57 +0000 (11:21 +0530)]
HR-316 region name modification
Atif Shaikh [Mon, 21 Apr 2014 05:22:52 +0000 (10:52 +0530)]
CRM-13833 Further Enhancements
----------------------------------------
* CRM-13833: Implement Soft Credit Types
https://issues.civicrm.org/jira/browse/CRM-13833
Nileema [Fri, 18 Apr 2014 14:59:33 +0000 (20:29 +0530)]
Add region to Case Activity form
Coleman Watts [Mon, 21 Apr 2014 01:14:00 +0000 (18:14 -0700)]
API - Pass 'sequential' option from getfields to getoptions
Coleman Watts [Sun, 20 Apr 2014 17:23:25 +0000 (10:23 -0700)]
Api Explorer - cleanup & fixes
Coleman Watts [Sun, 20 Apr 2014 16:47:42 +0000 (09:47 -0700)]
Api Explorer - code cleanup
colemanw [Sun, 20 Apr 2014 00:20:29 +0000 (17:20 -0700)]
Merge pull request #2845 from elcapo/activity-contact-api
Create new API entity: ActivityContact (#CRM-14414)
pratik-joshi [Fri, 18 Apr 2014 14:29:42 +0000 (19:59 +0530)]
Merge pull request #2917 from jitendrapurohit/Contact_Web_Fixes
Web Test Fix
pratik-joshi [Fri, 18 Apr 2014 14:29:02 +0000 (19:59 +0530)]
Merge pull request #2918 from atif-shaikh/WebTextFix
WebTestFixes related to testCreateCampaign
Atif Shaikh [Fri, 18 Apr 2014 14:10:40 +0000 (19:40 +0530)]
WebTestFixes related to testCreateCampaign
jitendrapurohit [Fri, 18 Apr 2014 12:21:20 +0000 (17:51 +0530)]
Web Test Fix
Kurund Jalmi [Fri, 18 Apr 2014 05:22:24 +0000 (22:22 -0700)]
Merge pull request #2915 from yashodha/HR-330
save filter and grouping from xml to case type
yashodha [Fri, 18 Apr 2014 05:34:18 +0000 (11:04 +0530)]
save filter and grouping from xml to case type
Kurund Jalmi [Fri, 18 Apr 2014 05:22:06 +0000 (22:22 -0700)]
Merge pull request #2900 from yashodha/HR-324
HR-324 : add filter to case type
CiviCRM [Fri, 18 Apr 2014 01:14:52 +0000 (18:14 -0700)]
Update version to 4.4.6
Dave Greenberg [Thu, 17 Apr 2014 22:03:38 +0000 (15:03 -0700)]
Merge pull request #2914 from davecivicrm/CRM-14261
CRM-14261 - Apply same fix to Additional Participant template (top of pa...
Dave Greenberg [Thu, 17 Apr 2014 22:03:01 +0000 (15:03 -0700)]
CRM-14261 - Apply same fix to Additional Participant template (top of page profile goes ABOVE price set).
----------------------------------------
* CRM-14261:
https://issues.civicrm.org/jira/browse/CRM-14261
colemanw [Thu, 17 Apr 2014 18:38:25 +0000 (14:38 -0400)]
Merge pull request #2913 from colemanw/master
CRM-13966 - Change frozen markup to use span not div
Coleman Watts [Thu, 17 Apr 2014 18:37:53 +0000 (14:37 -0400)]
CRM-13966 - Change frozen markup to use span not div
Kurund Jalmi [Thu, 17 Apr 2014 18:10:59 +0000 (11:10 -0700)]
Merge pull request #2904 from atif-shaikh/CRM-14277
CRM-14277
Kurund Jalmi [Thu, 17 Apr 2014 18:09:36 +0000 (11:09 -0700)]
Merge pull request #2912 from colemanw/regions
HR-316 - Add generic form regions
Kurund Jalmi [Thu, 17 Apr 2014 18:07:33 +0000 (11:07 -0700)]
Merge pull request #2888 from eileenmcnaughton/patch-3
E-notice fix
Kurund Jalmi [Thu, 17 Apr 2014 18:07:15 +0000 (11:07 -0700)]
Merge pull request #2901 from eileenmcnaughton/E-notice
enotices when enabling logging on fields that don't (yet) exist in the l...
Kurund Jalmi [Thu, 17 Apr 2014 18:06:23 +0000 (11:06 -0700)]
Merge pull request #2910 from eileenmcnaughton/enotice2
eNotice fix
Kurund Jalmi [Thu, 17 Apr 2014 18:05:42 +0000 (11:05 -0700)]
Merge pull request #2903 from jitendrapurohit/Member_WebTests
Webtests Fix
Kurund Jalmi [Thu, 17 Apr 2014 18:05:27 +0000 (11:05 -0700)]
Merge pull request #2911 from jitendrapurohit/Contact_Webtest
Web Test Fix
Coleman Watts [Thu, 17 Apr 2014 17:46:54 +0000 (13:46 -0400)]
HR-316 - Add generic form regions
jitendrapurohit [Thu, 17 Apr 2014 14:12:08 +0000 (19:42 +0530)]
Web Test Fix
Eileen McNaughton [Thu, 17 Apr 2014 09:32:55 +0000 (21:32 +1200)]
eNotice fix
Tim Otten [Thu, 17 Apr 2014 06:47:25 +0000 (23:47 -0700)]
Merge pull request #2908 from totten/4.4-restrict-customDir
customFileUploadDir - Restrict remote access
Tim Otten [Thu, 17 Apr 2014 00:23:50 +0000 (17:23 -0700)]
customFileUploadDir - Restrict remote access
Kurund Jalmi [Wed, 16 Apr 2014 22:17:07 +0000 (15:17 -0700)]
Merge pull request #2886 from colemanw/4.4
CRM-14463 - Fix custom address fields to support location type
Tim Otten [Wed, 16 Apr 2014 19:11:44 +0000 (12:11 -0700)]
Merge pull request #2907 from totten/4.4-date-const
CRM-14446 - s/magic value/constant/
Tim Otten [Wed, 16 Apr 2014 19:10:40 +0000 (12:10 -0700)]
CRM-14446 - s/magic value/constant/
Tim Otten [Wed, 16 Apr 2014 19:08:03 +0000 (12:08 -0700)]
Merge pull request #2860 from eileenmcnaughton/CRM-14446
CRM-14446 contact.get api tests + fix on date filters
Tim Otten [Wed, 16 Apr 2014 19:06:07 +0000 (12:06 -0700)]
Merge pull request #2882 from totten/4.4-module-payproc
CRM-14396 - CRM_Core_Payment::handlePaymentMethod
colemanw [Wed, 16 Apr 2014 17:26:40 +0000 (13:26 -0400)]
Merge pull request #2906 from NileemaJadhav/HR-master
--HR-339 Pre-populate "email" activity with case contact(s)
colemanw [Wed, 16 Apr 2014 17:24:33 +0000 (13:24 -0400)]
Merge pull request #2905 from PoonamNalawade/HR321
--HR-321 changes related to status change and UI
Nileema [Wed, 16 Apr 2014 14:06:41 +0000 (19:36 +0530)]
--HR-339 Pre-populate "email" activity with case contact(s)
Poonam [Wed, 16 Apr 2014 14:02:16 +0000 (19:32 +0530)]
--HR-321 changes related to status change and UI
Atif Shaikh [Wed, 16 Apr 2014 13:55:18 +0000 (19:25 +0530)]
CRM-14277 Further Improvements
----------------------------------------
* CRM-14277: Error when clicking Done on viewing a Contribution
https://issues.civicrm.org/jira/browse/CRM-14277
Atif Shaikh [Wed, 16 Apr 2014 13:50:17 +0000 (19:20 +0530)]
CRM-14277 Fix - Error when clicking Done on viewing a Contribution
https://issues.civicrm.org/jira/browse/CRM-14277
jitendrapurohit [Wed, 16 Apr 2014 13:14:21 +0000 (18:44 +0530)]
Webtests Fix
Kurund Jalmi [Wed, 16 Apr 2014 02:22:06 +0000 (19:22 -0700)]
Merge pull request #2895 from jitendrapurohit/Web_Fix
Web Test Fix
Dave Greenberg [Wed, 16 Apr 2014 02:16:05 +0000 (19:16 -0700)]
Merge pull request #2902 from kurund/CRM-14429
code clean / fixes CRM-14429
kurund [Wed, 16 Apr 2014 02:11:40 +0000 (19:11 -0700)]
code clean / fixes CRM-14429
----------------------------------------
* CRM-14429: Contact import fails silently on lookup of custom field option values by label
https://issues.civicrm.org/jira/browse/CRM-14429
Eileen McNaughton [Wed, 16 Apr 2014 01:35:23 +0000 (13:35 +1200)]
enotices when enabling logging on fields that don't (yet) exist in the log tables
Dave Greenberg [Wed, 16 Apr 2014 01:26:36 +0000 (18:26 -0700)]
Merge pull request #2894 from pratik-joshi/CRM-13973-comment
CRM-13973 : #comment-59450 fix
yashodha [Wed, 16 Apr 2014 00:44:10 +0000 (06:14 +0530)]
HR-324 : add filter to case type
Dave Greenberg [Wed, 16 Apr 2014 00:27:16 +0000 (17:27 -0700)]
Merge pull request #2896 from agh1/format-pledge-money
CRM-14471: Pledge payment amount displays with dollar sign on contribution page
Dave Greenberg [Tue, 15 Apr 2014 23:40:02 +0000 (16:40 -0700)]
Merge pull request #2899 from davecivicrm/CRM-14191
CRM-14191 - fix notice in FourFour.php upgrade.
Dave Greenberg [Tue, 15 Apr 2014 23:37:32 +0000 (16:37 -0700)]
CRM-14191 - fix notice in FourFour.php upgrade.
----------------------------------------
* CRM-14191:
https://issues.civicrm.org/jira/browse/CRM-14191
Dave Greenberg [Tue, 15 Apr 2014 23:27:01 +0000 (16:27 -0700)]
Merge pull request #2897 from pradpnayak/CRM-14191
-- removed hardcoded values, added sql upgrade script to handle civicrm_...
Dave Greenberg [Tue, 15 Apr 2014 21:35:28 +0000 (14:35 -0700)]
Merge pull request #2898 from davecivicrm/CRM-14467
CRM-14467 - remove extra double-quote which messes up case_id in change ...
Dave Greenberg [Tue, 15 Apr 2014 21:34:06 +0000 (14:34 -0700)]
CRM-14467 - remove extra double-quote which messes up case_id in change status URL.
----------------------------------------
* CRM-14467:
https://issues.civicrm.org/jira/browse/CRM-14467
Pradeep Nayak [Tue, 15 Apr 2014 21:25:34 +0000 (02:55 +0530)]
-- removed hardcoded values and handled reopened status. CRM-14191
----------------------------------------
* CRM-14191:
https://issues.civicrm.org/jira/browse/CRM-14191
Pradeep Nayak [Tue, 15 Apr 2014 19:10:52 +0000 (00:40 +0530)]
-- removed hardcoded values, added sql upgrade script to handle civicrm_batch.status_id, CRM-14191
----------------------------------------
* CRM-14191: There are 3 options with value=0 in option group "batch_status"
https://issues.civicrm.org/jira/browse/CRM-14191
Andrew Hunt [Tue, 15 Apr 2014 16:02:19 +0000 (12:02 -0400)]
pull currency from scheduled payment
Andrew Hunt [Tue, 15 Apr 2014 15:39:41 +0000 (11:39 -0400)]
use money format instead of dollar sign for pledge payment due
projects / civicrm-core.git / log