Changesets: LimeSurvey
develop 6f6b7cdd 2017-01-13 13:44
Details Diff |
Merge branch 'master' into 'develop' | ||
mod - .gitignore | Diff File | ||
mod - application/config/version.php | Diff File | ||
mod - application/controllers/admin/export.php | Diff File | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
mod - application/models/LSActiveRecord.php | Diff File | ||
mod - application/models/Survey.php | Diff File | ||
mod - application/models/UniqueNotification.php | Diff File | ||
rm - application/third_party/phpmailer/.gitattributes | Diff | ||
rm - application/third_party/phpmailer/.gitignore | Diff | ||
rm - application/third_party/phpmailer/.scrutinizer.yml | Diff | ||
rm - application/third_party/phpmailer/.travis.yml | Diff | ||
rm - application/third_party/phpmailer/README.md | Diff | ||
rm - application/third_party/phpmailer/SECURITY.md | Diff | ||
mod - application/third_party/phpmailer/VERSION | Diff File | ||
rm - application/third_party/phpmailer/changelog.md | Diff | ||
mod - application/third_party/phpmailer/class.phpmailer.php | Diff File | ||
mod - application/third_party/phpmailer/class.pop3.php | Diff File | ||
mod - application/third_party/phpmailer/class.smtp.php | Diff File | ||
mod - application/third_party/phpmailer/extras/htmlfilter.php | Diff File | ||
rm - application/third_party/phpmailer/travis.phpunit.xml.dist | Diff | ||
mod - application/views/admin/export/exportresults_view.php | Diff File | ||
mod - docs/release_notes.txt | Diff File | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/ca/ca.mo | Diff File | ||
mod - locale/de-informal/de-informal.mo | Diff File | ||
mod - locale/de/de.mo | Diff File | ||
mod - locale/es/es.mo | Diff File | ||
mod - locale/fr/fr.mo | Diff File | ||
mod - locale/hu/hu.mo | Diff File | ||
mod - locale/it-informal/it-informal.mo | Diff File | ||
mod - locale/it/it.mo | Diff File | ||
mod - locale/nb/nb.mo | Diff File | ||
mod - locale/nn/nn.mo | Diff File | ||
mod - locale/pl/pl.mo | Diff File | ||
mod - locale/pt-BR/pt-BR.mo | Diff File | ||
mod - locale/sv/sv.mo | Diff File | ||
master 4b298a45 2017-01-13 13:26
Details Diff |
Fixed issue 12052: Overlapping messages Dev: Implemented the new notification System for updates |
Affected Issues 12052 |
|
mod - application/core/Survey_Common_Action.php | Diff File | ||
add - application/models/UniqueNotification.php | Diff File | ||
master a544b4ff 2017-01-13 13:25
Details Diff |
Dev: added twig_cache to .gitignore | ||
mod - .gitignore | Diff File | ||
master e3db4ac6 2017-01-12 14:47 Details Diff |
Release 2.58.2 Build 170114 | ||
mod - application/config/version.php | Diff File | ||
mod - docs/release_notes.txt | Diff File | ||
master aaaa240b 2017-01-12 14:44 Details Diff |
Fixed issue: [security] Directory traversal vulnerability in PHPMailer library - PHPMailer update to 5.2.22 | ||
rm - application/third_party/phpmailer/.gitattributes | Diff | ||
rm - application/third_party/phpmailer/.gitignore | Diff | ||
rm - application/third_party/phpmailer/.scrutinizer.yml | Diff | ||
rm - application/third_party/phpmailer/.travis.yml | Diff | ||
rm - application/third_party/phpmailer/README.md | Diff | ||
rm - application/third_party/phpmailer/SECURITY.md | Diff | ||
mod - application/third_party/phpmailer/VERSION | Diff File | ||
rm - application/third_party/phpmailer/changelog.md | Diff | ||
mod - application/third_party/phpmailer/class.phpmailer.php | Diff File | ||
mod - application/third_party/phpmailer/class.pop3.php | Diff File | ||
mod - application/third_party/phpmailer/class.smtp.php | Diff File | ||
mod - application/third_party/phpmailer/extras/htmlfilter.php | Diff File | ||
rm - application/third_party/phpmailer/travis.phpunit.xml.dist | Diff | ||
2.06lts ce0970ad 2017-01-12 13:06 Details Diff |
[release] 1.2.2 PHPMailer issue again | ||
mod - CHANGELOG.md | Diff File | ||
mod - application/config/version.php | Diff File | ||
2.06lts fdc9b3d0 2017-01-12 13:01 Details Diff |
[fix] Update to PHPMailer 5.2.22 | ||
mod - CHANGELOG.md | Diff File | ||
rm - application/third_party/phpmailer/.gitignore | Diff | ||
rm - application/third_party/phpmailer/.scrutinizer.yml | Diff | ||
rm - application/third_party/phpmailer/.travis.yml | Diff | ||
rm - application/third_party/phpmailer/README.md | Diff | ||
mod - application/third_party/phpmailer/VERSION | Diff File | ||
rm - application/third_party/phpmailer/changelog.md | Diff | ||
mod - application/third_party/phpmailer/class.phpmailer.php | Diff File | ||
mod - application/third_party/phpmailer/class.pop3.php | Diff File | ||
mod - application/third_party/phpmailer/class.smtp.php | Diff File | ||
mod - application/third_party/phpmailer/extras/htmlfilter.php | Diff File | ||
rm - application/third_party/phpmailer/language/phpmailer.lang-br.php | Diff | ||
rm - application/third_party/phpmailer/language/phpmailer.lang-cz.php | Diff | ||
rm - application/third_party/phpmailer/language/phpmailer.lang-dk.php | Diff | ||
rm - application/third_party/phpmailer/language/phpmailer.lang-no.php | Diff | ||
rm - application/third_party/phpmailer/language/phpmailer.lang-se.php | Diff | ||
rm - application/third_party/phpmailer/travis.phpunit.xml.dist | Diff | ||
master fa504ce8 2017-01-12 10:27 Details Diff |
Release 2.58.1 Build 170113 | ||
mod - application/config/version.php | Diff File | ||
mod - docs/release_notes.txt | Diff File | ||
master b362ab5e 2017-01-12 10:20 LimeSurvey Translations Bot Details Diff |
Updated translation: German by c_schmitz Updated translation: German (Informal) by c_schmitz |
||
mod - locale/de-informal/de-informal.mo | Diff File | ||
mod - locale/de/de.mo | Diff File | ||
master e46ff610 2017-01-12 10:14 LimeSurvey Translations Bot Details Diff |
Updated translation: Catalan by qualitatuvic Updated translation: French (France) by arnaud21 Updated translation: Hungarian by kkd Updated translation: Italian by lfanfoni Updated translation: Norwegian (Bokmål) by pmonstad Updated translation: Norwegian (Nynorsk) by pmonstad Updated translation: Polish by elissa Updated translation: Portuguese (Brazil) by Davinch Updated translation: German (Informal) by c_schmitz Updated translation: Italian (Informal) by lfanfoni Updated translation: Polish (Informal) by elissa |
||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/ca/ca.mo | Diff File | ||
mod - locale/de-informal/de-informal.mo | Diff File | ||
mod - locale/fr/fr.mo | Diff File | ||
mod - locale/hu/hu.mo | Diff File | ||
mod - locale/it-informal/it-informal.mo | Diff File | ||
mod - locale/it/it.mo | Diff File | ||
mod - locale/nb/nb.mo | Diff File | ||
mod - locale/nn/nn.mo | Diff File | ||
mod - locale/pl/pl.mo | Diff File | ||
mod - locale/pt-BR/pt-BR.mo | Diff File | ||
2.06lts e3ff9ef2 2017-01-12 09:43 Details Diff |
Release 2.6.3-lts Build 170112 | ||
mod - application/config/version.php | Diff File | ||
mod - docs/release_notes.txt | Diff File | ||
twig-layout 7e6f6055 2017-01-11 19:02
Details Diff |
Dev: replaced QUESTION_MANDATORY by question_mandatory.twig | ||
mod - templates/default/views/question.twig | Diff File | ||
twig-layout 5e0682d2 2017-01-11 19:01
Details Diff |
Dev: added question_mandatory.twig | ||
add - templates/default/views/subviews/question_mandatory.twig | Diff File | ||
twig-layout 30662c07 2017-01-11 19:01
Details Diff |
Dev: added aQuestion (result of qanda helper) to twig | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
mod - templates/default/views/question.twig | Diff File | ||
twig-layout b5afa351 2017-01-11 19:00
Details Diff |
Dev: some cleaning | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
twig-layout b303bf5e 2017-01-11 18:58
Details Diff |
Dev: added question.twig | ||
add - templates/default/views/question.twig | Diff File | ||
twig-layout 0e2c3d24 2017-01-11 16:26
Details Diff |
Dev: removed the useless call to survey.pstpl (language changer + javascript alert are in startpage now) | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
twig-layout 5d864fdc 2017-01-11 16:25
Details Diff |
Dev: moved javascript notification out of welcome.twig | ||
mod - templates/default/views/startpage.twig | Diff File | ||
mod - templates/default/views/welcome.twig | Diff File | ||
twig-layout 8d38a5e8 2017-01-11 16:21
Details Diff |
Dev: added inclusion of privacy/welcome page to startpage | ||
mod - templates/default/views/startpage.twig | Diff File | ||
twig-layout b6c44ad0 2017-01-11 16:21
Details Diff |
Dev: added privacy.twig | ||
add - templates/default/views/subviews/privacy.twig | Diff File | ||
twig-layout 3333bb3e 2017-01-11 16:20
Details Diff |
Dev: moved logic for welcome and privacy from helper to template via twig | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
add - templates/default/views/subviews/allinone_mode_welcome_privacy.twig | Diff File | ||
twig-layout aca23425 2017-01-11 13:54
Details Diff |
Dev: added datas for welcome.twig | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
twig-layout d9c66266 2017-01-11 13:53
Details Diff |
Dev: added welcome.twig | ||
add - templates/default/views/welcome.twig | Diff File | ||
twig-layout 1f6e1798 2017-01-11 13:38
Details Diff |
Dev: added $totalquestions to thissurvey for twig | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
master 79f63047 2017-01-11 13:28
Committer: GitHub Details Diff |
Merge pull request #618 from papa-mb/master Fixed issue 12041 : expire date of a survey deactivated manually is … |
Affected Issues 12041 |
|
mod - application/models/Survey.php | Diff File |