Changesets: LimeSurvey

Search Browse Back to Index

2.05 5424e95c

2013-04-01 16:39

c_schmitz


Details Diff		 Fixed issue 07718: Cancelling the delete survey operation leads to error Affected Issues
07718
mod - application/views/admin/survey/deleteSurvey_view.php Diff File

master 070a1a06

2013-04-01 16:39

c_schmitz


Details Diff		 Fixed issue 07718: Cancelling the delete survey operation leads to error Affected Issues
07718
mod - application/views/admin/survey/deleteSurvey_view.php Diff File

2.05 6bb516bf

2013-04-01 16:00

c_schmitz


Details Diff		 Fixed issue 07716: Added memory check for minimum 64MB to installer Affected Issues
07716
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/views/installer/precheck_view.php Diff File

2.05 f79d7ffa

2013-04-01 15:30

c_schmitz


Details Diff		 Dev Added missing secondary indexes to PGSQL and MSSQL
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File

2.05 663cb858

2013-04-01 15:15

c_schmitz


Details Diff		 Dev Fixed some issue with new permission system
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/models/Permission.php Diff File
mod - plugins/AuditLog/AuditLog.php Diff File

2.05 285c8222

2013-04-01 14:29

mdekker


Details Diff		 Merge pull request #74 from mennodekker/2.05

2.05
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/PluginsController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
add - application/core/LSAuthResult.php Diff File
add - application/core/LSUserIdentity.php Diff File
add - application/core/plugins/Authdb/Authdb.php Diff File
add - application/core/plugins/Authwebserver/Authwebserver.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/views/admin/authentication/login.php Diff File

2.05 b64114ac

2013-04-01 14:09

mdekker


Details Diff		 dev: oops password
mod - application/controllers/admin/remotecontrol.php Diff File

2.05 8a0493ab

2013-04-01 14:03

mdekker


Details Diff		 dev: fixes for remote control
mod - application/controllers/admin/remotecontrol.php Diff File

2.05 46750cc0

2013-04-01 13:05

mdekker


Details Diff		 Merge branch '2.05' of git://github.com/LimeSurvey/LimeSurvey into 2.05
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File

2.05 0a9dc4b1

2013-04-01 12:34

mdekker


Details Diff		 Merge branch '2.05' of git://github.com/LimeSurvey/LimeSurvey into 2.05

Conflicts:
application/libraries/LSjsonRPCServer.php
mod - .gitignore Diff File
mod - application/config/third_party.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/dumpdb.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/core/LSWebUser.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/extensions/Menu/MenuWidget.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/htmleditor_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/common_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/BigData.php Diff File
mod - application/libraries/LSjsonRPCServer.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/Permission.php Diff File
rm - application/models/Templates_rights.php Diff
mod - application/tests/staticCalls.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/participants/blacklist_view.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/admin/participants/sharePanel_view.php Diff File
mod - application/views/admin/participants/userControl_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - application/views/admin/survey/subview/tabPresentation_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/tokenbar.php Diff File
mod - application/views/admin/user/editusers.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/usergroupbar_view.php Diff File
mod - plugins/AuditLog/AuditLog.php Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/displayParticipant.js Diff File
mod - scripts/admin/userpermissions.js Diff File
mod - styles/blobblueish/displayParticipants.css Diff File
mod - styles/gringegreen/displayParticipants.css Diff File
mod - styles/gringegreen/jquery-ui/jquery-ui.css Diff File
rm - third_party/jqgrid/src/JsonXml.js Diff
rm - third_party/jqgrid/src/css/ellipsis-xbl.xml Diff
rm - third_party/jqgrid/src/css/ui.jqgrid.css Diff
rm - third_party/jqgrid/src/css/ui.multiselect.css Diff
rm - third_party/jqgrid/src/grid.base.js Diff
rm - third_party/jqgrid/src/grid.celledit.js Diff
rm - third_party/jqgrid/src/grid.common.js Diff
rm - third_party/jqgrid/src/grid.custom.js Diff
rm - third_party/jqgrid/src/grid.filter.js Diff
rm - third_party/jqgrid/src/grid.formedit.js Diff
rm - third_party/jqgrid/src/grid.grouping.js Diff
rm - third_party/jqgrid/src/grid.import.js Diff
rm - third_party/jqgrid/src/grid.inlinedit.js Diff
rm - third_party/jqgrid/src/grid.jqueryui.js Diff
rm - third_party/jqgrid/src/grid.loader.js Diff
rm - third_party/jqgrid/src/grid.subgrid.js Diff
rm - third_party/jqgrid/src/grid.tbltogrid.js Diff
rm - third_party/jqgrid/src/grid.treegrid.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ar.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-bg.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-bg1251.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-cat.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-cn.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-cs.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-da.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-de.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-dk.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-el.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-en.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-es.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-fa.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-fi.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-fr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-gl.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-he.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-hr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-hr1250.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-hu.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-id.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-is.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-it.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ja.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-kr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-lt.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-mne.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-nl.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-no.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-pl.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-pt-br.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-pt.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ro.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ru.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-sk.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-sr-latin.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-sr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-sv.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-th.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-tr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-tw.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ua.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-vi.js Diff
rm - third_party/jqgrid/src/jqDnR.js Diff
rm - third_party/jqgrid/src/jqModal.js Diff
rm - third_party/jqgrid/src/jquery.fmatter.js Diff

2.05 f3ffba6b

2013-04-01 12:32

mdekker


Details Diff		 dev: fixes for remote control
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/libraries/BigData.php Diff File
mod - application/libraries/LSjsonRPCServer.php Diff File

master 37e3e92c

2013-03-30 00:05

LimeSurvey Translations Bot


Details Diff		 Updated translation: German by c_schmitz
mod - locale/de/LC_MESSAGES/de.mo Diff File

2.05 85cc6794

2013-03-29 23:20

c_schmitz


Details Diff		 Dev Moved template permissions to the general permissions table, too
Dev Unfortunately this change needs a reinstall if you are a developer.
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File

2.05 de54f6df

2013-03-29 21:22

c_schmitz


Details Diff		 Merge remote-tracking branch 'origin/2.05' into 2.05
mod - application/views/admin/user/setuserpermissions.php Diff File
mod - application/views/admin/user/setusertemplates.php Diff File
mod - scripts/admin/admin_core.js Diff File

2.05 6f4a4383

2013-03-29 18:38

c_schmitz


Details Diff		 Dev Moved template permissions to the general permissions table, too
Dev Unfortunately this change needs a reinstall if you are a developer.
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dumpdb.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/core/LSWebUser.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/extensions/Menu/MenuWidget.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/Permission.php Diff File
rm - application/models/Templates_rights.php Diff
mod - application/models/UserGroup.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/participants/blacklist_view.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/admin/participants/sharePanel_view.php Diff File
mod - application/views/admin/participants/userControl_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - application/views/admin/survey/subview/tabPresentation_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/tokenbar.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/admin/user/setuserpermissions.php Diff File
mod - application/views/admin/usergroup/usergroupbar_view.php Diff File
mod - scripts/admin/userpermissions.js Diff File

2.05 8296276f

2013-03-29 17:53

DenisChenu


Details Diff		 Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05
mod - application/config/third_party.php Diff File
mod - application/models/UserInGroup.php Diff File

2.05 a392e974

2013-03-29 17:52

DenisChenu


Details Diff		 Dev: Apply cell adapters only to table with activecell class
Dev: remove some style from template rights
mod - application/views/admin/user/setuserpermissions.php Diff File
mod - application/views/admin/user/setusertemplates.php Diff File
mod - scripts/admin/admin_core.js Diff File

2.05 971f98cd

2013-03-29 17:44

c_schmitz


Details Diff		 Dev Renamed TokenDynamic model
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/tests/staticCalls.php Diff File

2.05 93141eac

2013-03-29 17:41

c_schmitz


Details Diff		 Dev Removed unnecessary inclusion
mod - application/config/third_party.php Diff File

2.05 695c8a6e

2013-03-29 17:36

c_schmitz


Details Diff		 Dev Renamed some models
mod - application/models/UserInGroup.php Diff File

2.05 e9ca0abc

2013-03-29 17:35

c_schmitz


Details Diff		 Dev Renamed some models
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
add - application/models/UserInGroup.php Diff File
mod - application/tests/staticCalls.php Diff File

2.05 8787423f

2013-03-29 15:23

sammousa


Details Diff		 Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05
mod - .gitignore Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/models/Participant.php Diff File
mod - plugins/AuditLog/AuditLog.php Diff File
mod - scripts/admin/displayParticipant.js Diff File
mod - styles/blobblueish/displayParticipants.css Diff File
mod - styles/gringegreen/displayParticipants.css Diff File
mod - styles/gringegreen/jquery-ui/jquery-ui.css Diff File
rm - third_party/jqgrid/src/JsonXml.js Diff
rm - third_party/jqgrid/src/css/ellipsis-xbl.xml Diff
rm - third_party/jqgrid/src/css/ui.jqgrid.css Diff
rm - third_party/jqgrid/src/css/ui.multiselect.css Diff
rm - third_party/jqgrid/src/grid.base.js Diff
rm - third_party/jqgrid/src/grid.celledit.js Diff
rm - third_party/jqgrid/src/grid.common.js Diff
rm - third_party/jqgrid/src/grid.custom.js Diff
rm - third_party/jqgrid/src/grid.filter.js Diff
rm - third_party/jqgrid/src/grid.formedit.js Diff
rm - third_party/jqgrid/src/grid.grouping.js Diff
rm - third_party/jqgrid/src/grid.import.js Diff
rm - third_party/jqgrid/src/grid.inlinedit.js Diff
rm - third_party/jqgrid/src/grid.jqueryui.js Diff
rm - third_party/jqgrid/src/grid.loader.js Diff
rm - third_party/jqgrid/src/grid.subgrid.js Diff
rm - third_party/jqgrid/src/grid.tbltogrid.js Diff
rm - third_party/jqgrid/src/grid.treegrid.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ar.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-bg.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-bg1251.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-cat.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-cn.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-cs.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-da.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-de.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-dk.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-el.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-en.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-es.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-fa.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-fi.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-fr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-gl.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-he.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-hr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-hr1250.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-hu.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-id.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-is.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-it.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ja.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-kr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-lt.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-mne.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-nl.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-no.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-pl.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-pt-br.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-pt.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ro.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ru.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-sk.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-sr-latin.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-sr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-sv.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-th.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-tr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-tw.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ua.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-vi.js Diff
rm - third_party/jqgrid/src/jqDnR.js Diff
rm - third_party/jqgrid/src/jqModal.js Diff
rm - third_party/jqgrid/src/jquery.fmatter.js Diff

2.05 924db295

2013-03-29 15:23

sammousa


Details Diff		 Dev Remote control fixes.
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/libraries/BigData.php Diff File
mod - application/libraries/LSjsonRPCServer.php Diff File

2.05 f07957da

2013-03-29 00:57

c_schmitz


Details Diff		 Dev Fixed JavaScript not being properly loaded in participants browsing
mod - application/controllers/admin/participantsaction.php Diff File
mod - scripts/admin/displayParticipant.js Diff File
mod - styles/blobblueish/displayParticipants.css Diff File
mod - styles/gringegreen/displayParticipants.css Diff File

2.05 1cc4238d

2013-03-29 00:38

c_schmitz


Details Diff		 Merge remote-tracking branch 'origin/2.05' into 2.05
mod - application/helpers/qanda_helper.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 900 ... 984 985 986 987 988 989 990 ... 1050 ... 1200 ... 1350 ... 1471 1472 1473  Next  Last