LimeSurvey: 2.1 07cf2b3a

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa 2.1 2012-12-08 17:20:29 2.1 49dc4156
Changeset

Merge branch '2.1' of github.com:LimeSurvey/LimeSurvey into 2.1
add - .gitattributes Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/Participants.php Diff File
mod - application/models/User_groups.php Diff File
mod - application/modules/CommentCheckQuestion.php Diff File
add - application/third_party/.gitattributes Diff File
mod - application/views/admin/dataentry/caption_view.php Diff File
mod - application/views/admin/expressions/test/survey_logic_file.php Diff File
mod - application/views/admin/survey/subview/tabCopy_view.php Diff File
mod - application/views/admin/survey/subview/tabGeneralNewSurvey_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/update/step2.php Diff File
mod - application/views/admin/update/step3.php Diff File
mod - application/views/admin/update/update.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/admin/user/setuserrights.php Diff File
mod - application/views/admin/usergroup/usergroupbar_view.php Diff File
add - framework/.gitattributes Diff File
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File
mod - scripts/admin/labels.js Diff File
mod - scripts/admin/limereplacementfields/dialogs/limereplacementfields.js Diff File
mod - scripts/admin/tokens.js Diff File
rm - scripts/admin/tokentocpdb.js Diff File
mod - scripts/admin/users.js Diff File
add - styles/blobblueish/images/addtocpdb_12.png Diff File
add - styles/gartergrey/images/addtocpdb_12.png Diff File
add - styles/gringegreen/images/addtocpdb_12.png Diff File
mod - styles/gringegreen/images/cpdb_12.png Diff File
mod - templates/default/print_template.css Diff File
add - third_party/.gitattributes Diff File