Changesets: LimeSurvey
|
2.5 4be43c03 2015-10-02 16:51
Details Diff |
Dev: some cleaning, removed unused files, etc. | ||
| mod - application/views/admin/dataentry/active_html_view.php | Diff File | ||
| mod - application/views/admin/dataentry/import.php | Diff File | ||
| mod - application/views/admin/dataentry/vvimport_result.php | Diff File | ||
| rm - application/views/admin/labels/labelbar_view.php | Diff | ||
| rm - application/views/admin/labels/labelsummary_view.php | Diff | ||
| mod - application/views/admin/participants/attributeMap_view.php | Diff File | ||
| mod - application/views/admin/quotas/editquota_view.php | Diff File | ||
| mod - application/views/admin/quotas/editquotalang_view.php | Diff File | ||
| mod - application/views/admin/quotas/newanswer_view.php | Diff File | ||
| mod - application/views/admin/quotas/newanswertwo_view.php | Diff File | ||
| mod - application/views/admin/quotas/newquota_view.php | Diff File | ||
| mod - application/views/admin/quotas/viewquotas_view.php | Diff File | ||
| mod - application/views/admin/quotas/viewquotasrowsub_view.php | Diff File | ||
|
2.5 a9ab4322 2015-10-02 16:43
Details Diff |
Dev: more tab space mix | ||
| mod - application/views/admin/checkintegrity/check_view.php | Diff File | ||
| mod - application/views/admin/conditions/conditionshead_view.php | Diff File | ||
| mod - application/views/admin/conditions/conditionslist_view.php | Diff File | ||
|
2.5 e0fac427 2015-10-02 16:41
Details Diff |
Dev : tab and space mix | ||
| mod - application/views/admin/authentication/error.php | Diff File | ||
| rm - application/views/admin/authentication/success.php | Diff | ||
|
2.5 0907cc4b 2015-10-02 16:21 Details Diff |
Merge branch 'master' into 2.5 # Conflicts: # application/controllers/admin/tokens.php # application/core/plugins/AuthLDAP/AuthLDAP.php # application/models/Survey.php # application/views/admin/token/invite.php # application/views/admin/token/remind.php # docs/release_notes.txt # locale/_template/limesurvey.pot # locale/ca/ca.mo # locale/es/es.mo # locale/fr/fr.mo # locale/it-informal/it-informal.mo # locale/it/it.mo # locale/ja/ja.mo # locale/ko/ko.mo # locale/nb/nb.mo # locale/nl-informal/nl-informal.mo # locale/nl/nl.mo # locale/nn/nn.mo # locale/pl/pl.mo # locale/ru/ru.mo # locale/th/th.mo # locale/zh-Hant-TW/zh-Hant-TW.mo |
||
| mod - application/config/config-defaults.php | Diff File | ||
| mod - application/controllers/admin/authentication.php | Diff File | ||
| mod - application/controllers/admin/tokens.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/ExportSTATAxml/ExportSTATAxml.php | Diff File | ||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
| mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
| mod - application/helpers/replacements_helper.php | Diff File | ||
| mod - application/libraries/PluginManager/AuthPluginBase.php | Diff File | ||
| mod - application/models/ParticipantAttributeName.php | Diff File | ||
| mod - application/models/Permission.php | Diff File | ||
| mod - application/models/Survey.php | Diff File | ||
| mod - application/views/admin/labels/editlabel_view.php | Diff File | ||
| mod - application/views/admin/token/emailwarning.php | Diff File | ||
| mod - application/views/admin/token/invite.php | Diff File | ||
| mod - application/views/admin/token/remind.php | Diff File | ||
| mod - index.php | Diff File | ||
|
2.5 fc95bdec 2015-10-02 16:07 Olle Haerstedt Details Diff |
Dev: Fix plugin configuration with weird hack (echo ) | ||
| mod - application/extensions/SettingsWidget/SettingsWidget.php | Diff File | ||
|
2.5 cdd1cbaa 2015-10-02 15:34 Olle Haerstedt Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/views/admin/pluginmanager/configure.php | Diff File | ||
|
2.5 d1f842fd 2015-10-02 15:33 Olle Haerstedt Details Diff |
Dev: Add event to select2 widget in plugin configuration | ||
| mod - application/extensions/SettingsWidget/SettingsWidget.php | Diff File | ||
|
2.5 f50ff6a5 2015-10-02 15:14
Details Diff |
dev: title configure | ||
| mod - application/views/admin/pluginmanager/configure.php | Diff File | ||
|
2.5 9d06aa41 2015-10-02 15:10
Details Diff |
Dev : value of select widget | ||
| mod - application/extensions/SettingsWidget/SettingsWidget.php | Diff File | ||
|
2.5 0730a4b5 2015-10-02 15:02 Olle Haerstedt Details Diff |
Dev: Indentation | ||
| mod - application/extensions/SettingsWidget/SettingsWidget.php | Diff File | ||
|
2.5 8342be7f 2015-10-02 14:14
Details Diff |
Dev: fixed bug in configure. TODO : parse title. | ||
| mod - application/views/admin/pluginmanager/configure.php | Diff File | ||
|
2.5 9cf279bb 2015-10-02 14:00
Details Diff |
Dev: login auth method plugin | ||
| mod - application/views/admin/authentication/login.php | Diff File | ||
|
2.5 02a76360 2015-10-02 13:19
Details Diff |
Dev: plugin manager construct error | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
|
2.5 429997d3 2015-10-02 13:19
Details Diff |
Dev: jQgrid design | ||
| mod - application/controllers/admin/responses.php | Diff File | ||
| mod - application/views/admin/survey/activateSurvey_view.php | Diff File | ||
| mod - scripts/admin/listresponse.js | Diff File | ||
| mod - styles/limebootstrap/assets/css/lime-admin.css | Diff File | ||
| mod - third_party/jqueryui/css/jquery-ui.css | Diff File | ||
|
2.5 3511e0f7 2015-10-02 13:12 Olle Haerstedt Details Diff |
Dev: Add select2 as third-party package | ||
| mod - application/config/third_party.php | Diff File | ||
| mod - application/controllers/admin/pluginmanager.php | Diff File | ||
|
develop a26350e1 2015-10-02 12:47 Details Diff |
Fixed issue 09933: Incomplete token menu -- partial fix |
Affected Issues 09933 |
|
| mod - protected/controllers/TokensController.php | Diff File | ||
| mod - protected/models/Dynamic.php | Diff File | ||
| mod - protected/models/Token.php | Diff File | ||
| mod - protected/themes/default/assets/css/style.css | Diff File | ||
| mod - protected/views/tokens/create.php | Diff File | ||
| add - protected/views/tokens/update.php | Diff File | ||
|
2.5 a09ece85 2015-10-02 12:02 Olle Haerstedt Details Diff |
Dev: Add configuration view for plugins | ||
| mod - application/controllers/admin/pluginmanager.php | Diff File | ||
| add - application/views/admin/pluginmanager/configure.php | Diff File | ||
| mod - application/views/admin/pluginmanager/index.php | Diff File | ||
|
develop f8fe4385 2015-10-02 11:55 Details Diff |
Dev Some installer refactoring. | ||
| mod - protected/controllers/InstallerController.php | Diff File | ||
| mod - protected/models/installer/InstallerConfigForm.php | Diff File | ||
| mod - protected/models/installer/PreCheck.php | Diff File | ||
|
develop 6177acac 2015-10-02 11:46 Details Diff |
Dev Fixed several installer issues. | ||
| mod - protected/components/MigrationManager.php | Diff File | ||
| mod - protected/core/db/DbConnection.php | Diff File | ||
| mod - protected/core/db/SmartColumnTypeTrait.php | Diff File | ||
| mod - protected/migrations/m150322_132458_add_series_to_survey.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/migrations/m150706_092139_unique_question_codes_per_scale.php | Diff File | ||
| mod - protected/tests/unit/DbSchemasTestCase.php | Diff File | ||
|
2.5 be082efc 2015-10-02 11:23 Olle Haerstedt Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/views/admin/responses/listResponses_view.php | Diff File | ||
| mod - styles/limebootstrap/assets/css/lime-admin.css | Diff File | ||
|
2.5 fd961fc4 2015-10-02 11:22 Olle Haerstedt Details Diff |
Dev: Add activate and deactivate functionality to new plugin manager view |
||
| mod - application/controllers/admin/pluginmanager.php | Diff File | ||
| mod - application/views/admin/pluginmanager/index.php | Diff File | ||
|
2.5 5919945a 2015-10-02 11:06
Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/controllers/AdminController.php | Diff File | ||
| mod - application/controllers/admin/database.php | Diff File | ||
| add - application/controllers/admin/pluginmanager.php | Diff File | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| add - application/views/admin/pluginmanager/index.php | Diff File | ||
| mod - application/views/admin/super/_configuration_menu.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/nquestiongroupbar_view.php | Diff File | ||
|
2.5 5be4dbb0 2015-10-02 11:06
Details Diff |
Dev : jQgrid design | ||
| mod - application/views/admin/responses/listResponses_view.php | Diff File | ||
| mod - styles/limebootstrap/assets/css/lime-admin.css | Diff File | ||
|
2.5 90980e23 2015-10-02 10:41 Olle Haerstedt Details Diff |
Dev: Status column in plugin manager should not have "clickable" mouse pointer | ||
| mod - application/views/admin/pluginmanager/index.php | Diff File | ||
|
2.5 a50860ad 2015-10-02 10:29 Olle Haerstedt Details Diff |
Dev: New view for Plugin manager | ||
| mod - application/controllers/AdminController.php | Diff File | ||
| add - application/controllers/admin/pluginmanager.php | Diff File | ||
| add - application/views/admin/pluginmanager/index.php | Diff File | ||
| mod - application/views/admin/super/_configuration_menu.php | Diff File | ||
