Changesets: LimeSurvey
2.06 feedf7ee 2015-01-13 15:24:18 Details Diff |
Merge branch '2.06' of github.com:LimeSurvey/LimeSurvey into 2.06temp Conflicts: application/core/db/SmartColumnTypeTrait.php |
||
mod - application/controllers/RegisterController.php | Diff File | ||
mod - application/controllers/admin/assessments.php | Diff File | ||
mod - application/controllers/admin/database.php | Diff File | ||
mod - application/controllers/admin/surveyadmin.php | Diff File | ||
mod - application/core/db/DbConnection.php | Diff File | ||
mod - application/core/db/MssqlSchema.php | Diff File | ||
mod - application/core/db/MysqlSchema.php | Diff File | ||
mod - application/core/db/PgsqlSchema.php | Diff File | ||
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
mod - application/libraries/Save.php | Diff File | ||
mod - application/models/Permission.php | Diff File | ||
mod - application/models/Survey.php | Diff File | ||
mod - application/models/SurveyLanguageSetting.php | Diff File | ||
mod - application/views/admin/survey/editSurvey_view.php | Diff File | ||
mod - application/views/admin/survey/newSurvey_view.php | Diff File | ||
mod - scripts/admin/surveysettings.js | Diff File | ||
2.06 1db7223e 2015-01-13 15:19:06 Details Diff |
Merge branch '2.06' of github.com:LimeSurvey/LimeSurvey into upstream/2.06 | ||
mod - application/controllers/admin/database.php | Diff File | ||
mod - application/controllers/admin/surveyadmin.php | Diff File | ||
mod - application/models/Permission.php | Diff File | ||
mod - application/models/Survey.php | Diff File | ||
mod - application/models/SurveyLanguageSetting.php | Diff File | ||
mod - application/views/admin/survey/editSurvey_view.php | Diff File | ||
mod - application/views/admin/survey/newSurvey_view.php | Diff File | ||
mod - scripts/admin/surveysettings.js | Diff File | ||
2.06 f99d3f6d 2015-01-13 15:15:28 Details Diff |
Dev: remove updatesurveysettings from database controller Dev: Allow to save and review surveysettings (Great for plugins settings) (with hash) Dev: fix hasTemplatePermission : return global permission too Dev: Other are tab to space |
||
mod - application/controllers/admin/database.php | Diff File | ||
mod - application/controllers/admin/surveyadmin.php | Diff File | ||
mod - application/models/Permission.php | Diff File | ||
mod - application/models/Survey.php | Diff File | ||
mod - application/models/SurveyLanguageSetting.php | Diff File | ||
mod - application/views/admin/survey/editSurvey_view.php | Diff File | ||
mod - application/views/admin/survey/newSurvey_view.php | Diff File | ||
mod - scripts/admin/surveysettings.js | Diff File | ||
2.06 c13ab2af 2015-01-13 15:14:31 Details Diff |
Dev Removed 5.4 dependent functionality. | ||
mod - application/controllers/RegisterController.php | Diff File | ||
mod - application/controllers/admin/assessments.php | Diff File | ||
mod - application/core/db/DbConnection.php | Diff File | ||
mod - application/core/db/MssqlSchema.php | Diff File | ||
mod - application/core/db/MysqlSchema.php | Diff File | ||
mod - application/core/db/PgsqlSchema.php | Diff File | ||
rm - application/core/db/SmartColumnTypeTrait.php | Diff File | ||
2.06 c7eb2c3f 2015-01-13 15:01:43 Details Diff |
Dev Refactoring to remove TokenDynamic | ||
mod - application/controllers/admin/tokens.php | Diff File | ||
mod - application/helpers/common_helper.php | Diff File | ||
mod - application/models/Dynamic.php | Diff File | ||
mod - application/models/Token.php | Diff File | ||
2.06 cbe7850b 2015-01-13 12:51:06 Details Diff |
Dev: Removed httprequestit dependency from update checker. Removed randomchars function dependency from updatechecker. | ||
mod - application/helpers/common_helper.php | Diff File | ||
2.06 f32ab7c8 2015-01-12 21:39:20 Details Diff |
Improved plugin scanning. | ||
mod - application/config/internal.php | Diff File | ||
rm - application/config/plugins.php | Diff File | ||
mod - application/core/WebApplication.php | Diff File | ||
mod - application/libraries/PluginManager/PluginManager.php | Diff File | ||
add - plugins/befound/ls/ModulePlugin/config.json | Diff File | ||
rm - plugins/befound/ls/ModulePlugin/config.php | Diff File | ||
master 42a7148a 2015-01-12 21:27:07 Details Diff |
Merge remote-tracking branch 'GabrielJenik/Issue_09241' into Issue_09241 Conflicts: scripts/survey_runtime.js |
||
master e2859cf1 2015-01-12 21:22:20 Details Diff |
Fixed Issue 09241: Behaviour of numeric question type (and multi numeric) Dev Remove console.log command |
Affected Issues 09241 |
|
mod - scripts/survey_runtime.js | Diff File | ||
master 10d043ba 2015-01-12 21:20:58 Details Diff |
Fixed Issue 09241: Behaviour of numeric question type (and multi numeric) Dev Before sent to EM, treat numbers larger than 20 characters before decimal part or 10 after decimal part. |
Affected Issues 09241 |
|
mod - scripts/survey_runtime.js | Diff File | ||
2.06 2e039e15 2015-01-12 21:20:13 Details Diff |
Fixed Issue 09241: Behaviour of numeric question type (and multi numeric...) Dev Before sent to EM, treat numbers larger than 20 characters before decimal part or 10 after decimal part. |
Affected Issues 09241 |
|
mod - scripts/survey_runtime.js | Diff File | ||
master c0d86d2e 2015-01-12 21:04:38 Details Diff |
Fixed Issue 09241: Behaviour of numeric question type (and multi numeric) Dev Before sent to EM, treat numbers larger than 20 characters before decimal part or 10 after decimal part. |
Affected Issues 09241 |
|
mod - scripts/survey_runtime.js | Diff File | ||
2.06 555ae71c 2015-01-12 14:51:23 Details Diff |
Plugin module support, first draft. | ||
mod - application/Psr4AutoloaderClass.php | Diff File | ||
mod - application/config/internal.php | Diff File | ||
add - application/config/plugins.php | Diff File | ||
mod - application/controllers/PluginsController.php | Diff File | ||
mod - application/core/LSHttpRequest.php | Diff File | ||
mod - application/core/LSWebUser.php | Diff File | ||
mod - application/core/plugins/AuthLDAP/AuthLDAP.php | Diff File | ||
mod - application/core/plugins/Authdb/Authdb.php | Diff File | ||
mod - application/core/plugins/Authwebserver/Authwebserver.php | Diff File | ||
mod - application/core/plugins/ExportR/ExportR.php | Diff File | ||
mod - application/core/plugins/ExportSTATAxml/ExportSTATAxml.php | Diff File | ||
mod - application/helpers/globals.php | Diff File | ||
mod - application/libraries/PluginManager/PluginBase.php | Diff File | ||
add - application/libraries/PluginManager/PluginController.php | Diff File | ||
mod - application/libraries/PluginManager/PluginEvent.php | Diff File | ||
mod - application/libraries/PluginManager/PluginManager.php | Diff File | ||
add - application/libraries/PluginManager/PluginModule.php | Diff File | ||
add - application/libraries/PluginManager/PluginTrait.php | Diff File | ||
mod - application/libraries/PluginManager/iPlugin.php | Diff File | ||
mod - application/models/Permission.php | Diff File | ||
mod - application/tests/bootstrap.php | Diff File | ||
mod - framework/web/CWebApplication.php | Diff File | ||
mod - index.php | Diff File | ||
mod - plugins/AuditLog/AuditLog.php | Diff File | ||
add - plugins/AuditLog/config.php | Diff File | ||
rm - plugins/ModulePlugin/ModulePlugin.php | Diff File | ||
add - plugins/befound/ls/ModulePlugin/ModulePlugin.php | Diff File | ||
add - plugins/befound/ls/ModulePlugin/config.php | Diff File | ||
add - plugins/befound/ls/ModulePlugin/controllers/DashboardController.php | Diff File | ||
2.06 f2195fb3 2015-01-12 11:19:38 Details Diff |
Dev Moved logging configuration to config files. | ||
mod - application/config/internal.php | Diff File | ||
mod - application/core/LSYii_Application.php | Diff File | ||
2.06 334529f9 2015-01-12 11:11:26 Details Diff |
Moved configuration to internal configuration file. | ||
mod - application/config/internal.php | Diff File | ||
mod - application/core/LSYii_Application.php | Diff File | ||
2.06 173e8130 2015-01-12 10:52:28 Details Diff |
Fixed ussue 09441: refurl does not catch external referrer url |
Affected Issues 09441 |
|
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
mod - application/libraries/Save.php | Diff File | ||
2.06 c07ce027 2015-01-12 10:52:28 Details Diff |
Fixed issue 09441: refurl does not catch external referrer url |
Affected Issues 09441 |
|
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
mod - application/libraries/Save.php | Diff File | ||
master 66e21868 2015-01-12 10:50:43 Details Diff |
Fixed ussue 09441: refurl does not catch external referrer url |
Affected Issues 09441 |
|
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
mod - application/libraries/Save.php | Diff File | ||
2.06 9341264b 2015-01-12 10:37:25 Details Diff |
Dev Removed silent fail if token table can't be created.` | ||
mod - application/models/Token.php | Diff File | ||
2.06 3ec16d10 2015-01-12 10:28:43 Details Diff |
Dev Moved token table creation to token model. Moved PluginManager to namespace. | ||
add - application/Psr4AutoloaderClass.php | Diff File | ||
mod - application/config/internal.php | Diff File | ||
mod - application/controllers/admin/authentication.php | Diff File | ||
mod - application/controllers/admin/tokens.php | Diff File | ||
mod - application/core/LSUserIdentity.php | Diff File | ||
mod - application/core/LSYii_Application.php | Diff File | ||
add - application/core/PluginEvent.php | Diff File | ||
mod - application/core/db/SmartColumnTypeTrait.php | Diff File | ||
mod - application/core/plugins/Authdb/Authdb.php | Diff File | ||
mod - application/helpers/admin/activate_helper.php | Diff File | ||
mod - application/helpers/admin/import_helper.php | Diff File | ||
mod - application/helpers/admin/token_helper.php | Diff File | ||
mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
mod - application/helpers/update/updatedb_helper.php | Diff File | ||
mod - application/libraries/PluginManager/AuthPluginBase.php | Diff File | ||
mod - application/libraries/PluginManager/LimesurveyApi.php | Diff File | ||
mod - application/libraries/PluginManager/PluginBase.php | Diff File | ||
mod - application/libraries/PluginManager/PluginEvent.php | Diff File | ||
mod - application/libraries/PluginManager/PluginEventContent.php | Diff File | ||
mod - application/libraries/PluginManager/PluginManager.php | Diff File | ||
mod - application/libraries/PluginManager/Question/QuestionBase.php | Diff File | ||
mod - application/libraries/PluginManager/Question/QuestionPluginAbstract.php | Diff File | ||
mod - application/libraries/PluginManager/Question/iQuestion.php | Diff File | ||
mod - application/libraries/PluginManager/Storage/DbStorage.php | Diff File | ||
mod - application/libraries/PluginManager/Storage/DummyStorage.php | Diff File | ||
mod - application/libraries/PluginManager/Storage/iPluginStorage.php | Diff File | ||
mod - application/libraries/PluginManager/iPlugin.php | Diff File | ||
mod - application/models/Token.php | Diff File | ||
mod - application/models/behaviors/PluginEventBehavior.php | Diff File | ||
mod - index.php | Diff File | ||
2.06 f9f3067c 2015-01-12 07:33:28 Details Diff |
Dev Preparing PluginManager for PSR4-autoloading. | ||
mod - application/config/internal.php | Diff File | ||
mod - application/core/LSYii_Application.php | Diff File | ||
mod - application/core/db/MssqlSchema.php | Diff File | ||
mod - application/libraries/PluginManager/PluginManager.php | Diff File | ||
add - plugins/ModulePlugin/ModulePlugin.php | Diff File | ||
master 3ced9874 2015-01-12 00:06:39 LimeSurvey Translations Bot Details Diff |
Updated translation: Czech by slansky Updated translation: Finnish by morbid Updated translation: French (France) by arnaud21 Updated translation: Japanese by nomoto, yamatt Updated translation: Norwegian (Bokmål) by pmonstad Updated translation: Dutch by Han, mdekker Updated translation: Norwegian (Nynorsk) by pmonstad Updated translation: Polish by elisa Updated translation: Turkish by kayazeren Updated translation: Czech (Informal) by slansky Updated translation: Dutch (Informal) by Han |
||
mod - locale/cs-informal/LC_MESSAGES/cs-informal.mo | Diff File | ||
mod - locale/cs/LC_MESSAGES/cs.mo | Diff File | ||
mod - locale/fi/LC_MESSAGES/fi.mo | Diff File | ||
mod - locale/fr/LC_MESSAGES/fr.mo | Diff File | ||
mod - locale/ja/LC_MESSAGES/ja.mo | Diff File | ||
mod - locale/nb/LC_MESSAGES/nb.mo | Diff File | ||
mod - locale/nl-informal/LC_MESSAGES/nl-informal.mo | Diff File | ||
mod - locale/nl/LC_MESSAGES/nl.mo | Diff File | ||
mod - locale/nn/LC_MESSAGES/nn.mo | Diff File | ||
mod - locale/pl/LC_MESSAGES/pl.mo | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.mo | Diff File | ||
2.06 20533db7 2015-01-11 18:21:45 Details Diff |
Refactor database specific code into appropriate overriden classes. | ||
mod - application/config/internal.php | Diff File | ||
mod - application/controllers/RegisterController.php | Diff File | ||
mod - application/controllers/admin/tokens.php | Diff File | ||
add - application/core/db/DbConnection.php | Diff File | ||
add - application/core/db/MssqlSchema.php | Diff File | ||
add - application/core/db/MysqlSchema.php | Diff File | ||
add - application/core/db/PgsqlSchema.php | Diff File | ||
add - application/core/db/SmartColumnTypeTrait.php | Diff File | ||
mod - application/helpers/admin/activate_helper.php | Diff File | ||
mod - application/helpers/admin/token_helper.php | Diff File | ||
mod - application/helpers/database_helper.php | Diff File | ||
mod - application/helpers/update/updatedb_helper.php | Diff File | ||
mod - application/models/ParticipantAttributeName.php | Diff File | ||
mod - application/models/Token.php | Diff File | ||
mod - application/models/TokenDynamic.php | Diff File | ||
2.06 653ce2a1 2015-01-08 10:40:56 Details Diff |
New feature 09442: Allow to save (not save and quit) in Plugin settings and global settings Dev: Add actual tab to url in #tabs Dev: Fix an notice in settingsWidget buttons Dev: TODO : same for survey settings |
||
mod - application/controllers/PluginsController.php | Diff File | ||
mod - application/controllers/admin/globalsettings.php | Diff File | ||
mod - application/extensions/SettingsWidget/SettingsWidget.php | Diff File | ||
mod - application/views/admin/globalSettings_view.php | Diff File | ||
mod - application/views/plugins/configure.php | Diff File | ||
mod - scripts/admin/admin_core.js | Diff File | ||
mod - scripts/admin/globalsettings.js | Diff File | ||
2.06 bbf129d1 2015-01-07 15:07:22 Details Diff |
Dev: use completed.pstpl for quota end too Dev: already done in https://github.com/LimeSurvey/LimeSurvey/commit/1b82d7edcb75c1a59fb44aace2c651df72334650 Dev: Just remove the comment |
||
mod - application/helpers/frontend_helper.php | Diff File |