dlobo [Fri, 29 Mar 2013 14:57:27 +0000 (07:57 -0700)]
Merge pull request #280 from dlobo/CRM-12117
CRM-12117
Donald A. Lobo [Fri, 29 Mar 2013 14:55:34 +0000 (07:55 -0700)]
CRM-12117
colemanw [Fri, 29 Mar 2013 14:34:29 +0000 (07:34 -0700)]
Merge pull request #278 from totten/upgrade-rescachecode
CRM_Core_Resources - Don't access settings during upgrade mode. (Fix for...
Tim Otten [Fri, 29 Mar 2013 04:48:58 +0000 (00:48 -0400)]
CRM_Core_Resources - Don't access settings during upgrade mode. (Fix for upgrades from 4.0.0 to 4.3.x.)
Tim Otten [Fri, 29 Mar 2013 04:25:07 +0000 (21:25 -0700)]
Merge pull request #277 from colemanw/upgrade-const
Fix constant during 4.1 upgrade
Coleman Watts [Fri, 29 Mar 2013 04:20:42 +0000 (21:20 -0700)]
Fix constant during 4.1 upgrade
colemanw [Fri, 29 Mar 2013 04:01:28 +0000 (21:01 -0700)]
Merge pull request #258 from colemanw/groupEdit
Remove alpha sort from pager CRM-12212
colemanw [Fri, 29 Mar 2013 03:20:07 +0000 (20:20 -0700)]
Merge pull request #272 from colemanw/tagGroup
Tag group
colemanw [Fri, 29 Mar 2013 03:18:26 +0000 (20:18 -0700)]
Merge pull request #261 from eileenmcnaughton/CRM-12209
CRM-12209 groups not showing when ACL hook in use
Tim Otten [Fri, 29 Mar 2013 00:38:30 +0000 (17:38 -0700)]
Merge pull request #273 from colemanw/dashboard
Fix dashboard popups
Tim Otten [Thu, 28 Mar 2013 22:24:02 +0000 (15:24 -0700)]
Merge pull request #275 from agh1/warn-mailerjobsize
Warn mailerjobsize
Andrew Hunt [Thu, 28 Mar 2013 19:49:48 +0000 (15:49 -0400)]
made it more concise
Andrew Hunt [Thu, 28 Mar 2013 19:41:44 +0000 (15:41 -0400)]
validate Mailer Settings admin form
Tim Otten [Thu, 28 Mar 2013 19:29:16 +0000 (12:29 -0700)]
Merge pull request #274 from davecivicrm/CRM-12243
CRM-12243 check if premiums_nothankyou_label column exists before adding...
Dave Greenberg [Thu, 28 Mar 2013 18:53:40 +0000 (11:53 -0700)]
CRM-12243 Replaced loop on locales with {localize} tag.
----------------------------------------
* CRM-12243: Beta 4 upgrade fails with duplicate column error if site was originally installed as a 4.3 site
http://issues.civicrm.org/jira/browse/CRM-12243
Kurund Jalmi [Thu, 28 Mar 2013 17:47:43 +0000 (10:47 -0700)]
Merge pull request #271 from ravishnair/webtest-fix/improvement
-- webtest fixes and improvement
Dave Greenberg [Thu, 28 Mar 2013 17:43:54 +0000 (10:43 -0700)]
CRM-12243 check if premiums_nothankyou_label column exists before adding it. Move update sql statement to beta5 mysql.
----------------------------------------
* CRM-12243: Beta 4 upgrade fails with duplicate column error if site was originally installed as a 4.3 site
http://issues.civicrm.org/jira/browse/CRM-12243
Tim Otten [Thu, 28 Mar 2013 17:07:06 +0000 (10:07 -0700)]
Merge pull request #266 from colemanw/CRM-12229
Flush cache after updating word replacements CRM-12229
Coleman Watts [Thu, 28 Mar 2013 16:36:18 +0000 (09:36 -0700)]
Fix dashboard popups CRM-12239
Coleman Watts [Wed, 27 Mar 2013 21:42:30 +0000 (14:42 -0700)]
Cleanup
Coleman Watts [Wed, 27 Mar 2013 19:01:01 +0000 (12:01 -0700)]
Fix tagsets in profiles CRM-12230
Coleman Watts [Wed, 27 Mar 2013 18:45:05 +0000 (11:45 -0700)]
tpl cleanup
Ravish Nair [Thu, 28 Mar 2013 13:24:16 +0000 (18:54 +0530)]
-- webtest fixes and improvement
Kurund Jalmi [Thu, 28 Mar 2013 12:10:51 +0000 (05:10 -0700)]
Merge pull request #270 from kurund/CRM-12202
CRM-12202
Kurund Jalmi [Thu, 28 Mar 2013 11:52:18 +0000 (17:22 +0530)]
worked on CRM-12202, reuse existing CRM.confirm(), more code cleanup
Kurund Jalmi [Thu, 28 Mar 2013 11:36:29 +0000 (17:06 +0530)]
worked on CRM-12202, added overlay for ajax reloading
Kurund Jalmi [Thu, 28 Mar 2013 11:29:42 +0000 (04:29 -0700)]
Merge pull request #269 from yashodha/CRM-12231
CRM-12231
yashodha [Thu, 28 Mar 2013 10:43:34 +0000 (16:13 +0530)]
CRM-12231
Kurund Jalmi [Thu, 28 Mar 2013 09:48:28 +0000 (15:18 +0530)]
worked on CRM-12202, localized buttons and removed unwanted variables
Kurund Jalmi [Thu, 28 Mar 2013 09:42:10 +0000 (02:42 -0700)]
Merge pull request #268 from deepak-srivastava/alpha
CRM-12215
Deepak Srivastava [Thu, 28 Mar 2013 08:47:58 +0000 (14:17 +0530)]
CRM-12215
Kurund Jalmi [Thu, 28 Mar 2013 08:58:07 +0000 (01:58 -0700)]
Merge pull request #267 from ravishnair/CRM-12216_testcase
-- test case for issue CRM-12216
Ravish Nair [Thu, 28 Mar 2013 08:09:07 +0000 (13:39 +0530)]
-- test case for issue CRM-12216
Coleman Watts [Wed, 27 Mar 2013 18:12:18 +0000 (11:12 -0700)]
Flush cache after updating word replacements CRM-12229
Tim Otten [Wed, 27 Mar 2013 17:59:02 +0000 (10:59 -0700)]
Merge pull request #265 from colemanw/del-fix
Return false if delete unsuccessful
Coleman Watts [Wed, 27 Mar 2013 17:47:33 +0000 (10:47 -0700)]
cleanup
Coleman Watts [Wed, 27 Mar 2013 17:41:33 +0000 (10:41 -0700)]
Use generic fn for phone delete
Coleman Watts [Wed, 27 Mar 2013 17:37:02 +0000 (10:37 -0700)]
Return false if delete unsuccessful
Tim Otten [Wed, 27 Mar 2013 16:06:44 +0000 (09:06 -0700)]
Merge pull request #250 from agh1/group_id-to-id
make group_id be id (after the opposite was done)
Andrew Hunt [Wed, 27 Mar 2013 15:06:11 +0000 (11:06 -0400)]
wasn't sending entity to util function
Kurund Jalmi [Wed, 27 Mar 2013 12:16:12 +0000 (05:16 -0700)]
Merge pull request #263 from totten/jira-commit-msg
CRM-12109 - Call git-footnote in commit-msg hook
Kurund Jalmi [Wed, 27 Mar 2013 11:56:13 +0000 (04:56 -0700)]
Merge pull request #264 from kurund/CRM-12202
CRM-12202
Kurund Jalmi [Wed, 27 Mar 2013 11:42:01 +0000 (17:12 +0530)]
worked on CRM-12202, fix for case search and removed file include
Kurund Jalmi [Wed, 27 Mar 2013 11:16:30 +0000 (16:46 +0530)]
worked on CRM-12202, js code cleanup, move js call from php to js file
Kurund Jalmi [Wed, 27 Mar 2013 10:17:44 +0000 (15:47 +0530)]
worked on CRM-12202, added new form for changing activity status and used it for dialog. also cleaned up js used for building dialog
Kurund Jalmi [Wed, 27 Mar 2013 07:33:35 +0000 (13:03 +0530)]
updated version
Kurund Jalmi [Wed, 27 Mar 2013 07:28:44 +0000 (00:28 -0700)]
Merge pull request #262 from davecivicrm/CRM-12155
CRM-12155 Moved check for orphaned financial records to postUpdateMessag...
Kurund Jalmi [Wed, 27 Mar 2013 07:27:49 +0000 (00:27 -0700)]
Merge pull request #260 from colemanw/CRM-12218
Address delete button CRM-12218
Tim Otten [Wed, 27 Mar 2013 06:30:17 +0000 (02:30 -0400)]
CRM-12109 - Call git-footnote in commit-msg hook
----------------------------------------
* CRM-12109: Automatically append JIRA links to Git tickets
http://issues.civicrm.org/jira/browse/CRM-12109
Tim Otten [Wed, 27 Mar 2013 06:29:50 +0000 (02:29 -0400)]
CRM-12109 - Exclude git-footnote from tarballs
----------------------------------------
* CRM-12109: Automatically append JIRA links to Git tickets
http://issues.civicrm.org/jira/browse/CRM-12109
Dave Greenberg [Wed, 27 Mar 2013 05:07:43 +0000 (22:07 -0700)]
CRM-12155 Moved check for orphaned financial records to postUpdateMessage since there is apparently no harm in leaving them in the DB and the queries to clean them up are complex.`
eileen [Wed, 27 Mar 2013 03:46:24 +0000 (16:46 +1300)]
CRM-12209 groups not showing when ACL hook in use
Tim Otten [Wed, 27 Mar 2013 01:24:40 +0000 (18:24 -0700)]
Merge pull request #251 from totten/api-id-test
CRM-12146 - Test for "get" APIs which don't support ID
Tim Otten [Wed, 27 Mar 2013 01:21:50 +0000 (21:21 -0400)]
CRM-12146 - SyntaxConformanceAllEntitiesTest - Expand testByIDAlias_get() to cover most entities
Coleman Watts [Wed, 27 Mar 2013 00:21:41 +0000 (17:21 -0700)]
UI cleanup for CRM-12218
Coleman Watts [Wed, 27 Mar 2013 00:09:58 +0000 (17:09 -0700)]
Fix address add CRM-12224
Coleman Watts [Tue, 26 Mar 2013 23:17:37 +0000 (16:17 -0700)]
Enforce is_primary while deleting objects CRM-10732
Coleman Watts [Tue, 26 Mar 2013 21:50:35 +0000 (14:50 -0700)]
Address delete button CRM-12218
Kurund Jalmi [Tue, 26 Mar 2013 20:57:58 +0000 (13:57 -0700)]
Merge pull request #259 from kurund/CRM-12216
worked on CRM-12216, shortened field label
Kurund Jalmi [Tue, 26 Mar 2013 20:42:15 +0000 (02:12 +0530)]
worked on CRM-12216, shortened field label
Coleman Watts [Tue, 26 Mar 2013 20:38:08 +0000 (13:38 -0700)]
Remove alpha sort from pager CRM-12212
colemanw [Tue, 26 Mar 2013 18:41:41 +0000 (11:41 -0700)]
Merge pull request #256 from dlobo/CRM-12212
CRM-12122
Donald A. Lobo [Tue, 26 Mar 2013 18:35:55 +0000 (11:35 -0700)]
CRM-12212
Donald A. Lobo [Tue, 26 Mar 2013 18:34:28 +0000 (11:34 -0700)]
CRM-12212
Kurund Jalmi [Tue, 26 Mar 2013 15:38:56 +0000 (08:38 -0700)]
Merge pull request #254 from ravishnair/webtest-fix/improvement
-- webtest improvements
Kurund Jalmi [Tue, 26 Mar 2013 15:38:36 +0000 (08:38 -0700)]
Merge pull request #255 from deepak-srivastava/ninja
Fix for CRM-12213
Deepak Srivastava [Tue, 26 Mar 2013 09:33:04 +0000 (15:03 +0530)]
CRM-12213
Deepak Srivastava [Tue, 26 Mar 2013 09:33:04 +0000 (15:03 +0530)]
CRM-12213
Ravish Nair [Tue, 26 Mar 2013 13:24:49 +0000 (18:54 +0530)]
-- webtest improvements
Kurund Jalmi [Tue, 26 Mar 2013 13:16:38 +0000 (06:16 -0700)]
Merge pull request #253 from kurund/CRM-12216
CRM-12216
Kurund Jalmi [Tue, 26 Mar 2013 13:06:49 +0000 (18:36 +0530)]
worked on CRM-12216, fixed subject and added option for bulk action
Kurund Jalmi [Tue, 26 Mar 2013 12:49:18 +0000 (18:19 +0530)]
worked on CRM-12216, added option to create multiple activities for each 'with/target contact'
Kurund Jalmi [Tue, 26 Mar 2013 10:33:39 +0000 (03:33 -0700)]
Merge pull request #249 from pradpnayak/CRM-12192
--fixed CRM test, for CRM-12192
Tim Otten [Tue, 26 Mar 2013 04:07:16 +0000 (00:07 -0400)]
CRM-12146 - Add test case for Group.get(group_id=>1) and Contact.get(contact_id=>1).
I tried inspecting the DAO_*::fields() metadata to determine which entities
and field names to test. This can be done (if you see that the array-keys
are unique-names and the 'name' properties ar enon-unique-names), but it
doesn't ultimately help because the XML schema for group doesn't officially
list group_id as a unique-name. I'm nervous that changing that schema would
have unintended consequences, so... this patch uses a more conservative
approach (whitelisting/hardcoding certain entities/unique-names).
Tim Otten [Tue, 26 Mar 2013 03:53:03 +0000 (23:53 -0400)]
api/v3/utils - Misc autoformat
Tim Otten [Tue, 26 Mar 2013 03:20:00 +0000 (23:20 -0400)]
Remove debug code
Tim Otten [Tue, 26 Mar 2013 02:49:13 +0000 (22:49 -0400)]
CRM-12146 - Dial back errors produced by testByID_get()
Tim Otten [Tue, 26 Mar 2013 02:11:36 +0000 (22:11 -0400)]
CRM-12146 - SyntaxConformanceAllEntitiesTest - Load entities by ID
Tim Otten [Tue, 26 Mar 2013 01:10:58 +0000 (21:10 -0400)]
SyntaxConformanceAllEntitiesTest - Re-enable testSimple_get() and fix failure for Case.get.
Andrew Hunt [Mon, 25 Mar 2013 22:10:29 +0000 (18:10 -0400)]
make group_id be id (after the opposite was done)
Pradeep Nayak [Mon, 25 Mar 2013 20:25:20 +0000 (01:55 +0530)]
--fixed CRM test, for CRM-12192
Kurund Jalmi [Mon, 25 Mar 2013 16:24:13 +0000 (09:24 -0700)]
Merge pull request #248 from pradpnayak/CRM-12155
-- fixed upgrade script for CRM-12155
Kurund Jalmi [Mon, 25 Mar 2013 16:23:28 +0000 (09:23 -0700)]
Merge pull request #247 from pradpnayak/CRM-12192
--fixed filtering for CRM-12192
Pradeep Nayak [Mon, 25 Mar 2013 16:15:39 +0000 (21:45 +0530)]
-- fixed upgrade script for CRM-12155
Pradeep Nayak [Mon, 25 Mar 2013 16:03:56 +0000 (21:33 +0530)]
--fixed filtering for CRM-12192
colemanw [Mon, 25 Mar 2013 15:40:33 +0000 (08:40 -0700)]
Merge pull request #243 from kurund/CRM-12178
worked on CRM-12178, added overflow:auto, which shows scroll bar for fix...
Kurund Jalmi [Mon, 25 Mar 2013 15:15:34 +0000 (08:15 -0700)]
Merge pull request #242 from pradpnayak/CRM-12155
--fixed for CRM-12155
Kurund Jalmi [Mon, 25 Mar 2013 15:15:09 +0000 (08:15 -0700)]
Merge pull request #246 from davecivicrm/profileName
CRM-12173 Add profile name (uf_group.name) to profile fieldset class.
Kurund Jalmi [Mon, 25 Mar 2013 15:13:29 +0000 (08:13 -0700)]
Merge pull request #245 from ravishnair/CRM-12191
-- more fixes for CRM-12191
Ravish Nair [Mon, 25 Mar 2013 14:22:46 +0000 (19:52 +0530)]
-- more fixes for CRM-12191
Kurund Jalmi [Mon, 25 Mar 2013 13:38:17 +0000 (06:38 -0700)]
Merge pull request #244 from yashodha/CRM-7564
CRM-7564
yashodha [Mon, 25 Mar 2013 13:16:06 +0000 (18:46 +0530)]
CRM-7564
Kurund Jalmi [Mon, 25 Mar 2013 11:55:52 +0000 (17:25 +0530)]
worked on CRM-12178, added overflow:auto, which shows scroll bar for fixed width themes
Pradeep Nayak [Mon, 25 Mar 2013 11:33:16 +0000 (17:03 +0530)]
--fixed for CRM-12155
Kurund Jalmi [Mon, 25 Mar 2013 09:59:48 +0000 (02:59 -0700)]
Merge pull request #207 from tttp/bugfix
CRM-12124 in place edit option value
Kurund Jalmi [Mon, 25 Mar 2013 09:59:00 +0000 (02:59 -0700)]
Merge pull request #241 from ravishnair/CRM-12191
-- fix for CRM-12191
Ravish Nair [Mon, 25 Mar 2013 08:47:37 +0000 (14:17 +0530)]
-- fix for CRM-12191
Kurund Jalmi [Mon, 25 Mar 2013 06:49:45 +0000 (23:49 -0700)]
Merge pull request #239 from colemanw/CRM-12188
Temp fix for duplicate dom ids CRM-12188
dlobo [Mon, 25 Mar 2013 02:58:14 +0000 (19:58 -0700)]
Merge pull request #240 from dlobo/CRM-12205
CRM-12205
Donald A. Lobo [Mon, 25 Mar 2013 02:54:21 +0000 (19:54 -0700)]
CRM-12205
projects / civicrm-core.git / log