Permalink
Browse files

Zurmo 0.6.71

  • Loading branch information...
1 parent 6a6652b commit b1e8314dbc3a7ba4141d0a1c1e4606af03ac5b04 @zurmo committed Jun 9, 2012
Showing 344 changed files with 12,104 additions and 1,193 deletions.
View
@@ -1,24 +1,25 @@
-b8703ff1a2842f3b0c31ba6ce3669d3900379e28 2667
+3133e9becf5ba12d3a93fac9784a1e6c635824ec 2704
dc87114b543cef2e514caaf53158a0cec6c16ba7 apiMergeWithDefault
230c4c3e04a5e758beea6778387d455fb1865a3f newuserinterface
2653dd0a3d797fbe612f7b80af3f99dfa70a4d28 webApi2
bc62c22cb4762add223203af0973ade04dd08182 webApi2
b5bf0195a342f5fb90a2503d4e5eba6c71360769 Iteration18
290f7e88f2f3db6c5d242cfcfabe1eae7bd15827 securityUI
+a8fa538bdb9ff23e16861ff4e8e6444aa95f3282 animations
75ef003933f3fb515bc2aee908502550087236a1 stableRev
d15d647e7e498839c54b0e6269a71b8d28a5c8b9 export
-46a1e237276ef0ffd528cc0dc21f0276dc729712 convoandmissions
+5adb1992e38ec0bd150262bb4dead71d7e216850 convoandmissions
33d15992195a243b446fafcf706979eac97dfa9e functionalTests
-b4029d4ba43530980f5f2d68bc2bc33a14cb05c9 userinterface2
+4761e92abce285570e61bd90a651e219a423089d userinterface2
df29338bf44ef9b65d2279bea0741a8b4dc1e897 performance2
3220e6338e10fd992b9239d210ac3bedcbafa219 gamification
8b50dabb972410a5a02f9ed40b7b47ddc899bd9f performance
f568a1cf9d4bd30dc8dc7803402778d784387458 geocoding
171ecad82f5a9c8fe6eb0bf10744051d51f9b63b optimizeFileImport
501772a62fababe91d24c5d41669e47148e50f64 installUtilTest
-123707ff55b2a0741def7382b203d448a92e1a16 emailMessages
+3133e9becf5ba12d3a93fac9784a1e6c635824ec emailMessages
1437f2424ae296777bde535c5fcc1ef4c3f701a4 minify
-e03ac43c18cf310c9ebe8ecf358deca78eaaa359 databasePort
+130854662b9687a821c60f0f89e54cc9a00c58cb additionalInstallationCheck
053bac7b7d041c7e08a94a34258835f5676ad3e5 smallTasks
0b127626ec5b9c2b30b2d436b1fb764ee11d3df8 mapping
67cce71b741908c74f9b84b894c5080b36213abd french
@@ -28,10 +29,11 @@ c3567ae696ed28fb036594476cf9b53293a30916 import
709bbb74b80f8a7ae269d0289e80a8348fffc8bb newAttributeTypes
8a73e24b0205f7f985c8bb360074068259f22002 unitTests
02f5d279c5b86e92ff4d61ca5f8b3cda38d48ed5 webApi
-b8703ff1a2842f3b0c31ba6ce3669d3900379e28 default
+91e4329bb07099638359061ceb484f5fdfe82c61 default
0edf7d4277aedeec9eff462e890885cbc4bcc41e multibyte-label
+be31fec16858e401973f2b5dc193e89f22d64ecb unittestargv
090661edd1811c5288282e568d4bf1646a2dc87b globalsearch
-130854662b9687a821c60f0f89e54cc9a00c58cb additionalInstallationCheck
+e03ac43c18cf310c9ebe8ecf358deca78eaaa359 databasePort
f075150ad2a79f2ded8bc1702e75d027dc312746 Spanish
fe65a71608dde103bed28c9fc5413a834aaf433a OptimizeDemoDataInstallation
e00de4a93c16847c9195998027c730b75db25903 installationTest
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -3385,3 +3385,41 @@ data/app/themes/default/less/token-input.less.i
data/app/themes/default/less/welcome.less.i
data/app/themes/default/less/widget-juiportlets.less.i
data/index.php.i
+data/app/protected/extensions/zurmoinc/framework/elements/RelatedItemsElement.php.i
+data/app/protected/extensions/zurmoinc/framework/forms/RelatedItemForm.php.i
+data/app/protected/extensions/zurmoinc/framework/views/ActionBarAndListView.php.i
+data/app/protected/modules/activities/observers/ActivitiesObserver.php.i
+data/app/protected/modules/activities/tests/unit/ActivitiesObserverTest.php.i
+data/app/protected/modules/activities/tests/unit/ActivitiesUtilTest.php.i
+data/app/protected/modules/conversations/controllers/DefaultController.php.i
+data/app/protected/modules/conversations/elements/actions/ConversationDeleteLinkActionElement.php.i
+data/app/protected/modules/conversations/elements/actions/ConversationsCreatedLinkActionElement.php.i
+data/app/protected/modules/conversations/elements/actions/ConversationsParticipantLinkActionElement.php.i
+data/app/protected/modules/conversations/elements/actions/security/ConversationItemsModalListActionSecurity.php.i
+data/app/protected/modules/conversations/elements/derived/ConversationItemsElement.php.i
+data/app/protected/modules/conversations/elements/derived/MultiplePeopleForConversationElement.php.i
+data/app/protected/modules/conversations/forms/ConversationItemForm.php.i
+data/app/protected/modules/conversations/models/Conversation.php.i
+data/app/protected/modules/conversations/models/ConversationParticipant.php.i
+data/app/protected/modules/conversations/rules/ConversationGamificationRules.php.i
+data/app/protected/modules/conversations/rules/ConversationMashableActivityRules.php.i
+data/app/protected/modules/conversations/tests/unit/ConversationsActionSecurityTest.php.i
+data/app/protected/modules/conversations/utils/ConversationUtil.php.i
+data/app/protected/modules/conversations/views/ConversationEditAndDetailsView.php.i
+data/app/protected/modules/conversations/views/ConversationsActionBarForListView.php.i
+data/app/protected/modules/conversations/views/ConversationsListView.php.i
+data/app/protected/modules/conversations/views/ConversationsPageView.php.i
+data/app/protected/modules/emailMessages/components/EmailArchivingHelper.php.i
+data/app/protected/modules/emailMessages/jobs/EmailArchivingJob.php.i
+data/app/protected/modules/emailMessages/tests/unit/EmailArchivingHelperTest.php.i
+data/app/protected/modules/emailMessages/tests/unit/EmailArchivingJobTest.php.i
+data/app/protected/modules/emailMessages/tests/unit/EmailClientForwardTemplatesTestHelper.php.i
+data/app/protected/modules/emailMessages/tests/unit/files/image.png.i
+data/app/protected/modules/emailMessages/tests/unit/files/table.csv.i
+data/app/protected/modules/emailMessages/tests/unit/files/text.txt.i
+data/app/protected/modules/home/views/WelcomeView.php.orig.i
+data/app/protected/modules/zurmo/models/Comment.php.i
+data/app/protected/modules/zurmo/tests/unit/RelatedItemRelationToModelElementUtilTest.php.i
+data/app/protected/modules/zurmo/utils/RelatedItemRelationToModelElementUtil.php.i
+data/app/themes/default/images/old/landscape-2-old.png.i
+data/app/themes/default/images/zbutton-spinner.gif.i
View
Binary file not shown.
View
@@ -1,3 +1,3 @@
-2554
+2668
pull
https://bitbucket.org/zurmo/zurmo
View
@@ -119,3 +119,11 @@ a242d3c64eabd4682b24c2deea69d9787953abd3 stable
25bd2ab5502b78066ff5d18dffecf136a7dc54e1 stable
a242d3c64eabd4682b24c2deea69d9787953abd3 unstable
25bd2ab5502b78066ff5d18dffecf136a7dc54e1 unstable
+25bd2ab5502b78066ff5d18dffecf136a7dc54e1 stable
+56854d93c5955528ae233c75edb3348a18bba3af stable
+25bd2ab5502b78066ff5d18dffecf136a7dc54e1 unstable
+56854d93c5955528ae233c75edb3348a18bba3af unstable
+56854d93c5955528ae233c75edb3348a18bba3af stable
+4ac904c62cc61d2e8f500f34fd708683966494eb stable
+56854d93c5955528ae233c75edb3348a18bba3af unstable
+4ac904c62cc61d2e8f500f34fd708683966494eb unstable
@@ -27,7 +27,7 @@
$common_config = array(
'basePath' => COMMON_ROOT . DIRECTORY_SEPARATOR . 'protected',
'name' => 'ZurmoCRM',
- 'defaultController' => 'home/default',
+ 'defaultController' => 'home/default/welcome',
'sourceLanguage' => 'en',
'behaviors' => array(
@@ -40,16 +40,16 @@
),
'components' => array(
- 'assetManager' => array(
- 'class' => 'ZurmoAssetManager',
- 'basePath' => INSTANCE_ROOT . DIRECTORY_SEPARATOR . 'assets/',
- ),
'apiRequest' => array(
'class' => 'application.modules.api.components.ApiRequest',
),
'apiHelper' => array(
'class' => 'application.modules.api.components.ZurmoApiHelper',
),
+ 'assetManager' => array(
+ 'class' => 'ZurmoAssetManager',
+ 'basePath' => INSTANCE_ROOT . DIRECTORY_SEPARATOR . 'assets/',
+ ),
'browser' => array(
'class' => 'application.extensions.zurmoinc.framework.components.Browser',
),
@@ -109,6 +109,7 @@
INSTANCE_ROOT . DIRECTORY_SEPARATOR . '/../yii/framework/web/js/source/jquery.yii.js',
INSTANCE_ROOT . DIRECTORY_SEPARATOR . '/../yii/framework/web/js/source/jquery.ba-bbq.js',
INSTANCE_ROOT . DIRECTORY_SEPARATOR . '/../yii/framework/web/js/source/jui/js/jquery-ui.min.js',
+ INSTANCE_ROOT . DIRECTORY_SEPARATOR . '/../yii/framework/web/js/source/jquery.yiiactiveform.js',
INSTANCE_ROOT . DIRECTORY_SEPARATOR . 'protected/extensions/qtip/assets/jquery.qtip-1.0.0-rc3.min.js',
INSTANCE_ROOT . DIRECTORY_SEPARATOR . 'protected/extensions/zurmoinc/framework/widgets/assets/extendedGridView/jquery.yiigridview.js',
INSTANCE_ROOT . DIRECTORY_SEPARATOR . 'protected/extensions/zurmoinc/framework/widgets/assets/fusionChart/jquery.fusioncharts.js',
@@ -137,6 +138,7 @@
array('system.web.js.source', '/jquery.yii.js'),
array('system.web.js.source', '/jquery.ba-bbq.js'),
array('system.web.js.source', '/jui/js/jquery-ui.min.js'),
+ array('system.web.js.source', '/jquery.yiiactiveform.js'),
array('application.extensions.qtip.assets', '/jquery.qtip-1.0.0-rc3.min.js'),
array('application.extensions.zurmoinc.framework.widgets.assets', '/extendedGridView/jquery.yiigridview.js'),
array('application.extensions.zurmoinc.framework.widgets.assets', '/fusionChart/jquery.fusioncharts.js'),
@@ -181,6 +183,7 @@
'importPageSize' => 50,
'dashboardListPageSize' => 5,
'apiListPageSize' => 10,
+ 'unlimitedPageSize' => 1000000000
),
'performance' => array(
'class' => 'application.extensions.zurmoinc.framework.components.PerformanceMeasurement',
@@ -270,6 +273,7 @@
'application.extensions.zurmoinc.framework.utils.FileUtil',
'application.extensions.zurmoinc.framework.utils.GeneralCache',
'application.extensions.zurmoinc.framework.exceptions.NotFoundException',
+ 'application.extensions.zurmoinc.framework.components.ZurmoLocale',
'application.modules.api.tests.unit.models.*',
'application.modules.api.tests.unit.forms.*',
'application.modules.install.serviceHelpers.MemcacheServiceHelper',
@@ -70,7 +70,7 @@
// memcache. A model's related models are not serialized
// along with it.
// Check it in as true!
- $memcacheLevelCaching = true;
+ $memcacheLevelCaching = false;
// Turn this off to test without db level caching of permissions.
// Check it in as true!
@@ -97,7 +97,7 @@
$seleniumTestResultsPath = '';
$seleniumServerPort = '4048';
$seleniumBrowsersToRun = 'All';
- $seleniumDbControlUrl = '';
+ $seleniumControlUrl = '';
if ($debugOn)
{
@@ -45,63 +45,12 @@
//$instanceConfig['components']['request']['hostInfo'] = '';
//$instanceConfig['components']['request']['scriptUrl'] = '';
- $urlManager = array (); //Set any parameters you want to customize url manager.
- $testApiUrl = '';
+ $urlManager = array (); // Set any parameters you want to customize url manager.
+ $testApiUrl = ''; // Set this url only for in perInstanceTest.php file. It should point to app directory, and it is used just for API tests.
+ // For example if zurmo index page is http://my-site.com/app/index.php, the value should be http://my-site.com/app
if (is_file(INSTANCE_ROOT . '/protected/config/perInstanceConfig.php'))
{
require_once INSTANCE_ROOT . '/protected/config/perInstanceConfig.php';
}
- // REMOVE THE REMAINDER OF THIS FILE FOR PRODUCTION.
- // This configuration is for development and testing.
- // Do not remove it from source control!
- // Check it in as mysql!
- /*
- $databaseType = 'mysql'; // mysql, sqlite, oracle, mysql, pgsql.
-
- switch ($databaseType)
- {
- case 'mysql':
- $connectionString = 'mysql:host=localhost;dbname=zurmo'; // Not Coding Standard
- break;
-
- case 'sqlite':
- switch (PHP_OS)
- {
- case 'WINNT':
- $connectionString = 'sqlite:' . getenv('TEMP') . '\zurmo.sqlite';
- break;
-
- case 'Linux':
- if (is_dir('/tmp/ram'))
- {
- $connectionString = 'sqlite:/tmp/ram/zurmo.sqlite';
- }
- else
- {
- $connectionString = 'sqlite:/tmp/zurmo.sqlite';
- }
- break;
-
- default:
- die(PHP_OS . ' is untested as yet.');
- }
- $username = null;
- $password = null;
- break;
-
- case 'pgsql':
- $connectionString = 'pgsql:host=localhost;dbname=zurmo'; // Not Coding Standard
- break;
-
- case 'oracle':
- die('Oracle is untested as yet.');
-
- case 'mssql':
- die('SQL Server is untested as yet.');
-
- default:
- die('Unknown database type.');
- }
- */
?>
@@ -53,6 +53,17 @@ public function run()
}
/**
+ * Returns the locale instance.
+ * This overrides the default CApplication->getLocale() function.
+ * @param string $localeID the locale ID (e.g. en_US). If null, the {@link getLanguage application language ID} will be used.
+ * @return CLocale the locale instance
+ */
+ public function getLocale($localeID = null)
+ {
+ return ZurmoLocale::getInstance($localeID === null ? $this->getLanguage() : $localeID);
+ }
+
+ /**
* Override so that the application looks at the controller class name differently.
* Instead of having controllers with the same class name across the application,
* each class name must be different.
Oops, something went wrong.

0 comments on commit b1e8314

Please sign in to comment.