Changesets: LimeSurvey
|
master af48780b 2013-12-21 01:39:24 Details Diff |
Merge pull request #4 from LimeSurvey/master Merge with Upstream |
||
| mod - .gitignore | Diff File | ||
| mod - application/config/internal.php | Diff File | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/helpers/admin/activate_helper.php | Diff File | ||
| mod - application/helpers/admin/token_helper.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| mod - application/models/TokenDynamic.php | Diff File | ||
| mod - styles/gringegreen/adminstyle.css | Diff File | ||
| mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_d1f098_40x100.png | Diff File | ||
| rm - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_e2f6be_40x100.png | Diff File | ||
| rm - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_f3fce2_40x100.png | Diff File | ||
| mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_fafafa_40x100.png | Diff File | ||
| mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_fefefe_40x100.png | Diff File | ||
| mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_50_aaaaaa_40x100.png | Diff File | ||
| mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_55_e7f8c8_40x100.png | Diff File | ||
| rm - styles/gringegreen/jquery-ui/images/ui-bg_flat_55_fafafa_40x100.png | Diff File | ||
| mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_95_fef1ec_40x100.png | Diff File | ||
| add - styles/gringegreen/jquery-ui/images/ui-bg_highlight-soft_75_daf5a7_1x100.png | Diff File | ||
| mod - styles/gringegreen/jquery-ui/jquery-ui.css | Diff File | ||
| add - tmp/runtime/cache/index.html | Diff File | ||
|
master 055b7ab5 2013-12-20 21:21:07 Details Diff |
Dev Activated model schema caching to reduce the number of queries | ||
| mod - .gitignore | Diff File | ||
| mod - application/config/internal.php | Diff File | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/helpers/admin/activate_helper.php | Diff File | ||
| mod - application/helpers/admin/token_helper.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| mod - application/models/TokenDynamic.php | Diff File | ||
| add - tmp/runtime/cache/index.html | Diff File | ||
|
master d8c6307f 2013-12-20 20:56:46 Details Diff |
Dev Minor styling updates for gringegreen | ||
| mod - styles/gringegreen/adminstyle.css | Diff File | ||
| mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_d1f098_40x100.png | Diff File | ||
| rm - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_e2f6be_40x100.png | Diff File | ||
| rm - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_f3fce2_40x100.png | Diff File | ||
| mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_fafafa_40x100.png | Diff File | ||
| mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_fefefe_40x100.png | Diff File | ||
| mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_50_aaaaaa_40x100.png | Diff File | ||
| mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_55_e7f8c8_40x100.png | Diff File | ||
| rm - styles/gringegreen/jquery-ui/images/ui-bg_flat_55_fafafa_40x100.png | Diff File | ||
| mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_95_fef1ec_40x100.png | Diff File | ||
| add - styles/gringegreen/jquery-ui/images/ui-bg_highlight-soft_75_daf5a7_1x100.png | Diff File | ||
| mod - styles/gringegreen/jquery-ui/jquery-ui.css | Diff File | ||
|
master 2edc03f1 2013-12-20 14:53:54 Details Diff |
Merge pull request #3 from LimeSurvey/master Dev Speed optimization - up to 25% faster on survey start and general ad... |
||
| mod - application/helpers/frontend_helper.php | Diff File | ||
| mod - application/libraries/Limesurvey_lang.php | Diff File | ||
|
master 0f07ffff 2013-12-20 14:48:09 Details Diff |
Revert "Extra php terminator (?>) removed" This reverts commit c1224ffa1824e4b89d0f38c41051544c9c5da6e0. |
||
| mod - framework/cli/views/shell/controller/view.php | Diff File | ||
|
master c1224ffa 2013-12-20 14:27:44 Details Diff |
Extra php terminator (?>) removed | ||
| mod - framework/cli/views/shell/controller/view.php | Diff File | ||
|
master 404e5a26 2013-12-20 13:32:27 Details Diff |
Dev Speed optimization - up to 25% faster on survey start and general admin usage | ||
| mod - application/helpers/frontend_helper.php | Diff File | ||
| mod - application/libraries/Limesurvey_lang.php | Diff File | ||
|
master 36826092 2013-12-20 13:05:49 Details Diff |
Merge pull request #2 from LimeSurvey/master Merge with Upstream |
||
| mod - application/controllers/RegisterController.php | Diff File | ||
| mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| mod - scripts/numeric-slider.js | Diff File | ||
|
master d9dc733f 2013-12-19 23:39:48 Details Diff |
Fixed issue 08474: Unable to advance on survey when any numeric field answer starts with 0 Dev: numeric question type remove the 0 in DB, not text question type |
Affected Issues 08474 |
|
| mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
|
master 0a24a314 2013-12-19 21:27:03 Details Diff |
Fixed issue 08478: Numerical sliders don't use the configured decimal separator |
Affected Issues 08478 |
|
| mod - scripts/numeric-slider.js | Diff File | ||
|
master c830236d 2013-12-19 20:55:33 Details Diff |
Merge pull request #160 from dani/master Fix COALESCE |
Affected Issues 08481 |
|
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
|
master c503657b 2013-12-19 17:26:23 Details Diff |
Merge branch 'master' of github.com:LimeSurvey/LimeSurvey | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master f3655a1f 2013-12-19 17:25:54 Details Diff |
Fixed issue 08473: Resume later leads to lose answers Dev:remove private $bProcessPost because it's keep on submit |
Affected Issues 08473 |
|
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master c51d934b 2013-12-19 16:56:08 Details Diff |
Dev: with min/max answers set up, text questions had an incorrect caption "please select N answers" insted of "fill in" (some types were missing) | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master 6141bdcd 2013-12-19 16:47:18 Daniel B. Details Diff |
Fix COALESCE | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
|
master 6ef884d2 2013-12-19 16:34:57 Details Diff |
Dev: Fixed issue : no css or js after registering Dev: start fix #08475 : just the SQL |
Affected Issues 08475 |
|
| mod - application/controllers/RegisterController.php | Diff File | ||
|
master fc68af30 2013-12-19 15:00:54 Details Diff |
Merge pull request #1 from LimeSurvey/master Merge with Upstream |
||
| mod - docs/release_notes.txt | Diff File | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/ca/LC_MESSAGES/ca.mo | Diff File | ||
| mod - locale/de-informal/LC_MESSAGES/de-informal.mo | Diff File | ||
| mod - locale/de/LC_MESSAGES/de.mo | Diff File | ||
| mod - locale/nl-informal/LC_MESSAGES/nl-informal.mo | Diff File | ||
| mod - locale/nl/LC_MESSAGES/nl.mo | Diff File | ||
| mod - locale/pl/LC_MESSAGES/pl.mo | Diff File | ||
| mod - locale/pt-BR/LC_MESSAGES/pt-BR.mo | Diff File | ||
| mod - locale/ru/LC_MESSAGES/ru.mo | Diff File | ||
| mod - locale/tr/LC_MESSAGES/tr.mo | Diff File | ||
|
master 30e93b7d 2013-12-19 14:39:56 Details Diff |
Fixed issue: with min/max answers set up, text questions had an incorrect caption "please select N answers" insted of "fill in" | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master f58cd09e 2013-12-19 14:18:40 Details Diff |
Release 2.05+ Build 131219 | ||
| mod - docs/release_notes.txt | Diff File | ||
|
master 45cd014e 2013-12-19 13:07:20 LimeSurvey Translations Bot Details Diff |
Updated translation: Catalan by valdomir Updated translation: German by actxcellence Updated translation: Dutch by Han Updated translation: Polish by elisa Updated translation: Portuguese (Brazil) by fboaventura Updated translation: Russian by vipgroup Updated translation: Tagalog by lolskidoodles, avevengers Updated translation: Turkish by kayazeren Updated translation: German (Informal) by mfaber Updated translation: Dutch (Informal) by Han |
||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/ca/LC_MESSAGES/ca.mo | Diff File | ||
| mod - locale/de-informal/LC_MESSAGES/de-informal.mo | Diff File | ||
| mod - locale/de/LC_MESSAGES/de.mo | Diff File | ||
| mod - locale/nl-informal/LC_MESSAGES/nl-informal.mo | Diff File | ||
| mod - locale/nl/LC_MESSAGES/nl.mo | Diff File | ||
| mod - locale/pl/LC_MESSAGES/pl.mo | Diff File | ||
| mod - locale/pt-BR/LC_MESSAGES/pt-BR.mo | Diff File | ||
| mod - locale/ru/LC_MESSAGES/ru.mo | Diff File | ||
| mod - locale/tr/LC_MESSAGES/tr.mo | Diff File | ||
|
master 5795dc67 2013-12-19 11:21:50 Details Diff |
Merge pull request #158 from Shnoulle/master_betterDisplaySurveyLogic Fixed issue #08470: Script are hard to debug in Survey Logic File |
Affected Issues 08470 |
|
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/viewHelper.php | Diff File | ||
|
master dc948b83 2013-12-19 11:14:59 Details Diff |
Fixed issue #08470: Script are hard to debug in Survey Logic File |
Affected Issues 08470 |
|
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/viewHelper.php | Diff File | ||
|
master 33fbe971 2013-12-19 11:12:36 Details Diff |
Dev Added missing images | ||
| add - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_d1f098_40x100.png | Diff File | ||
| add - styles/gringegreen/jquery-ui/images/ui-bg_flat_55_e7f8c8_40x100.png | Diff File | ||
|
master 6aee38c7 2013-12-19 10:59:35 Details Diff |
Merge branch 'master' of github.com:LimeSurvey/LimeSurvey | ||
| mod - .gitignore | Diff File | ||
| mod - application/views/admin/survey/deactivateSurvey_view.php | Diff File | ||
| mod - scripts/uploader.js | Diff File | ||
|
master 52c81c0d 2013-12-19 10:59:20 Details Diff |
Dev: fixed issue : bad information from survey logic file for Question code naming | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
