colemanw [Tue, 20 Jan 2015 18:14:16 +0000 (13:14 -0500)]
Merge pull request #4983 from colemanw/CRM-15842
CRM-15842 - Improve custom field multiple record display options
Coleman Watts [Tue, 20 Jan 2015 18:09:22 +0000 (13:09 -0500)]
CRM-15845 - Fix relationship datatables permission check
Dave Greenberg [Tue, 20 Jan 2015 17:48:31 +0000 (09:48 -0800)]
CRM-15819 - separate permission for Message Templates editing.
----------------------------------------
* CRM-15819: create separate permission for editing message templates
https://issues.civicrm.org/jira/browse/CRM-15819
Coleman Watts [Tue, 20 Jan 2015 17:20:19 +0000 (12:20 -0500)]
CRM-15842 - Improve custom field multiple record display options
----------------------------------------
* CRM-15842: Custom field form improvements
https://issues.civicrm.org/jira/browse/CRM-15842
Coleman Watts [Tue, 20 Jan 2015 15:03:49 +0000 (10:03 -0500)]
CRM-15842 - Custom group form cleanup
----------------------------------------
* CRM-15842: Custom field form improvements
https://issues.civicrm.org/jira/browse/CRM-15842
Monish Deb [Tue, 20 Jan 2015 09:55:34 +0000 (15:25 +0530)]
Merge pull request #4982 from monishdeb/4.5
CRM-15839 fix - Honoree profile doesn't show on Test contribution page
Tim Otten [Tue, 20 Jan 2015 09:47:52 +0000 (01:47 -0800)]
CRM_Core_ManagedEntities - Improve docs.
Tim Otten [Tue, 20 Jan 2015 08:10:49 +0000 (00:10 -0800)]
Merge pull request #4981 from totten/master-cbf2
INFRA-132 - Additional cleanups following latest merge with drupal/coder 8.x-2.x.
Yashodha Chaku [Tue, 20 Jan 2015 08:04:47 +0000 (13:34 +0530)]
Merge pull request #4980 from xurizaemon/CRM-15844
CRM-15844
monishdeb [Tue, 20 Jan 2015 06:34:51 +0000 (12:04 +0530)]
CRM-15839 fix - Honoree profile doesn't show on Test contribution page
https://issues.civicrm.org/jira/browse/CRM-15839
Tim Otten [Tue, 20 Jan 2015 05:42:23 +0000 (21:42 -0800)]
INFRA-132 - Misc
Tim Otten [Tue, 20 Jan 2015 05:33:26 +0000 (21:33 -0800)]
INFRA-132 - Misc
Chris Burgess [Tue, 20 Jan 2015 05:07:47 +0000 (18:07 +1300)]
CRM-15844
Replace missing bracket :(
Tim Otten [Tue, 20 Jan 2015 04:28:23 +0000 (20:28 -0800)]
INFRA-132 - Drupal.WhiteSpace.ScopeIndent.Incorrect
Tim Otten [Tue, 20 Jan 2015 04:03:41 +0000 (20:03 -0800)]
INFRA-132 - Misc
Tim Otten [Tue, 20 Jan 2015 03:57:19 +0000 (19:57 -0800)]
INFRA-132 - Misc
Tim Otten [Tue, 20 Jan 2015 03:27:12 +0000 (19:27 -0800)]
INFRA-132 - Misc
Tim Otten [Tue, 20 Jan 2015 03:20:37 +0000 (19:20 -0800)]
INFRA-132 - Drupal.Classes.ClassCreateInstance.ParenthesisMissing
Tim Otten [Tue, 20 Jan 2015 03:19:56 +0000 (19:19 -0800)]
INFRA-132 - Drupal.WhiteSpace.Comma.NoSpace
Tim Otten [Tue, 20 Jan 2015 03:19:00 +0000 (19:19 -0800)]
INFRA-132 - Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines
Tim Otten [Tue, 20 Jan 2015 03:15:33 +0000 (19:15 -0800)]
INFRA-132 - Squiz.Scope.MethodScope.Missing
Tim Otten [Tue, 20 Jan 2015 03:11:49 +0000 (19:11 -0800)]
INFRA-132 - Drupal.Array.Array.CommaLastItem
Tim Otten [Tue, 20 Jan 2015 02:46:18 +0000 (18:46 -0800)]
INFRA-132 - phpcbf Drupal.WhiteSpace.ScopeIndent.IncorrectExact
The automated cleanup sometimes screws with long, commented
code blocks and with statements that end "));", so I reviewed
the diff manually fixed any egregious examples.
Chris Burgess [Tue, 20 Jan 2015 01:56:36 +0000 (14:56 +1300)]
CRM-15844
Tim Otten [Tue, 20 Jan 2015 01:48:35 +0000 (17:48 -0800)]
INFRA-132 - Copyright header - Drupal.WhiteSpace.ScopeIndent.IncorrectExact
Tim Otten [Tue, 20 Jan 2015 01:20:28 +0000 (17:20 -0800)]
INFRA-132 - Drupal.Classes.ClassDeclaration
Tim Otten [Tue, 20 Jan 2015 01:45:34 +0000 (17:45 -0800)]
Merge pull request #4979 from xurizaemon/codingstandards-12
Coding standards cleanup sprint.
Tim Otten [Tue, 20 Jan 2015 01:11:14 +0000 (17:11 -0800)]
Merge pull request #4978 from ginkgomzd/make-static-can-dedupe
make function static to stop strict warnings and reflect how it is actua...
Chris Burgess [Tue, 20 Jan 2015 00:49:01 +0000 (13:49 +1300)]
Merge branch 'master' of git://github.com/civicrm/civicrm-core into codingstandards-12
Conflicts:
CRM/Core/Page.php
Chris Burgess [Tue, 20 Jan 2015 00:42:53 +0000 (13:42 +1300)]
Coding standards cleanup sprint.
See https://pad.riseup.net/p/QOOHQpetSXXo
This is batch 12.
Tim Otten [Tue, 20 Jan 2015 00:14:01 +0000 (16:14 -0800)]
Merge branch 'batch-20'
Tim Otten [Tue, 20 Jan 2015 00:13:53 +0000 (16:13 -0800)]
Merge branch 'master' into batch-20
Tim Otten [Tue, 20 Jan 2015 00:11:21 +0000 (16:11 -0800)]
INFRA-132 - Batch 20 - Restore non-function comments
colemanw [Mon, 19 Jan 2015 21:24:34 +0000 (16:24 -0500)]
Merge pull request #4977 from colemanw/CRM-15812
CRM-15812 - Remove linebreaks from within {ts} strings
ginkgoMZD [Mon, 19 Jan 2015 21:02:37 +0000 (16:02 -0500)]
make function static to stop strict warnings and reflect how it is actually used;
Monish Deb [Mon, 19 Jan 2015 19:30:40 +0000 (01:00 +0530)]
Merge pull request #4963 from rohankatkar/CRM-15830
Fix for CRM-15830
Coleman Watts [Mon, 19 Jan 2015 18:00:33 +0000 (13:00 -0500)]
CRM-15812 - Remove linebreaks from within {ts} strings
----------------------------------------
* CRM-15812: Translated strings not shown
https://issues.civicrm.org/jira/browse/CRM-15812
colemanw [Mon, 19 Jan 2015 17:26:56 +0000 (12:26 -0500)]
Merge pull request #4976 from colemanw/delOldUpgraders
Remove ancient upgrade scripts part 2
Coleman Watts [Mon, 19 Jan 2015 15:51:39 +0000 (10:51 -0500)]
Remove ancient upgrade scripts part 2
Monish Deb [Mon, 19 Jan 2015 11:28:57 +0000 (16:58 +0530)]
Merge pull request #4975 from rohankatkar/CRM-15838
Additional changes for CRM-15838
Web Access [Mon, 19 Jan 2015 10:09:56 +0000 (15:39 +0530)]
Additional commit for CRM-15838
kurund [Mon, 19 Jan 2015 09:45:47 +0000 (15:15 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-19-15-14-40
Monish Deb [Mon, 19 Jan 2015 09:43:58 +0000 (15:13 +0530)]
Merge pull request #4969 from lynxlynxlynx/master
Updated Slovenian "provinces": fixed names and added missing ones
yashodha [Mon, 19 Jan 2015 08:13:59 +0000 (13:43 +0530)]
clean up for batch-20
Tim Otten [Mon, 19 Jan 2015 06:53:05 +0000 (22:53 -0800)]
Merge pull request #4973 from PalanteJon/cleanup-master
INFRA-132 batch 2 cleanup
Tim Otten [Sat, 17 Jan 2015 12:10:39 +0000 (04:10 -0800)]
CRM-15832 - crmResource - Fix handling of domains
Tim Otten [Sat, 17 Jan 2015 00:22:06 +0000 (16:22 -0800)]
CRM-15832 - crmResource - Include the locale in the resource-bundle URL.
Tim Otten [Fri, 16 Jan 2015 11:35:01 +0000 (03:35 -0800)]
CRM-15832 - Rename CRM_Core_Page_Angular to Civi\Angular\Page\Main
Tim Otten [Fri, 16 Jan 2015 11:16:07 +0000 (03:16 -0800)]
CRM-15832 - Update various modules to use crmResource
Tim Otten [Fri, 16 Jan 2015 11:14:48 +0000 (03:14 -0800)]
CRM-15832 - crmResource - Add module to load partials+strings in batches.
Jon goldberg [Mon, 19 Jan 2015 05:19:22 +0000 (00:19 -0500)]
INFRA-132 batch 2 cleanup
Monish Deb [Mon, 19 Jan 2015 04:51:00 +0000 (10:21 +0530)]
Merge pull request #4972 from rohankatkar/Batch#17
Minor changes to Batch #17
Web Access [Mon, 19 Jan 2015 04:46:39 +0000 (10:16 +0530)]
Minor changes to Batch #17
Kurund Jalmi [Sun, 18 Jan 2015 19:12:09 +0000 (00:42 +0530)]
Merge pull request #4971 from kurund/batch-16
more cleanup batch 16
kurund [Sun, 18 Jan 2015 16:50:20 +0000 (22:20 +0530)]
more cleanup batch 16
colemanw [Sun, 18 Jan 2015 00:11:57 +0000 (19:11 -0500)]
Merge pull request #4970 from colemanw/CRM-15812
CRM-15812 - Fix missing ts
Coleman Watts [Sun, 18 Jan 2015 00:09:13 +0000 (19:09 -0500)]
CRM-15812 - Fix missing ts
----------------------------------------
* CRM-15812: Translated strings not shown
https://issues.civicrm.org/jira/browse/CRM-15812
Jaka Kranjc [Sat, 17 Jan 2015 21:41:45 +0000 (22:41 +0100)]
civicrm_state_province.tpl: added missing Slovenian "provinces"
Jaka Kranjc [Sat, 17 Jan 2015 20:45:02 +0000 (21:45 +0100)]
Use proper names for Slovenian municipalities
long live unicode!
Jaka Kranjc [Sat, 17 Jan 2015 20:26:55 +0000 (21:26 +0100)]
civicrm_state_province.tpl: added missing newline at EOF
Tim Otten [Fri, 16 Jan 2015 06:29:34 +0000 (22:29 -0800)]
CRM-15832 - Angular - Add page which aggregates partials+strings
Tim Otten [Fri, 16 Jan 2015 06:28:28 +0000 (22:28 -0800)]
CRM-15832 - getAngularModules - Move from CRM_Core_Page_Angular to Civi\Angular\Manager
Tim Otten [Fri, 16 Jan 2015 11:34:37 +0000 (03:34 -0800)]
CRM_Core_Page, CRM_Core_Form - Fix for PHP 5.3 namespaces
Tim Otten [Fri, 16 Jan 2015 06:24:42 +0000 (22:24 -0800)]
CRM_Core_Invoke - Backport support for PHP 5.3 namespaces
This is a partial backport of
0fc3cacbd2714be493afda6a33eda93846deaca2. It
includes support for PHP 5.3 namespaces but not for Symfony request/response
objects.
Tim Otten [Fri, 16 Jan 2015 02:40:51 +0000 (18:40 -0800)]
CRM-15832 - getAngularModules - Cleanup
Tim Otten [Fri, 16 Jan 2015 02:33:51 +0000 (18:33 -0800)]
CRM-15832 - getAngularModules - Declare partials, css, and js using globs
Tim Otten [Fri, 16 Jan 2015 02:33:30 +0000 (18:33 -0800)]
CRM-15832 - CRM_Core_Resources - Add glob() function
Tim Otten [Sat, 17 Jan 2015 11:41:52 +0000 (03:41 -0800)]
CRM/Event/Form/ManageEvent/Registration.php - Fix static usage warning
Tim Otten [Sat, 17 Jan 2015 11:42:54 +0000 (03:42 -0800)]
CRM.ts() - Respect domains when selecting/transmitting strings
Previousy, all strings from all JS files were translated in the default
'civicrm' domain, and they were transmitted via CRM.strings.
Now, strings from extension JS files are translated in their respective
domains, and they are transmitted via CRM['strings::'+domain]. If a string
is unavailable in the extension's domain, then it is translated using the
default 'civicrm' domain.
Strings from core JS files are still processed as before.
Tim Otten [Sat, 17 Jan 2015 09:46:28 +0000 (01:46 -0800)]
Merge pull request #4950 from atif-shaikh/CRM-15826
CRM-15826 - CiviCase core bugs
Tim Otten [Fri, 16 Jan 2015 04:05:40 +0000 (20:05 -0800)]
CRM-15832 - CRM_Core_Resources - Move translateScript to class. Add HTML support.
For the moment, it looks like the existing JS string-extractor actually
works for Angular-style HTML partials. This is not entirely a coincidence
(since our Angular convention was purposefully derived from our JS
convention), but luck/circumstance is a big factor, and this may not work in
the long-run. This commit makes it easy to use different string-extractors
for different file-types.
Monish Deb [Fri, 16 Jan 2015 13:06:34 +0000 (18:36 +0530)]
Merge pull request #4961 from pratikshad/core-bugs
Fixed Division by zero warning in Contribution Repeat CiviReport
Web Access [Fri, 16 Jan 2015 12:54:48 +0000 (18:24 +0530)]
Fix for CRM-15830
atif-shaikh [Fri, 16 Jan 2015 11:12:08 +0000 (16:42 +0530)]
flush out inappropriate changes
atif-shaikh [Fri, 16 Jan 2015 11:06:39 +0000 (16:36 +0530)]
Make sure that the "Change Timeline" business logic runs in a transaction
pratikshad [Fri, 16 Jan 2015 10:37:40 +0000 (16:07 +0530)]
Fixed warning of Division by zero in CiviReport
Kurund Jalmi [Fri, 16 Jan 2015 10:13:04 +0000 (15:43 +0530)]
Merge pull request #4954 from monishdeb/CRM-15812
CRM-15812 fix - Translated strings not shown
monishdeb [Mon, 2 Feb 2015 13:41:03 +0000 (19:11 +0530)]
CRM-15812 fix - Translated strings not shown
https://issues.civicrm.org/jira/browse/CRM-15812
Kurund Jalmi [Fri, 16 Jan 2015 10:12:30 +0000 (15:42 +0530)]
Merge pull request #4958 from pratikshad/code-cleanup-batch-19
Clean up code for batch 19
Yashodha Chaku [Fri, 16 Jan 2015 10:10:34 +0000 (15:40 +0530)]
Merge pull request #4953 from monishdeb/4.5
CRM-15813 fix - Honoree Information profile overwrites contributor infor...
monishdeb [Mon, 2 Feb 2015 13:03:20 +0000 (18:33 +0530)]
CRM-15813 fix - Honoree Information profile overwrites contributor information
https://issues.civicrm.org/jira/browse/CRM-15813
Kurund Jalmi [Fri, 16 Jan 2015 10:09:12 +0000 (15:39 +0530)]
Merge pull request #4960 from monishdeb/INFRA-32
INFRA-32 batch 11
monishdeb [Tue, 3 Feb 2015 07:52:04 +0000 (13:22 +0530)]
INFRA-32 batch 11
Kurund Jalmi [Fri, 16 Jan 2015 10:09:05 +0000 (15:39 +0530)]
Merge pull request #4959 from rohankatkar/batch-17
INFRA 32 - Batch #17
Kurund Jalmi [Fri, 16 Jan 2015 10:07:52 +0000 (15:37 +0530)]
Merge pull request #4957 from civicrm/batch-18
clean up changes for batch 18
Web Access [Fri, 16 Jan 2015 06:42:31 +0000 (12:12 +0530)]
INFRA 32 - Batch #17
Monish Deb [Fri, 16 Jan 2015 06:07:31 +0000 (11:37 +0530)]
Merge pull request #4951 from pratikshad/code-cleanup-batch-15
Fixed Code clean up for batch 15
pratikshad [Fri, 16 Jan 2015 05:58:43 +0000 (11:28 +0530)]
Fixed return void for clean up batch-15
yashodha [Fri, 16 Jan 2015 05:40:54 +0000 (11:10 +0530)]
clean up changes for batch 18
pratikshad [Fri, 16 Jan 2015 05:36:39 +0000 (11:06 +0530)]
Clean up code for batch 19
Monish Deb [Fri, 16 Jan 2015 05:25:52 +0000 (10:55 +0530)]
Merge pull request #4935 from atif-shaikh/CRM-15804
Crm 15804
Yashodha Chaku [Fri, 16 Jan 2015 03:14:26 +0000 (08:44 +0530)]
Merge pull request #4955 from atif-shaikh/master-cleanup
INFRA-132 - Batch #8
colemanw [Thu, 15 Jan 2015 20:05:17 +0000 (15:05 -0500)]
Merge pull request #4956 from colemanw/CRM-15820
CRM-15820 - Exclude deleted contacts from group counts
Coleman Watts [Thu, 15 Jan 2015 19:08:41 +0000 (14:08 -0500)]
CRM-15820 - Exclude deleted contacts from group counts
----------------------------------------
* CRM-15820: Manage Groups contact summary also counts contacts in trash
https://issues.civicrm.org/jira/browse/CRM-15820
atif-shaikh [Thu, 15 Jan 2015 14:35:41 +0000 (20:05 +0530)]
INFRA-132 - Batch #8
pratikshad [Thu, 15 Jan 2015 12:40:43 +0000 (18:10 +0530)]
Merge branch 'master' of github.com:civicrm/civicrm-core into code-cleanup-batch-15
pratikshad [Thu, 15 Jan 2015 12:33:19 +0000 (18:03 +0530)]
Fixed Code clean up for batch 15
Yashodha Chaku [Thu, 15 Jan 2015 11:46:40 +0000 (17:16 +0530)]
Merge pull request #4925 from KarinG/patch-1
CRM-15814 - Gecoder maxlength issue -> go to 12
Yashodha Chaku [Thu, 15 Jan 2015 11:29:06 +0000 (16:59 +0530)]
Merge pull request #4948 from pratikshad/code-cleanup
Fixed code after cleanup test
Yashodha Chaku [Thu, 15 Jan 2015 11:20:58 +0000 (16:50 +0530)]
Merge pull request #4940 from mlutfy/crm15824
CRM-15824: Add the thankyou_title variable to the online contribution receipt
projects / civicrm-core.git / log