LimeSurvey: develop 36152da6

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-04-27 17:39:11 develop b26e7420
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/version.php
application/controllers/admin/checkintegrity.php
application/controllers/admin/useraction.php
locale/_template/limesurvey.pot
locale/nb/nb.mo
locale/pl/pl.mo
mod - application/commands/DemomodeCommand.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/SurveyLink.php Diff File
mod - application/views/admin/survey/Question/question_subviews/_question_type_select.php Diff File
mod - assets/images/screenshots/!.png Diff File
mod - assets/images/screenshots/1.png Diff File
mod - assets/images/screenshots/5.png Diff File
mod - assets/images/screenshots/;.png Diff File
mod - assets/images/screenshots/A.png Diff File
mod - assets/images/screenshots/B.png Diff File
mod - assets/images/screenshots/C.png Diff File
mod - assets/images/screenshots/COLON.png Diff File
mod - assets/images/screenshots/D.png Diff File
mod - assets/images/screenshots/E.png Diff File
mod - assets/images/screenshots/EQUATION.png Diff File
mod - assets/images/screenshots/F.png Diff File
mod - assets/images/screenshots/G.png Diff File
mod - assets/images/screenshots/H.png Diff File
mod - assets/images/screenshots/I.png Diff File
mod - assets/images/screenshots/K.png Diff File
mod - assets/images/screenshots/L.png Diff File
mod - assets/images/screenshots/M.png Diff File
mod - assets/images/screenshots/N.png Diff File
mod - assets/images/screenshots/O.png Diff File
mod - assets/images/screenshots/P.png Diff File
mod - assets/images/screenshots/PIPE.png Diff File
mod - assets/images/screenshots/Q.png Diff File
mod - assets/images/screenshots/R.png Diff File
add - assets/images/screenshots/S.png Diff File
rm - assets/images/screenshots/S1.png Diff File
mod - assets/images/screenshots/S2.png Diff File
mod - assets/images/screenshots/T.png Diff File
mod - assets/images/screenshots/U.png Diff File
mod - assets/images/screenshots/X.png Diff File
mod - assets/images/screenshots/Y.png Diff File
mod - assets/packages/adminbasics/css/lime-admin-common.css Diff File
mod - assets/packages/lslog/build/lslog.min.js Diff File
mod - assets/packages/lslog/gulpfile.js Diff File
add - assets/packages/lslog/package.json Diff File
add - assets/packages/lslog/yarn.lock Diff File
mod - assets/scripts/admin/participantpanel.js Diff File
mod - docs/release_notes.txt Diff File
mod - locale/ro/ro.mo Diff File