Changesets: LimeSurvey

Search Browse Back to Index

cond 44e46274

2016-10-07 16:55

ollehar


Details Diff		 Merge remote-tracking branch 'origin/master' into cond
mod - application/controllers/admin/NotificationController.php Diff File
mod - application/controllers/admin/databaseupdate.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/update/update_helper.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/Token.php Diff File
add - application/views/admin/databaseupdate/verify.php Diff File
mod - application/views/admin/export/spss_view.php Diff File
mod - application/views/installer/optconfig_view.php Diff File

master fb4add0a

2016-10-07 16:55

ollehar


Details Diff		 Dev: Show flash messages when db update goes wrong
mod - application/helpers/update/update_helper.php Diff File

master 4a8e0d53

2016-10-07 16:49

ollehar


Details Diff		 Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
mod - application/controllers/admin/export.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/views/admin/export/spss_view.php Diff File

master 25ed41f8

2016-10-07 16:48

ollehar


Details Diff		 Dev: Revert to old, styled confirm message at db update
mod - application/controllers/admin/NotificationController.php Diff File
mod - application/controllers/admin/databaseupdate.php Diff File
mod - application/helpers/update/update_helper.php Diff File
add - application/views/admin/databaseupdate/verify.php Diff File

master d63d9a4a

2016-10-07 16:00

c_schmitz


Details Diff		 New feature: Choose language when exporting SPSS data
mod - application/controllers/admin/export.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/views/admin/export/spss_view.php Diff File

master 48a7630a

2016-10-07 15:40

ollehar


Details Diff		 Revert "Dev: Missing lines in last fix"

This reverts commit 2b96609d8c2dba68688a1a61dd3a5ca1d793783c.
mod - application/controllers/admin/databaseupdate.php Diff File

cond 54d441ad

2016-10-07 15:32

ollehar


Details Diff		 Dev: Move more HTMl to view (WIP)
mod - application/controllers/admin/conditionsaction.php Diff File
add - application/views/admin/conditions/includes/condition.php Diff File

cond 93dfde4c

2016-10-07 14:56

ollehar


Details Diff		 Dev: Remove all HTML errors
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/views/admin/conditions/includes/conditions_scenario.php Diff File
mod - application/views/admin/conditions/includes/form_editconditions_header.php Diff File

cond 3a663814

2016-10-07 14:39

ollehar


Details Diff		 Dev: Remove wrong HTML
mod - application/controllers/admin/conditionsaction.php Diff File

cond 1fec0386

2016-10-07 14:27

ollehar


Details Diff		 Dev: Move SQL to Condition model
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/models/Condition.php Diff File

cond fb9bab59

2016-10-07 14:13

ollehar


Details Diff		 Dev: Factor out getConditionCountToken() and getConditions()
mod - application/controllers/admin/conditionsaction.php Diff File

cond 98850243

2016-10-07 14:03

ollehar


Details Diff		 Dev: Factor out getConditionCount()
mod - application/controllers/admin/conditionsaction.php Diff File

cond 88fe2ae5

2016-10-07 13:44

ollehar


Details Diff		 Dev: Factor out getJavascriptForMatching()
mod - application/controllers/admin/conditionsaction.php Diff File

cond fa276447

2016-10-07 13:29

ollehar


Details Diff		 Dev: Don't include database.php
mod - application/controllers/admin/conditionsaction.php Diff File

cond f08386b4

2016-10-07 13:25

ollehar


Details Diff		 Dev: Factor out condition navigator HTML
mod - application/controllers/admin/conditionsaction.php Diff File
add - application/views/admin/conditions/includes/navigator.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File

answers_html cc066652

2016-10-07 12:56

DenisChenu

Committer: GitHub


Details Diff		 Merge pull request #553 from tammoterhark/radio_padding

Dev: Radio padding because without/with comments are differently aligned
mod - templates/default/css/template.css Diff File

cond 1af8dbd1

2016-10-07 12:50

ollehar


Details Diff		 Dev: Factor out getQuestionNavOptions()
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/views/admin/conditions/includes/form_editconditions_header.php Diff File

answers_html 9bdf9775

2016-10-07 12:49

DenisChenu


Details Diff		 Dev: form-inline for gender button too (close https://github.com/LimeSurvey/LimeSurvey/pull/554)
Dev: lost one : .list-unstyled.form-inline is OK
mod - application/views/survey/questions/gender/buttons/answer.php Diff File

cond c4e18fd6

2016-10-07 12:36

ollehar


Details Diff		 Dev: Comment out regexp; fix width of scenario input
mod - application/views/admin/conditions/includes/form_editconditions_header.php Diff File
mod - scripts/admin/conditions.js Diff File

answers_html 05033576

2016-10-07 12:11

tammo


Details Diff		 Dev: deleted padding in radiolist with comments, in order to align with radio list without comments
mod - templates/default/css/template.css Diff File

answers_html e7c93b07

2016-10-07 12:01

DenisChenu


Details Diff		 Dev: rework a little index system (group by group)
mod - application/config/internal.php Diff File
add - application/core/packages/limesurvey/survey.js Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - scripts/survey_runtime.js Diff File

answers_html 66667fb1

2016-10-07 02:30

DenisChenu


Details Diff		 Dev: set array question type near 2.50 : no border
Dev: Add table-hover class to 5 point in array
Dev: .info update a lot more : bg-info is lighter ... (must add a comment about this)
mod - application/views/survey/questions/arrays/5point/answer.php Diff File
mod - templates/default/css/template.css Diff File

answers_html 36f0dd35

2016-10-07 02:16

DenisChenu


Details Diff		 Dev: remove some uneeded class
mod - application/core/packages/limesurvey/ls-public.css Diff File
mod - templates/base_awesome/css/template-core.css Diff File
mod - templates/default/css/template-core.css Diff File

answers_html ff98c942

2016-10-07 02:02

DenisChenu


Details Diff		 Dev: button + list inline : remove the col-sm-X : leave it for template.css
Dev: replace list-inline by form-inline : more compatc but less rules
Dev: remove some onclick to document.on event
mod - application/core/packages/limesurvey/ls-public.css Diff File
mod - application/views/survey/questions/5pointchoice/answer.php Diff File
mod - application/views/survey/questions/gender/buttons/answer.php Diff File
mod - application/views/survey/questions/gender/radio/answer.php Diff File
mod - application/views/survey/questions/yesno/buttons/item.php Diff File
mod - application/views/survey/questions/yesno/radio/item.php Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - templates/base/config.xml Diff File
mod - templates/base_awesome/css/template-core.css Diff File
mod - templates/default/css/template-core.css Diff File
mod - templates/default/css/template.css Diff File

answers_html bb90214f

2016-10-07 01:28

DenisChenu

Committer: GitHub


Details Diff		 Merge pull request #552 from tammoterhark/answers_html

Added .row to some views
mod - application/views/survey/questions/date/dropdown/answer.php Diff File
mod - application/views/survey/questions/date/selector/answer.php Diff File
mod - application/views/survey/questions/gender/buttons/answer.php Diff File
mod - application/views/survey/questions/yesno/buttons/item.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 623 624 625 626 627 628 629 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1465 1466 1467  Next  Last