LimeSurvey: global_participants 04cb505e

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar global_participants 2016-09-20 16:26 global_participants ef8843da
Changeset

Merge remote-tracking branch 'origin/master' into global_participants

Conflicts:
styles/Apple_Blossom/css/lime-admin-common-rtl.css
styles/Apple_Blossom/css/lime-admin-common.css
styles/Bay_of_Many/css/lime-admin-common-rtl.css
styles/Bay_of_Many/css/lime-admin-common.css
styles/Black_Pearl/css/lime-admin-common-rtl.css
styles/Black_Pearl/css/lime-admin-common.css
styles/Dark_Sky/css/lime-admin-common-rtl.css
styles/Dark_Sky/css/lime-admin-common.css
styles/Free_Magenta/css/lime-admin-common-rtl.css
styles/Free_Magenta/css/lime-admin-common.css
styles/Noto_All_Languages/css/lime-admin-common-rtl.css
styles/Noto_All_Languages/css/lime-admin-common.css
styles/Purple_Tentacle/css/lime-admin-common-rtl.css
styles/Purple_Tentacle/css/lime-admin-common.css
styles/Sea_Green/css/lime-admin-common-rtl.css
styles/Sunset_Orange/css/lime-admin-common-rtl.css
styles/Sunset_Orange/css/lime-admin-common.css
mod - application/config/version.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/views/admin/responses/massive_actions/_selector.php 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/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/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
mod - templates/default/css/flat_and_modern.css Diff File
mod - templates/default/views/startpage.pstpl Diff File
mod - templates/news_paper/css/news_paper.css Diff File
mod - templates/news_paper/views/startpage.pstpl Diff File
mod - templates/ubuntu_orange/css/ubuntu_orange.css Diff File
mod - templates/ubuntu_orange/views/startpage.pstpl Diff File
mod - third_party/jquery-ace/jquery.ace.js Diff File