Gustavo Cruz f55ff5bdae Automatic merge with the upstream master branch

2012-11-29 12:18:58 -04:00

..

setupSchemas

adding the patches to the tinyMCE editor in order to solve the maborak/leinmud conflicts

2012-11-14 09:39:24 -04:00

appCacheViewAjax.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

appCacheViewConf.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

appearance.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

calendar_Ajax.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

calendarDelete.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

calendarEdit.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

calendarList.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

calendarSave.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

calendarValidate.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

clearCompiled.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

clearCompiledAjax.php

adding the patches to the tinyMCE editor in order to solve the maborak/leinmud conflicts

2012-11-14 09:39:24 -04:00

connectionDB.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

connectionWS.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

cron.php

adding the patches to the tinyMCE editor in order to solve the maborak/leinmud conflicts

2012-11-14 09:39:24 -04:00

cronAjax.php

adding the patches to the tinyMCE editor in order to solve the maborak/leinmud conflicts

2012-11-14 09:39:24 -04:00

customFunctions.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

debug.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

deleteSessions.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

emails_Ajax.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

emails_Save.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

emails.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

emailSystemCron.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

emailSystemSpool.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

emailSystemTest.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

environmentSettings.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

environmentSettingsAjax.php

CODE STYLE, workflow/engine/methods/setup/ PART 1

2012-10-17 15:40:37 -04:00

holiday.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

holidayNew.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

index.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

jasper.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

language_Ajax.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

language.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

languages_Delete.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

languages_Export.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

languages_Import.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

languages_ImportForm.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

languages.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

location.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

loginSettings.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

loginSettingsAjax.php

Removing G::getModel, deprecated function.

2012-11-27 17:15:57 -04:00

logo_Delete.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

main_init.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

main.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

mainAjax.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

pluginsChange.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

pluginsImport.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

pluginsImportFile.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

pluginsList.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

pluginsMain.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

pluginsRemove.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

pluginsSetup.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

pluginsSetupSave.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

processHeartBeatAjax.php

adding the patches to the tinyMCE editor in order to solve the maborak/leinmud conflicts

2012-11-14 09:39:24 -04:00

processHeartBeatConfig.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

processHeartBeatSave.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

replacementLogo.php

CODE STYLE, workflow/engine/methods/setup/ PART 2

2012-10-17 16:23:22 -04:00

setup.js

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

setup.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

setupAjax.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

showLogoFile.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

skin_Ajax.php

BUG 7817 Se puede ver todos los skins que tiene el servidor... SOLVED

2012-10-26 17:46:16 -04:00

skinsExport.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

skinsList.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

skinsNew.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

skinsSave.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

upgrade_RBAC.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

upgrade_System.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

upgrade_SystemAjax.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

upgrade.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

uplogo.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

webServices.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

webServicesAjax.php

Fix parse error in the file webServicesAjax.php

2012-10-31 16:57:25 -04:00

webServicesList.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

webServicesSetup.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

webServicesSetupSave.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

weekend.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

weekendAjax.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

workPeriod.js

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

workPeriod.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

workPeriodGraph.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00

workPeriodSave.php

CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

2012-10-17 17:21:35 -04:00