LimeSurvey: cond e1824453

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar cond 2016-10-04 15:44:40 master 262654c4
Changeset

Merge branch 'global_participants'
add - .bowerrc Diff File
mod - application/config/third_party.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js Diff File
add - application/extensions/admin/grid/MassiveActionsWidget/views/modals/empty.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/views/selector.php Diff File
mod - application/extensions/bootstrap/assets/css/bootstrap.css Diff File
mod - application/extensions/yiiwheels/widgets/switch/WhSwitch.php Diff File
add - application/helpers/admin/ajax_helper.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantAttribute.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/ParticipantShare.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyLink.php Diff File
add - application/views/admin/authentication/ajaxLogin.php Diff File
mod - application/views/admin/participants/attributeControl_view.php Diff File
mod - application/views/admin/participants/attributeMap_view.php Diff File
mod - application/views/admin/participants/blacklist_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
add - application/views/admin/participants/massive_actions/_selector.php Diff File
add - application/views/admin/participants/massive_actions/_selector_attribute.php Diff File
add - application/views/admin/participants/massive_actions/_selector_share.php Diff File
add - application/views/admin/participants/modal_subviews/_addToSurvey.php Diff File
add - application/views/admin/participants/modal_subviews/_deleteParticipant.php Diff File
add - application/views/admin/participants/modal_subviews/_editAttribute.php Diff File
add - application/views/admin/participants/modal_subviews/_editParticipant.php Diff File
add - application/views/admin/participants/modal_subviews/_exportCSV.php Diff File
add - application/views/admin/participants/modal_subviews/_shareParticipant.php Diff File
add - application/views/admin/participants/modal_subviews/_showParticipantSurveys.php Diff File
add - application/views/admin/participants/modal_subviews/attributes/date.php Diff File
add - application/views/admin/participants/modal_subviews/attributes/dropdown.php Diff File
add - application/views/admin/participants/modal_subviews/attributes/textbox.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/admin/participants/sharePanel_view.php Diff File
rm - application/views/admin/participants/userControl_view.php Diff File
mod - application/views/admin/super/_configuration_menu.php Diff File
mod - application/views/admin/super/footer.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File
mod - application/views/admin/token/massive_actions/_selector.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - framework/zii/widgets/assets/gridview/jquery.yiigridview.js Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/attributeMap.js Diff File
mod - scripts/admin/participantdisplay.js Diff File
mod - scripts/admin/participantpanel.js Diff File
mod - styles/Apple_Blossom/css/lime-admin-common-rtl.css Diff File
mod - styles/Apple_Blossom/css/lime-admin-common.css Diff File
mod - styles/Bay_of_Many/config.xml Diff File
mod - styles/Bay_of_Many/css/lime-admin-common-rtl.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-common.css Diff File
mod - styles/Black_Pearl/css/lime-admin-common-rtl.css Diff File
mod - styles/Black_Pearl/css/lime-admin-common.css Diff File
mod - styles/Dark_Sky/css/lime-admin-common-rtl.css Diff File
mod - styles/Dark_Sky/css/lime-admin-common.css Diff File
mod - styles/Free_Magenta/css/lime-admin-common-rtl.css Diff File
mod - styles/Free_Magenta/css/lime-admin-common.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin-common.css Diff File
mod - styles/Sea_Green/config.xml Diff File
mod - styles/Sea_Green/css/lime-admin-common-rtl.css Diff File
mod - styles/Sea_Green/css/lime-admin-common.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-common-rtl.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-common.css Diff File
add - third_party/bootstrap-datetimepicker/.bower.json Diff File
add - third_party/bootstrap-datetimepicker/css/bootstrap-datetimepicker-standalone.css Diff File
add - third_party/bootstrap-datetimepicker/css/bootstrap-datetimepicker.css Diff File
add - third_party/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css Diff File
add - third_party/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js Diff File
add - third_party/bootstrap-switch/.bowerrc Diff File
add - third_party/bootstrap-switch/.gitignore Diff File
add - third_party/bootstrap-switch/css/bootstrap-switch.css Diff File
add - third_party/bootstrap-switch/css/bootstrap-switch.min.css Diff File
add - third_party/bootstrap-switch/js/bootstrap-switch.js Diff File
add - third_party/bootstrap-switch/js/bootstrap-switch.min.js Diff File
rm - tmp/assets/index.html Diff File