colemanw [Tue, 14 Apr 2015 17:41:12 +0000 (13:41 -0400)]
Merge pull request #5627 from torrance/master
Don't call into Drupal from Civicrm to build navigation menu. See CRM-15132
Eileen McNaughton [Tue, 14 Apr 2015 07:12:19 +0000 (19:12 +1200)]
Merge pull request #5629 from torrance/drupal8
Changes needed to CRM_Utils_System_Drupal8
Torrance [Tue, 14 Apr 2015 05:55:26 +0000 (17:55 +1200)]
Change CSS and JS output in preparation to be added via head_link.
Torrance [Tue, 14 Apr 2015 05:53:58 +0000 (17:53 +1200)]
Allow for url's that are not Drupal routes; handle 'path?query' special case.
Torrance [Tue, 14 Apr 2015 02:32:11 +0000 (14:32 +1200)]
Don't call into Drupal from Civicrm to build navigation menu. See CRM-15132.
kurund [Mon, 13 Apr 2015 23:09:09 +0000 (16:09 -0700)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-13-16-09-07
kurund [Mon, 13 Apr 2015 23:08:14 +0000 (16:08 -0700)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-04-13-16-08-08
Kurund Jalmi [Mon, 13 Apr 2015 22:54:03 +0000 (15:54 -0700)]
Merge pull request #5472 from monishdeb/CRM-15908
CRM-15908 additional fix
Dave Greenberg [Mon, 13 Apr 2015 16:57:31 +0000 (09:57 -0700)]
Merge pull request #5623 from eileenmcnaughton/CRM-16280
CRM-16280 remove NOT NULL from upgrade sql to reflect schema & resolve u...
colemanw [Mon, 13 Apr 2015 12:25:52 +0000 (08:25 -0400)]
Merge pull request #5622 from colemanw/docs
Update doc links
Monish Deb [Mon, 13 Apr 2015 11:33:15 +0000 (17:03 +0530)]
Merge pull request #5613 from rohankatkar/CRM-16264
Descriptions not displayed in Profile
Monish Deb [Mon, 13 Apr 2015 07:27:19 +0000 (12:57 +0530)]
Merge pull request #5611 from atif-shaikh/CRM-16257
CRM-16257 - "Sorry an error occurred and your information was not saved"...
Monish Deb [Mon, 13 Apr 2015 07:22:40 +0000 (12:52 +0530)]
Merge pull request #5612 from pratikshad/CRM-16222
CRM-16222 Fix-Forms with 'Other amount' field should display a currency ...
Monish Deb [Mon, 13 Apr 2015 07:22:09 +0000 (12:52 +0530)]
Merge pull request #5600 from atif-shaikh/CRM-16254
CRM-16254 - Cannot create a custom Search
Monish Deb [Mon, 13 Apr 2015 05:45:17 +0000 (11:15 +0530)]
Merge pull request #5610 from jitendrapurohit/CRM-16250
CRM-16250 - Tax Invoice CIVIevent Registration Not working for Multiple ...
pratikshad [Mon, 13 Apr 2015 05:39:23 +0000 (11:09 +0530)]
typo Fix
Eileen McNaughton [Mon, 13 Apr 2015 02:38:28 +0000 (14:38 +1200)]
CRM-16280 remove NOT NULL from upgrade sql to reflect schema & resolve upgrade failure
Coleman Watts [Sun, 12 Apr 2015 23:01:53 +0000 (19:01 -0400)]
Update doc links
colemanw [Sat, 11 Apr 2015 12:50:29 +0000 (08:50 -0400)]
Merge pull request #5513 from mallezie/contact-select-file-16178
CRM_Contact_Form_Contact to use addField CRM-16178
Tim Mallezie [Sat, 11 Apr 2015 09:10:13 +0000 (11:10 +0200)]
Remove add to addElement changes
Tim Otten [Sat, 11 Apr 2015 04:23:32 +0000 (21:23 -0700)]
Merge pull request #5608 from totten/4.6-ckeditor-upload
CRM-16253 - crmUiRichtext - Enable file uploads
colemanw [Sat, 11 Apr 2015 00:33:29 +0000 (20:33 -0400)]
Merge pull request #5616 from colemanw/CRM-16267
CRM-16267 - Fix copying date fields in profile batch update
Coleman Watts [Fri, 10 Apr 2015 22:00:33 +0000 (18:00 -0400)]
CRM-16267 Fix setting dates in membership batch
colemanw [Fri, 10 Apr 2015 21:31:38 +0000 (17:31 -0400)]
Merge pull request #5615 from colemanw/CRM-16271
CRM-16271 - Fix formatting of custom fields on name badges
Coleman Watts [Fri, 10 Apr 2015 21:31:19 +0000 (17:31 -0400)]
Batch js cleanup
colemanw [Fri, 10 Apr 2015 21:30:35 +0000 (17:30 -0400)]
Merge pull request #5617 from colemanw/CRM-15916
CRM-15916 - Revert bad merge
Coleman Watts [Fri, 10 Apr 2015 21:27:30 +0000 (17:27 -0400)]
CRM-15916 - Revert bad merge
Coleman Watts [Fri, 10 Apr 2015 21:01:42 +0000 (17:01 -0400)]
CRM-16267 - Fix copying date fields in profile batch update
Coleman Watts [Fri, 10 Apr 2015 20:20:34 +0000 (16:20 -0400)]
CRM-16271 - Fix formatting of custom fields on name badges
Dave Greenberg [Fri, 10 Apr 2015 16:46:13 +0000 (09:46 -0700)]
Merge pull request #5609 from PalanteJon/CRM-16196-46
CRM-16196 - CiviCRM Core - CRM_Utils_System_Drupal::getLoginURL should a...
Monish Deb [Fri, 10 Apr 2015 14:36:42 +0000 (20:06 +0530)]
Merge pull request #5597 from pratikshad/CRM-16008
CRM-16008 Fix-Import contacts: notes are imported twice
pratikshad [Fri, 10 Apr 2015 14:10:37 +0000 (19:40 +0530)]
CRM-16222-PR improvement
atif-shaikh [Fri, 10 Apr 2015 14:05:40 +0000 (19:35 +0530)]
CRM-16257 resolved regression caused by previous commit for issue CRM-16157
----------------------------------------
* CRM-16257: "Sorry an error occurred and your information was not saved" if email contains an image or a table
https://issues.civicrm.org/jira/browse/CRM-16257
* CRM-16157: Option Group - Paper Size Options lost edit ability
https://issues.civicrm.org/jira/browse/CRM-16157
atif-shaikh [Thu, 9 Apr 2015 12:24:28 +0000 (17:54 +0530)]
CRM-16254 - Cannot create a custom Search
https://issues.civicrm.org/jira/browse/CRM-16254
Web Access [Fri, 10 Apr 2015 13:26:36 +0000 (18:56 +0530)]
Fix for CRM-16264
atif-shaikh [Fri, 10 Apr 2015 12:16:18 +0000 (17:46 +0530)]
CRM-16257 - "Sorry an error occurred and your information was not saved" if email contains an image or a table
https://issues.civicrm.org/jira/browse/CRM-16257
pratikshad [Fri, 10 Apr 2015 11:52:42 +0000 (17:22 +0530)]
CRM-16222 Fix-Forms with 'Other amount' field should display a currency symbol with the field
----------------------------------------
* CRM-16222: Forms with "Other amount" field should display a currency symbol with the field
https://issues.civicrm.org/jira/browse/CRM-16222
Kurund Jalmi [Fri, 10 Apr 2015 10:49:58 +0000 (16:19 +0530)]
Merge pull request #5602 from rohankatkar/4.6-webtest
Webtest Fix
jitendrapurohit [Fri, 10 Apr 2015 10:49:14 +0000 (16:19 +0530)]
warning fix
Kurund Jalmi [Fri, 10 Apr 2015 10:32:33 +0000 (16:02 +0530)]
Merge pull request #5598 from atif-shaikh/CRM-16258
CRM-16258 - CiviCRM 4.6.0 membership list multiple member entries based ...
Kurund Jalmi [Fri, 10 Apr 2015 10:20:57 +0000 (15:50 +0530)]
Merge pull request #5580 from eileenmcnaughton/CRM-16247
CRM-16247 Move activity creation until after transaction is committed
Monish Deb [Fri, 10 Apr 2015 07:37:32 +0000 (13:07 +0530)]
Merge pull request #5589 from monishdeb/CRM-15403
CRM-15403 fix - Large Batch Data Entry allows multiple submits causing d...
jitendrapurohit [Fri, 10 Apr 2015 07:30:55 +0000 (13:00 +0530)]
CRM-16250 - Tax Invoice CIVIevent Registration Not working for Multiple Registration
Kurund Jalmi [Fri, 10 Apr 2015 06:52:27 +0000 (12:22 +0530)]
Merge pull request #5571 from jitendrapurohit/CRM-16229
CRM-16229 - Cannot add participants to event from search
Jon goldberg [Thu, 9 Apr 2015 23:48:44 +0000 (19:48 -0400)]
CRM-16196 - CiviCRM Core - CRM_Utils_System_Drupal::getLoginURL should always generate absolute paths
Tim Otten [Fri, 10 Apr 2015 00:29:36 +0000 (17:29 -0700)]
CRM-16253 - crmUiRichtext - Enable file uploads
Tim Otten [Fri, 10 Apr 2015 00:19:09 +0000 (17:19 -0700)]
CRM-16253 - Angular - Declare settings in $angularModules. Add setting for callback URL.
Tim Otten [Fri, 10 Apr 2015 00:20:36 +0000 (17:20 -0700)]
CRM-16145 - Civi\Angular\ManagerText - Fix regression
Tim Otten [Fri, 10 Apr 2015 00:34:30 +0000 (17:34 -0700)]
Merge pull request #5606 from totten/4.6-ngroute
CRM-16246 - Load ngRoute through Civi\Angular\Manager
Tim Otten [Thu, 9 Apr 2015 23:31:00 +0000 (16:31 -0700)]
CRM-16246 - Load ngRoute through Civi\Angular\Manager
This should resolve one of Chrome's warnings about min.map.
monishdeb [Thu, 9 Apr 2015 16:32:14 +0000 (22:02 +0530)]
improvement and format fixes
monishdeb [Thu, 9 Apr 2015 16:22:29 +0000 (21:52 +0530)]
improvement and format fixes
monishdeb [Wed, 8 Apr 2015 07:22:41 +0000 (12:52 +0530)]
CRM-15403 fix - Large Batch Data Entry allows multiple submits causing duplicate transactions
https://issues.civicrm.org/jira/browse/CRM-15403
colemanw [Thu, 9 Apr 2015 15:15:26 +0000 (11:15 -0400)]
Merge pull request #5565 from eileenmcnaughton/master
minor tidy ups. Don't pass param as reference if not altered
Web Access [Thu, 9 Apr 2015 14:50:44 +0000 (20:20 +0530)]
Webtest Fix
colemanw [Thu, 9 Apr 2015 14:37:09 +0000 (10:37 -0400)]
Merge pull request #5592 from JKingsnorth/CRM-16256
CRM-16256: Skip empty fields on dedupe
Kurund Jalmi [Thu, 9 Apr 2015 13:32:04 +0000 (19:02 +0530)]
Merge pull request #5596 from pratikshad/webtest2
Fixed webtest for civi-4.6
Kurund Jalmi [Thu, 9 Apr 2015 13:30:46 +0000 (19:00 +0530)]
Merge pull request #5599 from jitendrapurohit/CRM-15735webtest
webtest to verify membership dates as per the contribution receive_date
jitendrapurohit [Thu, 9 Apr 2015 11:39:22 +0000 (17:09 +0530)]
added doc
jitendrapurohit [Thu, 9 Apr 2015 11:19:03 +0000 (16:49 +0530)]
webtest to verify membership dates as per the contribution receive_date
atif-shaikh [Thu, 9 Apr 2015 10:52:56 +0000 (16:22 +0530)]
CRM-16258 - CiviCRM 4.6.0 membership list multiple member entries based on number of contributions.
https://issues.civicrm.org/jira/browse/CRM-16258
jitendrapurohit [Thu, 9 Apr 2015 10:10:32 +0000 (15:40 +0530)]
Fatal error fix
pratikshad [Thu, 9 Apr 2015 10:09:38 +0000 (15:39 +0530)]
CRM-16008 Fix-Import contacts: notes are imported twice
----------------------------------------
* CRM-16008: Import contacts: notes are imported twice
https://issues.civicrm.org/jira/browse/CRM-16008
jitendrapurohit [Mon, 6 Apr 2015 13:11:01 +0000 (18:41 +0530)]
Fix for Cannot add participants to event from search
pratikshad [Thu, 9 Apr 2015 09:32:54 +0000 (15:02 +0530)]
Fixed webtest for civi-4.6
Kurund Jalmi [Thu, 9 Apr 2015 09:29:46 +0000 (14:59 +0530)]
Merge pull request #5591 from jitendrapurohit/CRM-15735
update the membership dates as per contribution receive_date
Tim Otten [Thu, 9 Apr 2015 06:37:23 +0000 (23:37 -0700)]
Merge pull request #5595 from totten/4.6-agg-fixes
CRM-16145 - Angular aggregation fixes
Monish Deb [Thu, 9 Apr 2015 06:01:19 +0000 (11:31 +0530)]
Merge pull request #5547 from pratikshad/webtest1
Fixed webtest for civi-4.6
Tim Otten [Thu, 9 Apr 2015 05:28:53 +0000 (22:28 -0700)]
CRM-16246, CRM-16145 - When aggregating JS, strip full-line "//" comments.
In discussion of CRM-16246, we found that aggregation led to errors in
processing "//# sourceMappingURL=" comments in Chrome. We can't fix that
for all aggregators, but we can do something about the internal aggregator.
Tim Otten [Thu, 9 Apr 2015 04:20:04 +0000 (21:20 -0700)]
CRM-16145 - When aggregating JS, dedupe adjacent closures.
The reorganized Angular files have added ~50 identical closures, and there
are still other big modules which remain to split. Ideally, the raw JS
files wouldn't bother with these closures, but we'd have to rework the debug
use-case and karma use-case if we removed the closures from the original
file (and that most likely means a change to developer workflow). This
patch accomplishes the goal without changing developer workflow.
Tim Otten [Thu, 9 Apr 2015 02:33:31 +0000 (19:33 -0700)]
CRM-16145 - Angular - Don't aggregate CSS files
The main pain-point is decomposing and then aggregating JS files. CSS files
are a smaller issue, and they have harsher requirements because CSS files
may include file-path-expressions (which need to be filtered during
aggregation).
Tim Otten [Thu, 9 Apr 2015 04:43:12 +0000 (21:43 -0700)]
Merge pull request #5587 from totten/4.6-agg-cleanup
CRM-16145 - Cleanup Angular file structure
colemanw [Thu, 9 Apr 2015 00:23:43 +0000 (20:23 -0400)]
Merge pull request #5594 from colemanw/CRM-16260
CRM-16260 - Fix use of ts() within templates
Dave Greenberg [Wed, 8 Apr 2015 21:33:35 +0000 (14:33 -0700)]
Merge pull request #5588 from jitendrapurohit/CRM-16175
CRM-16175 - net amount sometimes incorrect for events involving partial payments.
Coleman Watts [Wed, 8 Apr 2015 21:29:53 +0000 (17:29 -0400)]
CRM-16260 - Fix use of ts() within templates
JKingsnorth [Wed, 8 Apr 2015 13:57:10 +0000 (14:57 +0100)]
CRM-16256: Skip empty fields on dedupe
jitendrapurohit [Wed, 8 Apr 2015 13:01:06 +0000 (18:31 +0530)]
update the membership dates as per contribution receive_date
jitendrapurohit [Wed, 8 Apr 2015 12:53:03 +0000 (18:23 +0530)]
minor fixes
jitendrapurohit [Wed, 8 Apr 2015 06:37:11 +0000 (12:07 +0530)]
net amount sometimes incorrect for events involving partial payments.
Monish Deb [Wed, 8 Apr 2015 12:51:56 +0000 (18:21 +0530)]
Merge pull request #5584 from rohankatkar/CRM-16228
Tax INVOICE PDF randomly changes Tax Rate
pratikshad [Wed, 8 Apr 2015 12:44:24 +0000 (18:14 +0530)]
Revert assert value due to typo
pratikshad [Thu, 2 Apr 2015 11:17:43 +0000 (16:47 +0530)]
Fixed webtest for civi-4.6
Tim Otten [Wed, 8 Apr 2015 06:46:47 +0000 (23:46 -0700)]
CRM-16145 - crmMailing - Match .js and .html files for dialogs
Tim Otten [Wed, 8 Apr 2015 06:27:24 +0000 (23:27 -0700)]
Remove empty stub, crmMailing/field/README.md
Tim Otten [Wed, 8 Apr 2015 06:26:31 +0000 (23:26 -0700)]
CRM-16145 - crmMailing - Split complex directives into separate files
Tim Otten [Wed, 8 Apr 2015 06:12:56 +0000 (23:12 -0700)]
CRM-16145 - crmMailing - Split simple directives into separate files
Tim Otten [Wed, 8 Apr 2015 04:53:39 +0000 (21:53 -0700)]
CRM-16145 - crmMailing - Rename edit*html
Tim Otten [Wed, 8 Apr 2015 04:46:25 +0000 (21:46 -0700)]
CRM-16145 - crmMailing - Split controllers into separate files
Tim Otten [Wed, 8 Apr 2015 03:27:29 +0000 (20:27 -0700)]
CRM-16145 - create-pot-files - Update to match new Angular locations
Tim Otten [Wed, 8 Apr 2015 03:52:12 +0000 (20:52 -0700)]
CRM-16145 - crmUtil - Move to ang/
Tim Otten [Wed, 8 Apr 2015 03:50:51 +0000 (20:50 -0700)]
CRM-16145 - crmUi - Move to ang/
Tim Otten [Wed, 8 Apr 2015 03:43:47 +0000 (20:43 -0700)]
CRM-16145 - crmMailing- Move to ang/
Tim Otten [Wed, 8 Apr 2015 03:36:30 +0000 (20:36 -0700)]
CRM-16145 - crmCaseType - Move to ang/
Tim Otten [Wed, 8 Apr 2015 03:32:01 +0000 (20:32 -0700)]
CRM-16145 - crmExample - Move to ang/
Tim Otten [Wed, 8 Apr 2015 03:28:26 +0000 (20:28 -0700)]
CRM-16145 - crmApp - Move to ang/
Tim Otten [Wed, 8 Apr 2015 03:15:51 +0000 (20:15 -0700)]
CRM-16145 - crmD3 - Move to ang/
Tim Otten [Wed, 8 Apr 2015 00:42:21 +0000 (17:42 -0700)]
CRM-16145 - crmAutosave - Move to ang/
Tim Otten [Wed, 8 Apr 2015 00:37:34 +0000 (17:37 -0700)]
CRM-16145 - crmAttachment - Move to ang/
Tim Otten [Wed, 8 Apr 2015 00:31:29 +0000 (17:31 -0700)]
CRM-16145 - crmMailingAB - Move CSS and services.js
Tim Otten [Wed, 8 Apr 2015 00:26:40 +0000 (17:26 -0700)]
CRM-16145 - crmMailingAB - Split directives into separate files
projects / civicrm-core.git / log