Changesets: LimeSurvey

Search Browse Back to Index

2.5 6e15f2a6

2015-09-30 10:34

LouisGac


Details Diff		 Dev: removing assets directory from gitignore
mod - tmp/.gitignore Diff File

2.5 07b81d93

2015-09-30 10:34

Olle Haerstedt


Details Diff		 Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5
mod - .gitignore Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/views/admin/survey/surveySummary_view.php Diff File
add - tmp/.gitignore Diff File
add - tmp/assets/.gitignore Diff File
add - tmp/assets/index.html Diff File
add - tmp/index.html Diff File

2.5 b6b61729

2015-09-30 10:31

Olle Haerstedt


Details Diff		 Dev: Add missing end-quote and end-paranthesis in onclick
mod - application/views/admin/survey/Question/nquestionbar_view.php Diff File

2.5 7b9349c7

2015-09-30 10:30

LouisGac


Details Diff		 Ls
add - tmp/index.html Diff File

2.5 fd88679e

2015-09-30 10:25

LouisGac


Details Diff		 Dev: git !ignoring...
mod - .gitignore Diff File
add - tmp/.gitignore Diff File

2.5 b07746d2

2015-09-30 10:23

LouisGac


Details Diff		 Dev: add assets/index.html as an exception to gitignore
mod - .gitignore Diff File

master 1806424e

2015-09-30 10:10

c_schmitz


Details Diff		 Release 2.06+ Build 150930
mod - docs/release_notes.txt Diff File

master c04b1edf

2015-09-30 10:06

LimeSurvey Translations Bot


Details Diff		 Updated translation: Catalan by c_schmitz, qualitatuvic
Updated translation: French (France) by arnaud21
Updated translation: Italian by lfanfoni
Updated translation: Japanese by nomoto
Updated translation: Latvian by c_schmitz, marcic
Updated translation: Norwegian (Bokmål) by pmonstad
Updated translation: Dutch by Han
Updated translation: Norwegian (Nynorsk) by pmonstad
Updated translation: Polish by elisa
Updated translation: Russian by ddrmoscow, vipgroup
Updated translation: Swedish by maxzomborszki
Updated translation: Tamil by apmuthu
Updated translation: Thai by tomzt
Updated translation: Turkish by kayazeren
Updated translation: Italian (Informal) by lfanfoni
Updated translation: Dutch (Informal) by Han
Updated translation: Polish (Informal) by elisa
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/lv/lv.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - locale/ta/ta.mo Diff File
mod - locale/th/th.mo Diff File
mod - locale/tr/tr.mo Diff File

2.5 7c8d9621

2015-09-30 09:53

LouisGac


Details Diff		 Dev: space/tabs mix. Corrected the oSurvey test in Survey_Common_Action
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/views/admin/survey/surveySummary_view.php Diff File

develop d7f8df32

2015-09-29 17:18

sammousa


Details Diff		 Dev More clean up and some minor fixes.
mod - protected/core/WebApplication.php Diff File
mod - protected/helpers/ClassFactory.php Diff File
mod - protected/models/Survey.php Diff File
mod - protected/models/Token.php Diff File

2.5 03fed1fd

2015-09-29 17:05

Olle Haerstedt


Details Diff		 Dev: Remove control-label for labels above textarea in Edit servey text-elements
mod - application/views/admin/survey/editLocalSettings_view.php Diff File

2.5 aa88e095

2015-09-29 17:02

Olle Haerstedt


Details Diff		 Dev: Add todo note about CSS class htmleditorboot
mod - styles/limebootstrap/assets/css/lime-admin.css Diff File

develop 645e47ff

2015-09-29 16:57

sammousa


Details Diff		 Dev more cleanup
mod - protected/models/Survey.php Diff File
mod - protected/models/User.php Diff File
rm - protected/views/admin/authentication/error.php Diff
rm - protected/views/admin/authentication/forgotpassword.php Diff
rm - protected/views/admin/authentication/message.php Diff
rm - protected/views/admin/authentication/success.php Diff
rm - protected/views/admin/endScripts_view.php Diff
rm - protected/views/admin/error_view.php Diff
rm - protected/views/admin/htmleditor/pop_editor_view.php Diff
rm - protected/views/admin/htmleditor/pop_nofields_view.php Diff
rm - protected/views/admin/limeReplacementFields_view.php Diff
rm - protected/views/admin/remotecontrol/index_view.php Diff
rm - protected/views/admin/survey/Question/advanced_settings_view.php Diff
rm - protected/views/admin/survey/Question/answerOptions_view.php Diff
rm - protected/views/admin/survey/Question/editdefaultvalues_view.php Diff
rm - protected/views/admin/survey/Question/import_view.php Diff
rm - protected/views/admin/survey/Question/questionJavascript_view.php Diff
rm - protected/views/admin/survey/Question/subQuestion_view.php Diff
rm - protected/views/admin/survey/Question/yesNo_defaultvalue_widget.php Diff
rm - protected/views/admin/survey/QuestionGroups/addGroup_view.php Diff
rm - protected/views/admin/survey/QuestionGroups/editGroup_view.php Diff
rm - protected/views/admin/survey/QuestionGroups/import_view.php Diff
rm - protected/views/admin/survey/QuestionGroups/questiongroupbar_view.php Diff
rm - protected/views/admin/survey/activateSurvey_view.php Diff
rm - protected/views/admin/survey/copySurvey_view.php Diff
rm - protected/views/admin/survey/deactivateSurvey_view.php Diff
rm - protected/views/admin/survey/deleteSurvey_view.php Diff
rm - protected/views/admin/survey/editLocalSettings_main_view.php Diff
rm - protected/views/admin/survey/editLocalSettings_view.php Diff
rm - protected/views/admin/survey/editSurvey_view.php Diff
rm - protected/views/admin/survey/importSurveyResources_view.php Diff
rm - protected/views/admin/survey/importSurvey_view.php Diff
rm - protected/views/admin/survey/listSurveys_view.php Diff
rm - protected/views/admin/survey/newSurveyBrowserMessage.php Diff
rm - protected/views/admin/survey/newSurvey_view.php Diff
rm - protected/views/admin/user/deluser.php Diff
rm - protected/views/admin/user/editusers.php Diff
rm - protected/views/admin/user/mboxwithredirect.php Diff
rm - protected/views/admin/user/modifyuser.php Diff
rm - protected/views/admin/user/personalsettings.php Diff
rm - protected/views/admin/user/setuserpermissions.php Diff
rm - protected/views/admin/user/setusertemplates.php Diff
rm - protected/views/admin/usergroup/addUserGroup_view.php Diff
rm - protected/views/admin/usergroup/editUserGroup_view.php Diff
rm - protected/views/admin/usergroup/mailUserGroup_view.php Diff
rm - protected/views/admin/usergroup/plain.php Diff
rm - protected/views/admin/usergroup/viewUserGroup_view.php Diff
mod - protected/views/global/menu.php Diff File
mod - protected/views/global/participantMenu.php Diff File

2.5 c9edf0ce

2015-09-29 16:55

Olle Haerstedt


Details Diff		 Dev: Use Bootsrap for Edit survey text-elements
mod - application/views/admin/survey/editLocalSettings_view.php Diff File

develop ad5cb2ac

2015-09-29 16:47

sammousa


Details Diff		 Dev more cleanup
rm - protected/core/LSAuthResult.php Diff
rm - protected/core/LSUserIdentity.php Diff
rm - protected/core/LSYii_CaseValidator.php Diff
rm - protected/core/LSYii_EmailIDNAValidator.php Diff
mod - protected/models/Survey.php Diff File
mod - protected/models/Token.php Diff File

develop c2bcd10f

2015-09-29 16:43

sammousa


Details Diff		 Dev Removed some unneeded files or files that can be included via composer if needed.
rm - protected/controllers/admin/emailtemplates.php Diff
rm - protected/controllers/admin/htmleditor_pop.php Diff
rm - protected/helpers/admin/activate_helper.php Diff
rm - protected/helpers/admin/htmleditor_helper.php Diff
rm - protected/helpers/admin/template_helper.php Diff
rm - protected/libraries/LSZend_XmlRpc_Response_Http.php Diff
rm - protected/third_party/.gitattributes Diff
rm - protected/third_party/gtranslate-api/COPYING Diff
rm - protected/third_party/gtranslate-api/ChangeLog Diff
rm - protected/third_party/gtranslate-api/GTranslate.php Diff
rm - protected/third_party/gtranslate-api/languages.ini Diff
rm - protected/third_party/gtranslate-api/languages.v2.ini Diff
rm - protected/third_party/pchart/pchart/pCache.class Diff
rm - protected/third_party/pchart/pchart/pChart.class Diff
rm - protected/third_party/pchart/pchart/pData.class Diff
rm - protected/third_party/pclzip/gnu-lgpl.txt Diff
rm - protected/third_party/pclzip/pclzip.lib.php Diff
rm - protected/third_party/pclzip/readme.txt Diff
rm - protected/third_party/pear/OLE/OLE.php Diff
rm - protected/third_party/pear/OLE/PPS.php Diff
rm - protected/third_party/pear/OLE/PPS/File.php Diff
rm - protected/third_party/pear/OLE/PPS/Root.php Diff
rm - protected/third_party/pear/PEAR.php Diff
rm - protected/views/admin/templates/importform_view.php Diff
rm - protected/views/admin/templates/importuploaded_view.php Diff
rm - protected/views/admin/templates/templateeditor_assessments_view.php Diff
rm - protected/views/admin/templates/templateeditor_completed_view.php Diff
rm - protected/views/admin/templates/templateeditor_navigator_view.php Diff
rm - protected/views/admin/templates/templateeditor_printablesurvey_quesanswer_view.php Diff
rm - protected/views/admin/templates/templateeditor_printoutput_view.php Diff
rm - protected/views/admin/templates/templateeditor_question_answer_view.php Diff
rm - protected/views/admin/templates/templateeditor_question_meta_view.php Diff
rm - protected/views/admin/templates/templateeditor_surveylist_view.php Diff
rm - protected/views/admin/templates/templateeditorbar_view.php Diff
rm - protected/views/admin/templates/templatesummary_view.php Diff

develop 0b59287d

2015-09-29 16:35

sammousa


Details Diff		 Moved all models to namespace.
mod - composer.json Diff File
mod - composer.lock Diff File
mod - protected/commands/ResetPasswordCommand.php Diff File
mod - protected/components/AuthManager.php Diff File
mod - protected/components/MemoryValidator.php Diff File
mod - protected/components/QuestionResponseField.php Diff File
mod - protected/components/QuestionValidationResult.php Diff File
mod - protected/components/RenderedQuestion.php Diff File
rm - protected/components/SurveyRenderer.php Diff
mod - protected/components/SurveySession.php Diff File
mod - protected/components/UserIdentity.php Diff File
mod - protected/config/config-defaults.php Diff File
mod - protected/config/internal.php Diff File
mod - protected/config/ldap.php Diff File
rm - protected/config/tcpdf.php Diff
mod - protected/controllers/AdminController.php Diff File
mod - protected/controllers/Controller.php Diff File
mod - protected/controllers/ExpressionsController.php Diff File
mod - protected/controllers/FilesController.php Diff File
mod - protected/controllers/GroupsController.php Diff File
mod - protected/controllers/InstallerController.php Diff File
mod - protected/controllers/OptoutController.php Diff File
mod - protected/controllers/ParticipantsController.php Diff File
mod - protected/controllers/PluginsController.php Diff File
mod - protected/controllers/PrintanswersController.php Diff File
mod - protected/controllers/QuestionsController.php Diff File
mod - protected/controllers/RegisterController.php Diff File
mod - protected/controllers/ResponsesController.php Diff File
mod - protected/controllers/Statistics_userController.php Diff File
mod - protected/controllers/SurveysController.php Diff File
mod - protected/controllers/TemplatesController.php Diff File
mod - protected/controllers/TokensController.php Diff File
mod - protected/controllers/UploaderController.php Diff File
mod - protected/controllers/admin/ExpressionValidate.php Diff File
mod - protected/controllers/admin/assessments.php Diff File
mod - protected/controllers/admin/checkintegrity.php Diff File
mod - protected/controllers/admin/conditionsaction.php Diff File
mod - protected/controllers/admin/dataentry.php Diff File
mod - protected/controllers/admin/emailtemplates.php Diff File
mod - protected/controllers/admin/export.php Diff File
mod - protected/controllers/admin/expressions.php Diff File
mod - protected/controllers/admin/labels.php Diff File
mod - protected/controllers/admin/participantsaction.php Diff File
mod - protected/controllers/admin/printablesurvey.php Diff File
mod - protected/controllers/admin/quotas.php Diff File
mod - protected/controllers/admin/remotecontrol.php Diff File
mod - protected/controllers/admin/saved.php Diff File
mod - protected/controllers/admin/statistics.php Diff File
mod - protected/controllers/admin/translate.php Diff File
mod - protected/controllers/admin/useraction.php Diff File
mod - protected/controllers/survey/index.php Diff File
mod - protected/controllers/surveys/Index.php Diff File
mod - protected/controllers/surveys/PublicList.php Diff File
mod - protected/core/ConsoleApplication.php Diff File
mod - protected/core/LSUserIdentity.php Diff File
rm - protected/core/LSYii_Validators.php Diff
mod - protected/core/Survey_Common_Action.php Diff File
mod - protected/core/WebApplication.php Diff File
mod - protected/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - protected/core/plugins/Authdb/AuthDb.php Diff File
mod - protected/core/plugins/DemoAuth/DemoAuth.php Diff File
mod - protected/core/plugins/ExportSTATAxml/STATAxmlWriter.php Diff File
mod - protected/helpers/FrontEnd.php Diff File
mod - protected/helpers/Replacements.php Diff File
mod - protected/helpers/SurveyRuntime.php Diff File
mod - protected/helpers/SurveyTranslator.php Diff File
mod - protected/helpers/admin/activate_helper.php Diff File
mod - protected/helpers/admin/export/CsvWriter.php Diff File
mod - protected/helpers/admin/export/DocWriter.php Diff File
mod - protected/helpers/admin/export/ExcelWriter.php Diff File
mod - protected/helpers/admin/export/HtmlWriter.php Diff File
mod - protected/helpers/admin/export/IWriter.php Diff File
mod - protected/helpers/admin/export/JsonWriter.php Diff File
mod - protected/helpers/admin/export/PdfWriter.php Diff File
mod - protected/helpers/admin/export/SurveyObj.php Diff File
mod - protected/helpers/admin/export/Writer.php Diff File
mod - protected/helpers/admin/exportresults_helper.php Diff File
mod - protected/helpers/admin/import_helper.php Diff File
mod - protected/helpers/admin/label_helper.php Diff File
mod - protected/helpers/admin/statistics_helper.php Diff File
mod - protected/helpers/admin/token_helper.php Diff File
mod - protected/helpers/common_helper.php Diff File
mod - protected/helpers/export_helper.php Diff File
mod - protected/helpers/expressions/em_core_helper.php Diff File
mod - protected/helpers/expressions/em_manager_helper.php Diff File
mod - protected/helpers/globals.php Diff File
mod - protected/helpers/import/BaseImport.php Diff File
mod - protected/helpers/import/importers/Import178.php Diff File
mod - protected/helpers/qanda_helper.php Diff File
mod - protected/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - protected/libraries/ExpressionManager/Parser.php Diff File
mod - protected/libraries/ExpressionManager/Token.php Diff File
mod - protected/libraries/ExpressionManager/TokenStream.php Diff File
mod - protected/libraries/ExpressionManager/Tokenizer.php Diff File
mod - protected/libraries/LSZend_XmlRpc_Response_Http.php Diff File
mod - protected/libraries/LSjsonRPCServer.php Diff File
mod - protected/libraries/Load_answers.php Diff File
rm - protected/libraries/PluginManager/EventDocumentor.php Diff
mod - protected/libraries/PluginManager/InternalUserDbTrait.php Diff File
mod - protected/libraries/PluginManager/LimesurveyApi.php Diff File
mod - protected/libraries/PluginManager/PluginManager.php Diff File
mod - protected/libraries/PluginManager/Question/QuestionBase.php Diff File
rm - protected/libraries/PluginManager/Question/iQuestion.php Diff
mod - protected/libraries/PluginManager/Storage/DbStorage.php Diff File
mod - protected/libraries/Save.php Diff File
mod - protected/libraries/admin/pdf.php Diff File
mod - protected/libraries/admin/quexmlpdf.php Diff File
mod - protected/locale/_template/limesurvey.pot Diff File
mod - protected/migrations/m150213_153506_initial_migration.php Diff File
mod - protected/migrations/m150501_082838_create_translation_table.php Diff File
mod - protected/migrations/m150501_084027_question_remove_language.php Diff File
mod - protected/migrations/m150510_082104_answer_remove_language.php Diff File
mod - protected/migrations/m150511_124830_group_remove_language.php Diff File
mod - protected/migrations/m150602_153442_refactor_participant_attributes.php Diff File
mod - protected/models/ActiveRecord.php Diff File
mod - protected/models/Answer.php Diff File
mod - protected/models/Assessment.php Diff File
mod - protected/models/Condition.php Diff File
mod - protected/models/DefaultValue.php Diff File
mod - protected/models/DummyResponse.php Diff File
mod - protected/models/Dynamic.php Diff File
rm - protected/models/ExpressionError.php Diff
mod - protected/models/FailedLoginAttempt.php Diff File
mod - protected/models/Label.php Diff File
mod - protected/models/LabelSet.php Diff File
mod - protected/models/Participant.php Diff File
mod - protected/models/ParticipantAttribute.php Diff File
mod - protected/models/ParticipantAttributeName.php Diff File
rm - protected/models/ParticipantAttributeNameLang.php Diff
rm - protected/models/ParticipantShare.php Diff
mod - protected/models/Permission.php Diff File
mod - protected/models/PluginDynamic.php Diff File
mod - protected/models/PluginSetting.php Diff File
mod - protected/models/Question.php Diff File
mod - protected/models/QuestionAttribute.php Diff File
mod - protected/models/QuestionGroup.php Diff File
mod - protected/models/Quota.php Diff File
mod - protected/models/QuotaLanguageSetting.php Diff File
mod - protected/models/QuotaMember.php Diff File
mod - protected/models/Response.php Diff File
mod - protected/models/SavedControl.php Diff File
mod - protected/models/Session.php Diff File
mod - protected/models/SettingGlobal.php Diff File
mod - protected/models/Survey.php Diff File
mod - protected/models/SurveyDynamic.php Diff File
mod - protected/models/SurveyLanguageSetting.php Diff File
mod - protected/models/SurveyLink.php Diff File
mod - protected/models/SurveyTimingDynamic.php Diff File
rm - protected/models/SurveyURLParameter.php Diff
mod - protected/models/Template.php Diff File
mod - protected/models/Timing.php Diff File
mod - protected/models/Token.php Diff File
rm - protected/models/TokenDynamic.php Diff
mod - protected/models/Translation.php Diff File
mod - protected/models/User.php Diff File
mod - protected/models/UserGroup.php Diff File
mod - protected/models/UserInGroup.php Diff File
mod - protected/models/filter/Survey.php Diff File
mod - protected/models/forms/FormattingOptions.php Diff File
mod - protected/models/forms/ParticipantDatabaseSettings.php Diff File
mod - protected/models/forms/Settings.php Diff File
mod - protected/models/forms/SubQuestions.php Diff File
mod - protected/models/import/Group.php Diff File
mod - protected/models/installer/PreCheck.php Diff File
mod - protected/models/questions/ArrayByColumnQuestion.php Diff File
mod - protected/models/questions/ArrayQuestion.php Diff File
mod - protected/models/questions/BaseArrayQuestion.php Diff File
mod - protected/models/questions/ChoiceQuestion.php Diff File
mod - protected/models/questions/DateTimeQuestion.php Diff File
mod - protected/models/questions/DisplayQuestion.php Diff File
mod - protected/models/questions/DropDownListQuestion.php Diff File
mod - protected/models/questions/DualScaleArrayQuestion.php Diff File
mod - protected/models/questions/EquationQuestion.php Diff File
mod - protected/models/questions/FivePointArrayQuestion.php Diff File
mod - protected/models/questions/FivePointChoiceQuestion.php Diff File
mod - protected/models/questions/FixedArrayQuestion.php Diff File
mod - protected/models/questions/FixedChoiceQuestion.php Diff File
mod - protected/models/questions/GenderQuestion.php Diff File
mod - protected/models/questions/HugeTextQuestion.php Diff File
mod - protected/models/questions/IncreaseSameDecreaseArrayQuestion.php Diff File
mod - protected/models/questions/LanguageQuestion.php Diff File
mod - protected/models/questions/LongTextQuestion.php Diff File
mod - protected/models/questions/MultipleChoiceQuestion.php Diff File
mod - protected/models/questions/MultipleChoiceWithCommentQuestion.php Diff File
mod - protected/models/questions/MultipleNumberQuestion.php Diff File
mod - protected/models/questions/MultipleTextQuestion.php Diff File
mod - protected/models/questions/NumericalArrayQuestion.php Diff File
mod - protected/models/questions/NumericalQuestion.php Diff File
mod - protected/models/questions/OpenArrayQuestion.php Diff File
mod - protected/models/questions/RadioListQuestion.php Diff File
mod - protected/models/questions/RankingQuestion.php Diff File
mod - protected/models/questions/ShortTextQuestion.php Diff File
mod - protected/models/questions/SingleChoiceQuestion.php Diff File
mod - protected/models/questions/SingleChoiceWithCommentQuestion.php Diff File
mod - protected/models/questions/SubQuestion.php Diff File
mod - protected/models/questions/TextQuestion.php Diff File
mod - protected/models/questions/UploadQuestion.php Diff File
mod - protected/models/questions/YesNoQuestion.php Diff File
mod - protected/models/questions/YesNoUncertainArrayQuestion.php Diff File
mod - protected/plugins/AuditLog/AuditLog.php Diff File
mod - protected/plugins/AuditLog/mdlAuditLog.php Diff File
mod - protected/plugins/Demo/Example/Example.php Diff File
mod - protected/plugins/befound/ls/ModulePlugin/views/layouts/main.php Diff File
mod - protected/tests/SideEffectTest.php Diff File
mod - protected/tests/staticCalls.php Diff File
mod - protected/third_party/gtranslate-api/COPYING Diff File
mod - protected/third_party/gtranslate-api/GTranslate.php Diff File
mod - protected/third_party/pclzip/pclzip.lib.php Diff File
mod - protected/third_party/pclzip/readme.txt Diff File
mod - protected/views/admin/assessments_view.php Diff File
mod - protected/views/admin/authentication/forgotpassword.php Diff File
mod - protected/views/admin/checkintegrity/check_view.php Diff File
mod - protected/views/admin/database/database_view.php Diff File
mod - protected/views/admin/dataentry/caption_view.php Diff File
mod - protected/views/admin/dataentry/content_view.php Diff File
mod - protected/views/admin/dataentry/import.php Diff File
mod - protected/views/admin/emailtemplates/emailtemplates_view.php Diff File
mod - protected/views/admin/export/exportresults_view.php Diff File
mod - protected/views/admin/export/statistics_view.php Diff File
mod - protected/views/admin/expressions/test/navigation_test.php Diff File
mod - protected/views/admin/expressions/test/survey_logic_file.php Diff File
mod - protected/views/admin/labels/labelview_view.php Diff File
mod - protected/views/admin/limeReplacementFields_view.php Diff File
mod - protected/views/admin/participants/attributeMapToken_view.php Diff File
mod - protected/views/admin/participants/attributeMap_view.php Diff File
mod - protected/views/admin/participants/displayParticipants_view.php Diff File
mod - protected/views/admin/participants/participantsPanel_view.php Diff File
mod - protected/views/admin/participants/userControl_view.php Diff File
mod - protected/views/admin/quotas/editquota_view.php Diff File
mod - protected/views/admin/quotas/editquotalang_view.php Diff File
mod - protected/views/admin/quotas/newanswer_view.php Diff File
mod - protected/views/admin/quotas/newanswererror_view.php Diff File
mod - protected/views/admin/quotas/newanswertwo_view.php Diff File
mod - protected/views/admin/quotas/newquota_view.php Diff File
mod - protected/views/admin/quotas/viewquotas_view.php Diff File
mod - protected/views/admin/quotas/viewquotasfooter_view.php Diff File
mod - protected/views/admin/saved/savedbar_view.php Diff File
mod - protected/views/admin/super/adminmenu.php Diff File
mod - protected/views/admin/survey/Question/answerOptions_view.php Diff File
mod - protected/views/admin/survey/Question/editdefaultvalues_view.php Diff File
mod - protected/views/admin/survey/Question/import_view.php Diff File
mod - protected/views/admin/survey/Question/subQuestion_view.php Diff File
mod - protected/views/admin/survey/QuestionGroups/import_view.php Diff File
mod - protected/views/admin/survey/QuestionGroups/questiongroupbar_view.php Diff File
mod - protected/views/admin/survey/activateSurvey_view.php Diff File
mod - protected/views/admin/survey/copySurvey_view.php Diff File
mod - protected/views/admin/survey/deactivateSurvey_view.php Diff File
mod - protected/views/admin/survey/deleteSurvey_view.php Diff File
mod - protected/views/admin/survey/editLocalSettings_view.php Diff File
mod - protected/views/admin/survey/importSurvey_view.php Diff File
mod - protected/views/admin/survey/listSurveys_view.php Diff File
mod - protected/views/admin/survey/printablesurvey_view.php Diff File
mod - protected/views/admin/survey/queXMLSurvey_view.php Diff File
mod - protected/views/admin/survey/surveySummary_view.php Diff File
mod - protected/views/admin/survey/surveybar_view.php Diff File
mod - protected/views/admin/templates/importuploaded_view.php Diff File
mod - protected/views/admin/templates/templateeditor_assessments_view.php Diff File
mod - protected/views/admin/templates/templateeditor_printoutput_view.php Diff File
mod - protected/views/admin/templates/templateeditor_question_answer_view.php Diff File
mod - protected/views/admin/templates/templateeditorbar_view.php Diff File
mod - protected/views/admin/token/bounce.php Diff File
mod - protected/views/admin/token/dummytokenform.php Diff File
mod - protected/views/admin/token/emailpost.php Diff File
mod - protected/views/admin/token/exportdialog.php Diff File
mod - protected/views/admin/token/managetokenattributes.php Diff File
mod - protected/views/admin/user/deluser.php Diff File
mod - protected/views/admin/user/editusers.php Diff File
mod - protected/views/admin/user/personalsettings.php Diff File
mod - protected/views/admin/user/setusertemplates.php Diff File
mod - protected/views/entertoken_view.php Diff File
mod - protected/views/expressions/build.php Diff File
mod - protected/views/global/groupMenu.php Diff File
mod - protected/views/global/menu.php Diff File
mod - protected/views/global/participantMenu.php Diff File
mod - protected/views/global/questionMenu.php Diff File
mod - protected/views/global/surveyMenu.php Diff File
mod - protected/views/global/surveyNavigator.php Diff File
mod - protected/views/global/templateMenu.php Diff File
mod - protected/views/groups/create.php Diff File
mod - protected/views/groups/update/textTab.php Diff File
mod - protected/views/participants/index.php Diff File
mod - protected/views/participants/manageAttributes.php Diff File
mod - protected/views/participants/map.php Diff File
mod - protected/views/participants/settings.php Diff File
mod - protected/views/plugins/index.php Diff File
mod - protected/views/questions/create.php Diff File
mod - protected/views/questions/update.php Diff File
mod - protected/views/questions/update/answerTab.php Diff File
mod - protected/views/questions/update/presentation.php Diff File
mod - protected/views/questions/update/routing.php Diff File
mod - protected/views/questions/update/subQuestionTab.php Diff File
mod - protected/views/questions/update/subquestions.php Diff File
mod - protected/views/questions/update/textTab.php Diff File
mod - protected/views/questions/update/timers.php Diff File
mod - protected/views/questions/update/validation.php Diff File
mod - protected/views/register/registerForm.php Diff File
mod - protected/views/responses/index.php Diff File
mod - protected/views/settings/global/overview.php Diff File
mod - protected/views/statistics_user_view.php Diff File
mod - protected/views/surveyMenu.php Diff File

2.5 d9598ee3

2015-09-29 15:48

Olle Haerstedt


Details Diff		 Dev: Update template preview picture when using keypad
mod - scripts/admin/surveysettings.js Diff File

2.5 2094723f

2015-09-29 15:35

Olle Haerstedt


Details Diff		 Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File

2.5 71743b0c

2015-09-29 15:35

Olle Haerstedt


Details Diff		 Dev: Fix template preview image in Edit servey text elements
mod - application/views/admin/survey/editLocalSettings_main_view.php Diff File

2.5 7b370100

2015-09-29 12:46

LouisGac


Details Diff		 Dev : list survey form, inline presentation, active state corrected
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File

2.5 5baa17f2

2015-09-29 12:36

LouisGac


Details Diff		 Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/views/admin/super/sidemenu.php Diff File
mod - application/views/admin/survey/QuestionGroups/addGroup_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/editGroup_view.php Diff File
mod - styles/limebootstrap/assets/css/sidemenu.css Diff File

2.5 077fae8e

2015-09-29 12:35

LouisGac


Details Diff		 Dev: some cleaning (tabs/space mix, comments, removing unused files, etc.)
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/views/admin/super/footer.php Diff File
mod - application/views/admin/super/fullpagebar_view.php Diff File
mod - application/views/admin/super/welcome.php Diff File
rm - application/views/admin/survey/_subview/tabCopy_view.php Diff
rm - application/views/admin/survey/_subview/tabGeneralEditSurvey_view.php Diff
rm - application/views/admin/survey/_subview/tabGeneralNewSurvey_view.php Diff
rm - application/views/admin/survey/_subview/tabImport_view.php Diff
rm - application/views/admin/survey/_subview/tabNotification_view.php Diff
rm - application/views/admin/survey/_subview/tabPanelIntegration_view.php Diff
rm - application/views/admin/survey/_subview/tabPluginSettings_view.php Diff
rm - application/views/admin/survey/_subview/tabPresentation_view.php Diff
rm - application/views/admin/survey/_subview/tabPublication_view.php Diff
rm - application/views/admin/survey/_subview/tabResourceManagement_view.php Diff
rm - application/views/admin/survey/_subview/tabTokens_view.php Diff
rm - application/views/admin/survey/_subview/tab_view.php Diff
rm - application/views/admin/survey/editSurveyWithSettings_view.php Diff
mod - application/views/admin/survey/newSurvey_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_accordion_container.php Diff File
mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_integration_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_notification_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_presentation_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_publication_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_resources_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_tokens_panel.php Diff File
mod - application/views/admin/survey/subview/tabCopy_view.php Diff File
mod - application/views/admin/survey/subview/tabCreate_view.php Diff File
mod - application/views/admin/survey/subview/tabImport_view.php Diff File
rm - application/views/admin/survey/subview/tab_create_view.php Diff
add - application/views/admin/survey/subview/tab_survey_view.php Diff File

2.5 bf3881f1

2015-09-29 12:16

Olle Haerstedt


Details Diff		 Dev: Removed some white-space
mod - application/views/admin/super/sidemenu.php Diff File

2.5 c37683ed

2015-09-29 12:15

Olle Haerstedt


Details Diff		 Dev: In side-menu, load only question group base language
mod - application/core/Survey_Common_Action.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 829 830 831 832 833 834 835 ... 900 ... 1050 ... 1200 ... 1350 ... 1471 1472 1473  Next  Last