LimeSurvey: develop 357d5a2c

Diff Back to Repository
Author Committer Branch Timestamp Parent
LouisGac LouisGac develop 2017-06-22 15:49:44 develop b9006736
Changeset

Dev: merge 'Master' branch into develop
mod - .gitignore Diff File
mod - application/config/internal.php Diff File
mod - application/config/third_party.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/SurveyController.php Diff File
mod - application/controllers/admin/NotificationController.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/homepagesettings.php Diff File
mod - application/controllers/admin/htmleditor_pop.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/plugins/oldUrlCompat/oldUrlCompat.php Diff File
mod - application/extensions/AdminFooter/views/footer.php Diff File
mod - application/extensions/LimeScript/LimeScript.php Diff File
mod - application/extensions/PanelBoxWidget/PanelBoxWidget.php Diff File
mod - application/extensions/PanelBoxWidget/views/box.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php Diff File
add - application/extensions/captchaExtended/CHANGELOG Diff File
add - application/extensions/captchaExtended/CaptchaExtendedAction.php Diff File
add - application/extensions/captchaExtended/CaptchaExtendedValidator.php Diff File
add - application/extensions/captchaExtended/LICENSE Diff File
add - application/extensions/captchaExtended/README Diff File
add - application/extensions/captchaExtended/fonts/nimbus.ttf Diff File
add - application/extensions/captchaExtended/fonts/readme.txt Diff File
add - application/extensions/captchaExtended/words.de.txt Diff File
add - application/extensions/captchaExtended/words.en.txt Diff File
add - application/extensions/captchaExtended/words.ru.txt Diff File
add - application/extensions/captchaExtended/words.sk.txt Diff File
add - application/extensions/captchaExtended/words.txt Diff File
mod - application/favicon.ico Diff File
mod - application/helpers/admin/ajax_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/Date_Time_Converter.php Diff File
mod - application/libraries/PluginManager/Storage/DbStorage.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/libraries/admin/pclzip/pclzip.php Diff File
mod - application/models/Answer.php Diff File
mod - application/models/Notification.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/models/User.php Diff File
mod - application/views/admin/authentication/ajaxLogin.php Diff File
mod - application/views/admin/authentication/login.php Diff File
mod - application/views/admin/export/statistics_subviews/_question.php Diff File
mod - application/views/admin/global_settings/_email.php Diff File
mod - application/views/admin/global_settings/_security.php Diff File
mod - application/views/admin/remotecontrol/index_view.php Diff File
mod - application/views/admin/responses/browsemenubar_view.php Diff File
mod - application/views/admin/super/admin_notifications.php Diff File
mod - application/views/admin/super/footer.php Diff File
mod - application/views/admin/super/welcome.php Diff File
mod - application/views/admin/survey/prepareEditorScript_view.php Diff File
mod - application/views/admin/token/emailpost.php Diff File
mod - application/views/admin/token/invite.php Diff File
mod - application/views/admin/token/remind.php Diff File
mod - application/views/admin/translate/translatefields_view.php Diff File
mod - application/views/admin/translate/translatefieldsfooter_view.php Diff File
mod - application/views/admin/translate/translatefooter_view.php Diff File
mod - application/views/admin/translate/translateformheader_view.php Diff File
mod - application/views/admin/translate/translateheader_view.php Diff File
mod - application/views/admin/translate/translatetabs_view.php Diff File
mod - application/views/admin/update/check_updates/update_buttons/_updatesavailable.php Diff File
mod - application/views/admin/update/manage/manage_key.php Diff File
mod - application/views/admin/update/manage/subscribe.php Diff File
mod - application/views/admin/update/updater/_error.php Diff File
mod - application/views/admin/user/setuserpermissions.php Diff File
mod - application/views/admin/user/setusertemplates.php Diff File
mod - application/views/admin/usergroup/viewUserGroup_view.php Diff File
mod - application/views/installer/precheck_view.php Diff File
mod - assets/scripts/admin/comfortupdater/comfortupdater.js Diff File
mod - assets/scripts/admin/listresponse.js Diff File
mod - assets/scripts/admin/statistics.js Diff File
mod - assets/scripts/admin/subquestions.js Diff File
mod - assets/scripts/admin/translation.js Diff File
mod - assets/styles-admin/Apple_Blossom/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Apple_Blossom/css/lime-admin-common-rtl.css Diff File
mod - assets/styles-admin/Apple_Blossom/css/lime-admin-common.css Diff File
mod - assets/styles-admin/Apple_Blossom/images/Limesurvey_logo.png Diff File
mod - assets/styles-admin/Apple_Blossom/images/donate.png Diff File
mod - assets/styles-admin/Apple_Blossom/images/logo.png Diff File
mod - assets/styles-admin/Bay_of_Many/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Bay_of_Many/css/lime-admin-common-rtl.css Diff File
mod - assets/styles-admin/Bay_of_Many/css/lime-admin-common.css Diff File
mod - assets/styles-admin/Bay_of_Many/images/Limesurvey_logo.png Diff File
mod - assets/styles-admin/Bay_of_Many/images/donate.png Diff File
mod - assets/styles-admin/Bay_of_Many/images/logo.png Diff File
mod - assets/styles-admin/Black_Pearl/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Black_Pearl/css/lime-admin-common-rtl.css Diff File
mod - assets/styles-admin/Black_Pearl/css/lime-admin-common.css Diff File
mod - assets/styles-admin/Black_Pearl/images/Limesurvey_logo.png Diff File
mod - assets/styles-admin/Black_Pearl/images/donate.png Diff File
mod - assets/styles-admin/Black_Pearl/images/logo.png Diff File
mod - assets/styles-admin/Dark_Sky/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Dark_Sky/css/lime-admin-common-rtl.css Diff File
mod - assets/styles-admin/Dark_Sky/css/lime-admin-common.css Diff File
mod - assets/styles-admin/Dark_Sky/images/Limesurvey_logo.png Diff File
mod - assets/styles-admin/Dark_Sky/images/donate.png Diff File
mod - assets/styles-admin/Dark_Sky/images/logo.png Diff File
mod - assets/styles-admin/Free_Magenta/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Free_Magenta/css/lime-admin-common-rtl.css Diff File
mod - assets/styles-admin/Free_Magenta/css/lime-admin-common.css Diff File
mod - assets/styles-admin/Free_Magenta/images/Limesurvey_logo.png Diff File
mod - assets/styles-admin/Free_Magenta/images/donate.png Diff File
mod - assets/styles-admin/Free_Magenta/images/logo.png Diff File
mod - assets/styles-admin/Noto_All_Languages/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Noto_All_Languages/css/lime-admin-common-rtl.css Diff File
mod - assets/styles-admin/Noto_All_Languages/css/lime-admin-common.css Diff File
mod - assets/styles-admin/Noto_All_Languages/images/Limesurvey_logo.png Diff File
mod - assets/styles-admin/Noto_All_Languages/images/donate.png Diff File
mod - assets/styles-admin/Noto_All_Languages/images/logo.png Diff File
mod - assets/styles-admin/Purple_Tentacle/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Purple_Tentacle/css/lime-admin-common-rtl.css Diff File
mod - assets/styles-admin/Purple_Tentacle/css/lime-admin-common.css Diff File
mod - assets/styles-admin/Purple_Tentacle/images/Limesurvey_logo.png Diff File
mod - assets/styles-admin/Purple_Tentacle/images/donate.png Diff File
mod - assets/styles-admin/Purple_Tentacle/images/logo.png Diff File
mod - assets/styles-admin/Sea_Green/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Sea_Green/css/lime-admin-common-rtl.css Diff File
mod - assets/styles-admin/Sea_Green/css/lime-admin-common.css Diff File
mod - assets/styles-admin/Sea_Green/images/Limesurvey_logo.png Diff File
mod - assets/styles-admin/Sea_Green/images/donate.png Diff File
mod - assets/styles-admin/Sea_Green/images/logo.png Diff File
mod - assets/styles-admin/Sunset_Orange/css/lime-admin-colors.css Diff File
mod - assets/styles-admin/Sunset_Orange/css/lime-admin-common-rtl.css Diff File
mod - assets/styles-admin/Sunset_Orange/css/lime-admin-common.css Diff File
mod - assets/styles-admin/Sunset_Orange/images/Limesurvey_logo.png Diff File
mod - assets/styles-admin/Sunset_Orange/images/donate.png Diff File
mod - assets/styles-admin/Sunset_Orange/images/logo.png Diff File
mod - assets/styles-admin/favicon.ico Diff File
add - composer.json Diff File
mod - docs/release_notes.txt Diff File
mod - framework/.htaccess Diff File
mod - framework/YiiBase.php Diff File
mod - framework/base/CApplication.php Diff File
mod - framework/base/CComponent.php Diff File
add - framework/base/CDbStatePersister.php Diff File
mod - framework/base/CModule.php Diff File
mod - framework/base/CSecurityManager.php Diff File
mod - framework/base/CStatePersister.php Diff File
mod - framework/caching/CFileCache.php Diff File
mod - framework/caching/CRedisCache.php Diff File
mod - framework/cli/commands/MessageCommand.php Diff File
mod - framework/cli/commands/ShellCommand.php Diff File
mod - framework/cli/views/webapp/hg-hgignore Diff File
mod - framework/cli/views/webapp/protected/.htaccess Diff File
add - framework/cli/views/webapp/protected/config/database.php Diff File
mod - framework/cli/views/webapp/protected/models/LoginForm.php Diff File
mod - framework/cli/views/webapp/themes/classic/views/.htaccess Diff File
mod - framework/db/CDbConnection.php Diff File
mod - framework/db/ar/CActiveFinder.php Diff File
mod - framework/db/ar/CActiveRecord.php Diff File
add - framework/db/schema/cubrid/CCubridColumnSchema.php Diff File
add - framework/db/schema/cubrid/CCubridSchema.php Diff File
add - framework/db/schema/cubrid/CCubridTableSchema.php Diff File
mod - framework/db/schema/sqlite/CSqliteSchema.php Diff File
mod - framework/gii/assets/js/fancybox/jquery.fancybox-1.3.1.css Diff File
mod - framework/gii/components/Pear/Text/Diff.php Diff File
mod - framework/gii/components/Pear/Text/Diff/Engine/native.php Diff File
mod - framework/gii/components/Pear/Text/Diff/Engine/shell.php Diff File
mod - framework/gii/components/Pear/Text/Diff/Engine/string.php Diff File
mod - framework/gii/components/Pear/Text/Diff/Engine/xdiff.php Diff File
mod - framework/gii/components/Pear/Text/Diff/Mapped.php Diff File
mod - framework/gii/components/Pear/Text/Diff/Renderer.php Diff File
mod - framework/gii/components/Pear/Text/Diff/Renderer/context.php Diff File
mod - framework/gii/components/Pear/Text/Diff/Renderer/inline.php Diff File
mod - framework/gii/components/Pear/Text/Diff/Renderer/unified.php Diff File
mod - framework/gii/components/Pear/Text/Diff/ThreeWay.php Diff File
mod - framework/gii/components/Pear/Text/Diff3.php Diff File
mod - framework/gii/components/UserIdentity.php Diff File
add - framework/gii/generators/module/templates/default/components/.gitkeep Diff File
add - framework/gii/generators/module/templates/default/messages/.gitkeep Diff File
add - framework/gii/generators/module/templates/default/models/.gitkeep Diff File
add - framework/gii/generators/module/templates/default/views/layouts/.gitkeep Diff File
mod - framework/gii/models/LoginForm.php Diff File
mod - framework/i18n/CGettextMessageSource.php Diff File
mod - framework/i18n/data/README.txt Diff File
add - framework/i18n/data/ar_dj.php Diff File
add - framework/i18n/data/ar_eh.php Diff File
mod - framework/i18n/data/ar_er.php Diff File
mod - framework/i18n/data/ar_il.php Diff File
mod - framework/i18n/data/ar_km.php Diff File
mod - framework/i18n/data/ar_mr.php Diff File
mod - framework/i18n/data/ar_ps.php Diff File
mod - framework/i18n/data/ar_so.php Diff File
mod - framework/i18n/data/ar_td.php Diff File
mod - framework/i18n/data/ast.php Diff File
mod - framework/i18n/data/ast_es.php Diff File
mod - framework/i18n/data/bs_cyrl.php Diff File
mod - framework/i18n/data/bs_cyrl_ba.php Diff File
mod - framework/i18n/data/bs_latn.php Diff File
mod - framework/i18n/data/bs_latn_ba.php Diff File
mod - framework/i18n/data/ca_ad.php Diff File
mod - framework/i18n/data/en_150.php Diff File
mod - framework/i18n/data/en_ag.php Diff File
mod - framework/i18n/data/en_bs.php Diff File
mod - framework/i18n/data/en_cm.php Diff File
mod - framework/i18n/data/en_dm.php Diff File
mod - framework/i18n/data/en_fj.php Diff File
mod - framework/i18n/data/en_fm.php Diff File
mod - framework/i18n/data/en_gd.php Diff File
mod - framework/i18n/data/en_gg.php Diff File
mod - framework/i18n/data/en_gh.php Diff File
mod - framework/i18n/data/en_gi.php Diff File
mod - framework/i18n/data/en_gm.php Diff File
mod - framework/i18n/data/en_im.php Diff File
mod - framework/i18n/data/en_je.php Diff File
mod - framework/i18n/data/en_ke.php Diff File
mod - framework/i18n/data/en_ki.php Diff File
mod - framework/i18n/data/en_kn.php Diff File
mod - framework/i18n/data/en_ky.php Diff File
mod - framework/i18n/data/en_lc.php Diff File
mod - framework/i18n/data/en_lr.php Diff File
mod - framework/i18n/data/en_ls.php Diff File
mod - framework/i18n/data/en_mg.php Diff File
mod - framework/i18n/data/en_mw.php Diff File
mod - framework/i18n/data/en_ng.php Diff File
mod - framework/i18n/data/en_pg.php Diff File
mod - framework/i18n/data/en_pr.php Diff File
mod - framework/i18n/data/en_pw.php Diff File
mod - framework/i18n/data/en_sb.php Diff File
mod - framework/i18n/data/en_sc.php Diff File
mod - framework/i18n/data/en_sl.php Diff File
mod - framework/i18n/data/en_ss.php Diff File
mod - framework/i18n/data/en_sz.php Diff File
mod - framework/i18n/data/en_tc.php Diff File
mod - framework/i18n/data/en_to.php Diff File
mod - framework/i18n/data/en_tz.php Diff File
mod - framework/i18n/data/en_ug.php Diff File
mod - framework/i18n/data/en_vc.php Diff File
mod - framework/i18n/data/en_vg.php Diff File
mod - framework/i18n/data/en_vu.php Diff File
mod - framework/i18n/data/en_ws.php Diff File
mod - framework/i18n/data/en_zm.php Diff File
mod - framework/i18n/data/es_cu.php Diff File
mod - framework/i18n/data/es_ea.php Diff File
mod - framework/i18n/data/es_ic.php Diff File
mod - framework/i18n/data/es_ph.php Diff File
mod - framework/i18n/data/fr_dz.php Diff File
mod - framework/i18n/data/fr_ht.php Diff File
mod - framework/i18n/data/fr_ma.php Diff File
mod - framework/i18n/data/fr_mr.php Diff File
mod - framework/i18n/data/fr_mu.php Diff File
mod - framework/i18n/data/fr_nc.php Diff File
mod - framework/i18n/data/fr_pf.php Diff File
mod - framework/i18n/data/fr_sc.php Diff File
mod - framework/i18n/data/fr_sy.php Diff File
mod - framework/i18n/data/fr_tn.php Diff File
mod - framework/i18n/data/fr_vu.php Diff File
mod - framework/i18n/data/hr_ba.php Diff File
mod - framework/i18n/data/ia_fr.php Diff File
mod - framework/i18n/data/it_sm.php Diff File
mod - framework/i18n/data/jgo.php Diff File
mod - framework/i18n/data/jgo_cm.php Diff File
mod - framework/i18n/data/kkj.php Diff File
mod - framework/i18n/data/kkj_cm.php Diff File
mod - framework/i18n/data/ko_kp.php Diff File
mod - framework/i18n/data/ks.php Diff File
mod - framework/i18n/data/ks_arab.php Diff File
mod - framework/i18n/data/ks_arab_in.php Diff File
mod - framework/i18n/data/ln_ao.php Diff File
mod - framework/i18n/data/ln_cf.php Diff File
mod - framework/i18n/data/mgo.php Diff File
mod - framework/i18n/data/mgo_cm.php Diff File
mod - framework/i18n/data/ms_latn.php Diff File
mod - framework/i18n/data/ms_latn_bn.php Diff File
mod - framework/i18n/data/ms_latn_my.php Diff File
mod - framework/i18n/data/ms_latn_sg.php Diff File
mod - framework/i18n/data/nl_sr.php Diff File
mod - framework/i18n/data/nnh.php Diff File
mod - framework/i18n/data/nnh_cm.php Diff File
mod - framework/i18n/data/os.php Diff File
mod - framework/i18n/data/os_ge.php Diff File
mod - framework/i18n/data/os_ru.php Diff File
mod - framework/i18n/data/pt_cv.php Diff File
mod - framework/i18n/data/pt_mo.php Diff File
mod - framework/i18n/data/pt_tl.php Diff File
mod - framework/i18n/data/ru_by.php Diff File
mod - framework/i18n/data/ru_kg.php Diff File