Changesets: LimeSurvey
|
Yii 63537574 2012-05-08 13:00:48 Details Diff |
Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey.git into Yii | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
Yii edf718b7 2012-05-08 12:59:30 Details Diff |
dev: fixed survey overview problem where data wasn't refreshed | ||
| mod - application/models/Survey_dynamic.php | Diff File | ||
|
Yii 9edf9f41 2012-05-08 12:32:02 Details Diff |
Merge remote-tracking branch 'origin/Yii' into Yii | ||
| rm - tmp/limesurvey2_sample_survey_english.lss | Diff File | ||
|
Yii 31ce4c0f 2012-05-08 12:31:45 Details Diff |
Fixed issue 06071: Notices if using mssql and changing/importing survey |
Affected Issues 06071 |
|
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
Yii 7ffbfa09 2012-05-08 12:24:00 Details Diff |
dev: reverting accidental commit | ||
| rm - tmp/limesurvey2_sample_survey_english.lss | Diff File | ||
|
Yii c6d0e217 2012-05-08 12:12:40 Details Diff |
Merge remote-tracking branch 'origin/Yii' into Yii | ||
| add - tmp/limesurvey2_sample_survey_english.lss | Diff File | ||
| mod - application/controllers/admin/dataentry.php | Diff File | ||
| mod - application/views/admin/dataentry/content_view.php | Diff File | ||
|
Yii de19caaf 2012-05-08 12:12:10 Details Diff |
Fixed issue 06071: Notices if using mssql and changing/importing survey |
Affected Issues 06071 |
|
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master a30211cf 2012-05-08 12:11:32 Details Diff |
Fixed issue 06071: Notices if using mssql and changing/importing survey |
Affected Issues 06071 |
|
| mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
|
Yii e2057c0b 2012-05-08 09:28:50 Details Diff |
dev: fixed wrong dateformat error, output is still a mess and a lot of duplicate from the new record logic | ||
| mod - application/controllers/admin/dataentry.php | Diff File | ||
|
Yii a4e431d5 2012-05-08 09:17:26 Details Diff |
Fixed issue 06044: Data entry does not show text fields as defined dev: ported changes from master to yii |
Affected Issues 06044 |
|
| add - tmp/limesurvey2_sample_survey_english.lss | Diff File | ||
| mod - application/views/admin/dataentry/content_view.php | Diff File | ||
|
master 69ab63aa 2012-05-08 08:51:19 Marcel Minke Details Diff |
Fix: Fix part 2/2 (data editing) for bug 06044: Use advanced question settings such as numbers_only, display_rows, max_characters, prefix, suffix, ... at data entry screen. |
Affected Issues 06044 |
|
| mod - admin/dataentry.php | Diff File | ||
|
Yii 9d9c4a70 2012-05-08 07:59:42 Details Diff |
Dev SQL error on importing survey | ||
| mod - application/helpers/admin/import_helper.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
Yii 81be2030 2012-05-08 07:13:16 Details Diff |
dev: fixed some small issues in browse screen with tokens | ||
| mod - application/views/admin/browse/browseallrow_view.php | Diff File | ||
|
Yii d3c13db7 2012-05-08 05:51:55 Details Diff |
Dev Fixed missing CSS for RTL languages | ||
| add - styles/gartergrey/adminstyle-rtl.css | Diff File | ||
|
Yii d6700b46 2012-05-08 05:50:44 Details Diff |
Dev Some minor HTML 5 fixes. Moved url parameters tables to the right DB update | ||
| mod - application/helpers/update/upgrade-mssql_helper.php | Diff File | ||
| mod - application/helpers/update/upgrade-mysql_helper.php | Diff File | ||
| mod - application/helpers/update/upgrade-pgsql_helper.php | Diff File | ||
| mod - application/views/admin/super/header.php | Diff File | ||
| mod - application/views/admin/user/personalsettings.php | Diff File | ||
|
master 3ee4e4f3 2012-05-08 05:45:14 Details Diff |
Dev Removed obsolete tables | ||
| mod - admin/install/create-mssql.sql | Diff File | ||
| mod - admin/install/create-mssqlnative.sql | Diff File | ||
| mod - admin/install/create-mysql.sql | Diff File | ||
| mod - admin/install/create-postgres.sql | Diff File | ||
| mod - admin/integritycheck.php | Diff File | ||
| mod - admin/update/upgrade-mssql.php | Diff File | ||
| mod - admin/update/upgrade-mssqlnative.php | Diff File | ||
| mod - admin/update/upgrade-mysql.php | Diff File | ||
| mod - admin/update/upgrade-postgres.php | Diff File | ||
|
1.92 f36f8afd 2012-05-07 13:09:56 Details Diff |
Merge branch 'master' into 192_dev | ||
| mod - admin/conditionshandling.php | Diff File | ||
| mod - admin/importoldresponses.php | Diff File | ||
| mod - admin/scripts/answers.js | Diff File | ||
| mod - admin/scripts/subquestions.js | Diff File | ||
| mod - admin/scripts/updateset.js | Diff File | ||
| mod - classes/core/surveytranslator.php | Diff File | ||
| mod - common_functions.php | Diff File | ||
| mod - group.php | Diff File | ||
| add - locale/af/LC_MESSAGES/af.mo | Diff File | ||
| add - locale/af/LC_MESSAGES/af.po | Diff File | ||
| mod - locale/fa/LC_MESSAGES/fa.mo | Diff File | ||
| mod - locale/fa/LC_MESSAGES/fa.po | Diff File | ||
| mod - locale/pt-BR/LC_MESSAGES/pt-BR.mo | Diff File | ||
| mod - locale/pt-BR/LC_MESSAGES/pt-BR.po | Diff File | ||
| mod - qanda.php | Diff File | ||
| mod - save.php | Diff File | ||
| mod - templates/basic/ie_fix_6.css | Diff File | ||
| mod - templates/basic/ie_fix_7.css | Diff File | ||
| mod - templates/basic/template.css | Diff File | ||
| mod - templates/bluengrey/template.css | Diff File | ||
| mod - templates/bluengrey/welcome.pstpl | Diff File | ||
| mod - templates/citronade/template-rtl.css | Diff File | ||
| mod - templates/citronade/template.css | Diff File | ||
| mod - templates/clear_logo/template.css | Diff File | ||
| mod - templates/clear_logo/welcome.pstpl | Diff File | ||
| mod - templates/default/ie_fix_6.css | Diff File | ||
| mod - templates/default/ie_fix_7.css | Diff File | ||
| mod - templates/default/template.css | Diff File | ||
| mod - templates/default/welcome.pstpl | Diff File | ||
| mod - templates/eirenicon/template.css | Diff File | ||
| mod - templates/eirenicon/welcome.pstpl | Diff File | ||
| mod - templates/limespired/template.css | Diff File | ||
| mod - templates/limespired/welcome.pstpl | Diff File | ||
| mod - templates/mint_idea/template.css | Diff File | ||
| mod - templates/mint_idea/welcome.pstpl | Diff File | ||
| mod - templates/sherpa/template.css | Diff File | ||
| mod - templates/sherpa/welcome.pstpl | Diff File | ||
| mod - templates/vallendar/template.css | Diff File | ||
| mod - templates/vallendar/welcome.pstpl | Diff File | ||
|
Yii 25b68560 2012-05-07 06:38:51 Details Diff |
Dev Numerous HTML 5 fixes Dev Minor fixes to conditions Dev Preparations for v2 |
||
| mod - application/config/version.php | Diff File | ||
| mod - application/controllers/admin/conditionsaction.php | Diff File | ||
| mod - application/views/admin/browse/browseidheader_view.php | Diff File | ||
| mod - application/views/admin/browse/browsetimeheader_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/answerOptions_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/questionbar_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/subQuestion_view.php | Diff File | ||
| mod - styles/gartergrey/adminstyle.css | Diff File | ||
|
Yii f177ee8b 2012-05-07 06:13:03 Details Diff |
Fixed issue 06065: Error when creating a new survey by copying an existing one |
Affected Issues 06065 |
|
| mod - application/helpers/admin/import_helper.php | Diff File | ||
|
master 684b6624 2012-05-07 06:10:13 Details Diff |
Fixed issue 06065: Error when creating a new survey by copying an existing one |
Affected Issues 06065 |
|
| mod - admin/import_functions.php | Diff File | ||
|
Yii 805c8fc4 2012-05-07 04:03:21 Details Diff |
Merge remote-tracking branch 'origin/Yii' into Yii | ||
| rm - application/helpers/admin/domxml_wrapper_helper.php | Diff File | ||
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/helpers/export_helper.php | Diff File | ||
| mod - application/libraries/admin/quexmlpdf.php | Diff File | ||
| mod - application/views/libraries/quexmlpdf/style_view.php | Diff File | ||
|
Yii 34d84be9 2012-05-07 04:02:49 Details Diff |
Fixed issue 06061: Duplicate codes when adding new answer options/subquestions/labels |
Affected Issues 06061 |
|
| mod - scripts/admin/answers.js | Diff File | ||
| mod - scripts/admin/subquestions.js | Diff File | ||
| mod - scripts/admin/updateset.js | Diff File | ||
|
master 8114b531 2012-05-07 04:02:35 Details Diff |
Fixed issue 06061: Duplicate codes when adding new answer options/subquestions/labels |
Affected Issues 06061 |
|
| mod - admin/scripts/answers.js | Diff File | ||
| mod - admin/scripts/subquestions.js | Diff File | ||
| mod - admin/scripts/updateset.js | Diff File | ||
|
master 89a23adf 2012-05-07 03:56:16 Details Diff |
Fixed issue: Behaviour change on 'resume later' | ||
| mod - group.php | Diff File | ||
|
master 38f8ea85 2012-05-07 03:55:43 Details Diff |
Fixed issue #6048: Conditions editor produces fatal error: maximum allocated memory |
Affected Issues 06048 |
|
| mod - admin/conditionshandling.php | Diff File | ||
