Changesets: LimeSurvey
|
2.1 a44f8655 2013-01-14 13:06 Details Diff |
Fixed issue: 07171: Data Integrity check function deletes token tables even what not asked to Dev: already done in 2.1 Dev: then just added a messages if no table are checked |
||
| mod - application/controllers/admin/checkintegrity.php | Diff File | ||
|
master 6ffdf3c3 2013-01-14 13:03 Details Diff |
Fixed issue: 07171: Data Integrity check function deletes token tables even what not asked to Dev: already done in 2.1 Dev: added a messages if no table are checked |
||
| mod - application/controllers/admin/checkintegrity.php | Diff File | ||
|
master 7b91ebf3 2013-01-14 12:58 Details Diff |
Fixed issue 07181: Deleting survey from survey list does not remove from drop down field |
Affected Issues 07181 |
|
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/views/admin/super/adminmenu.php | Diff File | ||
| mod - application/views/admin/survey/subview/tabCopy_view.php | Diff File | ||
| mod - scripts/admin/listsurvey.js | Diff File | ||
|
2.1 d5ec0225 2013-01-14 12:58 Carsten Schmitz Details Diff |
Fixed issue 07181: Deleting survey from survey list does not remove from drop down field | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/views/admin/super/adminmenu.php | Diff File | ||
| mod - application/views/admin/survey/subview/tabCopy_view.php | Diff File | ||
| mod - scripts/admin/listsurvey.js | Diff File | ||
|
Plugin 28b9e427 2013-01-14 12:10 Details Diff |
Merge branch 'Plugin' of github.com:LimeSurvey/LimeSurvey.git into Plugin | ||
| mod - application/core/LSYii_Application.php | Diff File | ||
| rm - application/libraries/PluginManager/ExamplePlugin.php | Diff | ||
| mod - application/libraries/PluginManager/PluginBase.php | Diff File | ||
| mod - application/libraries/PluginManager/PluginManager.php | Diff File | ||
| add - application/libraries/PluginManager/iPlugin.php | Diff File | ||
| mod - plugins/Example/Example.php | Diff File | ||
|
Plugin 29e2d1b5 2013-01-14 12:09
Details Diff |
Dev Added temporary plugin manager link to admin menu. | ||
| mod - application/views/admin/super/adminmenu.php | Diff File | ||
|
Plugin 4cfcb665 2013-01-14 12:07
Details Diff |
Dev Added basic admin menu, still needs user info + title. | ||
| mod - application/extensions/Menu/MenuWidget.php | Diff File | ||
| mod - application/extensions/Menu/views/adminmenu.php | Diff File | ||
|
Plugin ca9939a8 2013-01-14 11:24 Details Diff |
dev: working example plugin, need to complete iPlugin and replace loading in application with the actual list of active plugins | ||
| mod - application/core/LSYii_Application.php | Diff File | ||
| rm - application/libraries/PluginManager/ExamplePlugin.php | Diff | ||
| mod - application/libraries/PluginManager/PluginBase.php | Diff File | ||
| mod - application/libraries/PluginManager/PluginManager.php | Diff File | ||
| add - application/libraries/PluginManager/iPlugin.php | Diff File | ||
| mod - plugins/Example/Example.php | Diff File | ||
|
master 24ed5876 2013-01-14 10:51 Details Diff |
Fixed issue 07184: Clicking one of the 'Questions with conditions to this group:' links on the question group page shows an error |
Affected Issues 07184 |
|
| mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php | Diff File | ||
| mod - styles/gringegreen/adminstyle.css | Diff File | ||
|
2.1 a1a0ce3f 2013-01-14 10:51 Carsten Schmitz Details Diff |
Fixed issue 07184: Clicking one of the 'Questions with conditions to this group:' links on the question group page shows an error | ||
| mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php | Diff File | ||
| mod - styles/gringegreen/adminstyle.css | Diff File | ||
|
Plugin c18efacc 2013-01-14 10:15
Details Diff |
Dev Removed layout from AdminController to prevent double menus. | ||
| mod - application/controllers/AdminController.php | Diff File | ||
|
Plugin 3d24ab68 2013-01-14 10:12
Details Diff |
Dev Updated layout to include menu. Dev Created basics for menu widget. |
||
| add - application/extensions/Menu/MenuWidget.php | Diff File | ||
| add - application/extensions/Menu/views/adminmenu.php | Diff File | ||
| mod - application/views/layouts/main.php | Diff File | ||
|
Plugin 77544a81 2013-01-14 09:46
Details Diff |
Dev Updated view & controler action config/plugins to show list of plugins from scan. | ||
| mod - application/controllers/ConfigController.php | Diff File | ||
| mod - application/views/config/plugins.php | Diff File | ||
|
Plugin 090c3b19 2013-01-14 09:45
Details Diff |
Dev Removed erroneously include nbprojects. | ||
| mod - nbproject/project.properties | Diff File | ||
| mod - nbproject/project.xml | Diff File | ||
|
Plugin b7890041 2013-01-14 09:24 Details Diff |
I hate windows + git Merge branch 'Plugin' of https://github.com/LimeSurvey/LimeSurvey into HEAD Conflicts: application/libraries/PluginManager/ExamplePlugin.php |
||
| mod - .gitignore | Diff File | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
| add - application/libraries/PluginManager/ExamplePlugin.php | Diff File | ||
| mod - application/libraries/PluginManager/PluginBase.php | Diff File | ||
| mod - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Workbook.php | Diff File | ||
| mod - application/views/admin/authentication/forgotpassword.php | Diff File | ||
| mod - application/views/admin/authentication/login.php | Diff File | ||
| mod - application/views/admin/conditions/includes/conditions_scenario.php | Diff File | ||
| mod - application/views/admin/dataentry/vvimport.php | Diff File | ||
| mod - application/views/admin/export/r_view.php | Diff File | ||
| mod - application/views/admin/export/spss_view.php | Diff File | ||
| mod - application/views/admin/export/vv_view.php | Diff File | ||
| mod - application/views/admin/labels/editlabel_view.php | Diff File | ||
| mod - application/views/admin/labels/exportmulti_view.php | Diff File | ||
| mod - application/views/admin/labels/labelview_view.php | Diff File | ||
| mod - application/views/admin/participants/importCSV_view.php | Diff File | ||
| mod - application/views/admin/quotas/editquota_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/viewquotasfooter_view.php | Diff File | ||
| mod - application/views/admin/quotas/viewquotasrowsub_view.php | Diff File | ||
| mod - application/views/admin/remotecontrol/index_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/subQuestion_view.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 - application/views/admin/survey/activateSurvey_view.php | Diff File | ||
| mod - application/views/admin/survey/deactivateSurvey_view.php | Diff File | ||
| mod - application/views/admin/survey/organizeGroupsAndQuestions_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/tabImport_view.php | Diff File | ||
| mod - application/views/admin/templates/importuploaded_view.php | Diff File | ||
| mod - application/views/admin/token/csvupload.php | Diff File | ||
| mod - application/views/admin/token/dummytokenform.php | Diff File | ||
| mod - application/views/admin/token/email.php | Diff File | ||
| mod - application/views/admin/token/exportdialog.php | Diff File | ||
| mod - application/views/admin/token/tokenbar.php | Diff File | ||
| mod - application/views/admin/user/deluser.php | Diff File | ||
| mod - application/views/admin/user/modifyuser.php | Diff File | ||
| mod - application/views/admin/usergroup/addUserGroup_view.php | Diff File | ||
| mod - application/views/admin/usergroup/editUserGroup_view.php | Diff File | ||
| mod - application/views/admin/usergroup/mailUserGroup_view.php | Diff File | ||
| mod - application/views/admin/usergroup/viewUserGroup_view.php | Diff File | ||
| mod - application/views/config/plugins.php | Diff File | ||
| mod - application/views/layouts/main.php | Diff File | ||
| mod - nbproject/project.properties | Diff File | ||
| mod - nbproject/project.xml | Diff File | ||
| mod - rpkxerqm.w3k.txt | Diff File | ||
| mod - scripts/admin/statistics.js | Diff File | ||
| mod - templates/default/template-rtl.css | Diff File | ||
| mod - templates/default/template.css | Diff File | ||
|
Plugin fa3a0378 2013-01-14 09:20 Details Diff |
Dev Forced commit, probably broke line endings. | ||
| mod - .gitignore | Diff File | ||
| mod - application/config/config-defaults.php | Diff File | ||
| mod - application/controllers/ConfigController.php | Diff File | ||
| mod - application/core/LSYii_Application.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| rm - application/libraries/PluginManager/ExamplePlugin.php | Diff | ||
| mod - application/libraries/PluginManager/PluginBase.php | Diff File | ||
| mod - application/libraries/PluginManager/PluginManager.php | Diff File | ||
| add - application/views/config/plugins.php | Diff File | ||
| add - application/views/layouts/main.php | Diff File | ||
| mod - index.php | Diff File | ||
| add - nbproject/project.properties | Diff File | ||
| add - nbproject/project.xml | Diff File | ||
| add - plugins/Example/Example.php | Diff File | ||
| add - rpkxerqm.w3k.txt | Diff File | ||
|
Plugin 3a1f7add 2013-01-14 09:12 Details Diff |
minor changes | ||
| mod - application/libraries/PluginManager/ExamplePlugin.php | Diff File | ||
| mod - application/libraries/PluginManager/PluginBase.php | Diff File | ||
| mod - application/libraries/PluginManager/PluginManager.php | Diff File | ||
|
master 344e21ab 2013-01-14 00:49 Details Diff |
Fixed issue 07179: blobblueish (admin) template: wrong icon for security setting |
Affected Issues 07179 |
|
| mod - styles/blobblueish/images/security_16.png | Diff File | ||
|
2.1 bd9eb99a 2013-01-14 00:49 Carsten Schmitz Details Diff |
Fixed issue 07179: blobblueish (admin) template: wrong icon for security setting | ||
| mod - styles/blobblueish/images/security_16.png | Diff File | ||
|
master bcff55b0 2013-01-14 00:46 Details Diff |
Fixed issue 07176: Missing translations |
Affected Issues 07176 |
|
| mod - application/views/admin/token/browse.php | Diff File | ||
| mod - scripts/admin/tokens.js | Diff File | ||
|
2.1 79a476fe 2013-01-14 00:46 Carsten Schmitz Details Diff |
Fixed issue 07176: Missing translations | ||
| mod - application/views/admin/token/browse.php | Diff File | ||
| mod - scripts/admin/tokens.js | Diff File | ||
|
master 030a85e0 2013-01-14 00:33 Details Diff |
Fixed issue 07174: Create/edit user groups screen available to users even when nothing to display |
Affected Issues 07174 |
|
| mod - application/views/admin/super/adminmenu.php | Diff File | ||
|
2.1 968667f0 2013-01-14 00:33 Carsten Schmitz Details Diff |
Fixed issue 07174: Create/edit user groups screen available to users even when nothing to display | ||
| mod - application/views/admin/super/adminmenu.php | Diff File | ||
|
master 8b3a5239 2013-01-14 00:25 Details Diff |
Fixed issue 07173: Creating user added to user group with no option to remove self |
Affected Issues 07173 |
|
| mod - application/controllers/admin/usergroups.php | Diff File | ||
| mod - application/views/admin/usergroup/usergroupbar_view.php | Diff File | ||
|
2.1 8142360f 2013-01-14 00:25 Carsten Schmitz Details Diff |
Fixed issue 07173: Creating user added to user group with no option to remove self | ||
| mod - application/controllers/admin/usergroups.php | Diff File | ||
| mod - application/views/admin/usergroup/usergroupbar_view.php | Diff File | ||
