Skip to content

Commit

Permalink
7.1beta
Browse files Browse the repository at this point in the history
  • Loading branch information
mattlorimer committed Feb 4, 2014
1 parent f241809 commit 94d649a
Show file tree
Hide file tree
Showing 30 changed files with 66 additions and 145 deletions.
10 changes: 0 additions & 10 deletions config_override.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
<?php
/***CONFIGURATOR***/
$sugar_config['passwordsetting']['SystemGeneratedPasswordON'] = '0';
$sugar_config['SAML_loginurl'] = '';
$sugar_config['SAML_X509Cert'] = '';
$sugar_config['authenticationClass'] = '';
$sugar_config['logger']['level'] = 'debug';
$sugar_config['default_module_favicon'] = false;
$sugar_config['dashlet_auto_refresh_min'] = '30';
$sugar_config['enable_action_menu'] = true;
$sugar_config['stack_trace_errors'] = false;
$sugar_config['developerMode'] = false;
/***CONFIGURATOR***/

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 2 additions & 1 deletion custom/include/social/get_feed_data.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
global $current_user;
global $sugar_config;

session_start();
//session_start();
$html = '';

$twitter_enabled = check_enabled($db, 'twitter');

Expand Down
2 changes: 1 addition & 1 deletion modules/AOD_Index/AOD_LogicHooks.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
class AOD_LogicHooks{

function saveModuleChanges(SugarBean $bean, $event, $arguments){
if(defined('sugarEntry') && SUGARCRM_IS_INSTALLING){
if(defined('sugarEntry') && 'SUGARCRM_IS_INSTALLING'){
return;
}
$index = BeanFactory::getBean("AOD_Index")->getIndex();
Expand Down
64 changes: 63 additions & 1 deletion modules/AOW_WorkFlow/language/en_us.lang.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,65 @@
<?php
/**
* Advanced OpenWorkflow, Automating SugarCRM.
* @package Advanced OpenWorkflow for SugarCRM
* @copyright SalesAgility Ltd http://www.salesagility.com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with this program; if not, see http://www.gnu.org/licenses
* or write to the Free Software Foundation,Inc., 51 Franklin Street,
* Fifth Floor, Boston, MA 02110-1301 USA
*
* @author SalesAgility <[email protected]>
*/


$mod_strings = array (
'LBL_ASSIGNED_TO_ID' => 'Assigned User Id',
'LBL_ASSIGNED_TO_NAME' => 'Assigned to',
'LBL_ID' => 'ID',
'LBL_DATE_ENTERED' => 'Date Created',
'LBL_DATE_MODIFIED' => 'Date Modified',
'LBL_MODIFIED' => 'Modified By',
'LBL_MODIFIED_ID' => 'Modified By Id',
'LBL_MODIFIED_NAME' => 'Modified By Name',
'LBL_CREATED' => 'Created By',
'LBL_CREATED_ID' => 'Created By Id',
'LBL_DESCRIPTION' => 'Description',
'LBL_DELETED' => 'Deleted',
'LBL_NAME' => 'Name',
'LBL_CREATED_USER' => 'Created by User',
'LBL_MODIFIED_USER' => 'Modified by User',
'LBL_LIST_NAME' => 'Name',
'LBL_LIST_FORM_TITLE' => 'WorkFlow List',
'LBL_MODULE_NAME' => 'WorkFlow',
'LBL_MODULE_TITLE' => 'WorkFlow',
'LBL_HOMEPAGE_TITLE' => 'My Work Flow',
'LNK_NEW_RECORD' => 'Create WorkFlow',
'LNK_LIST' => 'View WorkFlow',
'LNK_PROCESSED_LIST' => 'View Process Audit',
'LNK_IMPORT_AOW_WORKFLOW' => 'Import WorkFlow',
'LBL_SEARCH_FORM_TITLE' => 'Search WorkFlow',
'LBL_HISTORY_SUBPANEL_TITLE' => 'View History',
'LBL_ACTIVITIES_SUBPANEL_TITLE' => 'Activities',
'LBL_AOW_WORKFLOW_SUBPANEL_TITLE' => 'WorkFlow',
'LBL_NEW_FORM_TITLE' => 'New WorkFlow',
'LBL_FLOW_MODULE' => 'WorkFlow Module',
'LBL_STATUS' => 'Status',
'LBL_FLOW_RUN_ON' => 'Run On',
'LNK_IMPORT_AOW_WORKFLOW' => 'Import WorkFlow',
'LBL_AOW_WORKFLOW_SUBPANEL_TITLE' => 'WorkFlow',
'LBL_CONDITION_LINES' => 'Conditions',
'LBL_ADD_CONDITION' => 'Add Condition',
'LBL_ACTION_LINES' => 'Actions',
'LBL_ADD_ACTION' => 'Add Action',
'LBL_MULTIPLE_RUNS' => 'Repeated Runs',
);

0 comments on commit 94d649a

Please sign in to comment.