Changesets: LimeSurvey

Search Browse Back to Index

2.5 a3b0d7c9

2015-09-23 18:01

LouisGac


Details Diff		 Dev : Token form design, token save button fixed
mod - application/controllers/admin/tokens.php Diff File
mod - application/views/admin/token/token_bar.php Diff File
mod - application/views/admin/token/tokenform.php Diff File

develop 490f8546

2015-09-23 17:58

sammousa


Details Diff		 Dev updated dependencies
mod - composer.json Diff File
mod - composer.lock Diff File

develop ba6a34af

2015-09-23 17:43

sammousa


Details Diff		 Dev Removed unneeded index.html files.
rm - protected/components/AssetManager.php Diff
rm - protected/config/index.html Diff
mod - protected/config/internal.php Diff File
rm - protected/controllers/admin/index.html Diff
rm - protected/controllers/index.html Diff
rm - protected/locale/af/index.html Diff
rm - protected/locale/am/index.html Diff
rm - protected/locale/ar/index.html Diff
rm - protected/locale/be/index.html Diff
rm - protected/locale/bg/index.html Diff
rm - protected/locale/bs/index.html Diff
rm - protected/locale/ca-valencia/index.html Diff
rm - protected/locale/ca/index.html Diff
rm - protected/locale/ckb/index.html Diff
rm - protected/locale/cs-informal/index.html Diff
rm - protected/locale/cs/index.html Diff
rm - protected/locale/cy/index.html Diff
rm - protected/locale/da/index.html Diff
rm - protected/locale/de-informal/index.html Diff
rm - protected/locale/de/index.html Diff
rm - protected/locale/el/index.html Diff
rm - protected/locale/en/index.html Diff
rm - protected/locale/eo/index.html Diff
rm - protected/locale/es-AR-informal/index.html Diff
rm - protected/locale/es-AR/index.html Diff
rm - protected/locale/es-CL/index.html Diff
rm - protected/locale/es-MX/index.html Diff
rm - protected/locale/es/index.html Diff
rm - protected/locale/et/index.html Diff
rm - protected/locale/eu/index.html Diff
rm - protected/locale/fa/index.html Diff
rm - protected/locale/fi/index.html Diff
rm - protected/locale/fr/index.html Diff
rm - protected/locale/ful/index.html Diff
rm - protected/locale/ga/index.html Diff
rm - protected/locale/gl/index.html Diff
rm - protected/locale/gu/index.html Diff
rm - protected/locale/he/index.html Diff
rm - protected/locale/hi/index.html Diff
rm - protected/locale/hr/index.html Diff
rm - protected/locale/hu/index.html Diff
rm - protected/locale/hy/index.html Diff
rm - protected/locale/id/index.html Diff
rm - protected/locale/index.html Diff
rm - protected/locale/is/index.html Diff
rm - protected/locale/it-informal/index.html Diff
rm - protected/locale/it/index.html Diff
rm - protected/locale/ja/index.html Diff
rm - protected/locale/ka/index.html Diff
rm - protected/locale/kk/index.html Diff
rm - protected/locale/ko/index.html Diff
rm - protected/locale/ky/index.html Diff
rm - protected/locale/lt/index.html Diff
rm - protected/locale/lv/index.html Diff
rm - protected/locale/mk/index.html Diff
rm - protected/locale/mn/index.html Diff
rm - protected/locale/mr/index.html Diff
rm - protected/locale/ms/index.html Diff
rm - protected/locale/mt/index.html Diff
rm - protected/locale/nb/index.html Diff
rm - protected/locale/nl-informal/index.html Diff
rm - protected/locale/nl/index.html Diff
rm - protected/locale/nn/index.html Diff
rm - protected/locale/oc/index.html Diff
rm - protected/locale/pa/index.html Diff
rm - protected/locale/pap-AW/index.html Diff
rm - protected/locale/pap-CW/index.html Diff
rm - protected/locale/pl-informal/index.html Diff
rm - protected/locale/pl/index.html Diff
rm - protected/locale/prs/index.html Diff
rm - protected/locale/ps/index.html Diff
rm - protected/locale/pt-BR/index.html Diff
rm - protected/locale/pt/index.html Diff
rm - protected/locale/ro/index.html Diff
rm - protected/locale/ru/index.html Diff
rm - protected/locale/rw/index.html Diff
rm - protected/locale/si/index.html Diff
rm - protected/locale/sk/index.html Diff
rm - protected/locale/sl/index.html Diff
rm - protected/locale/sq/index.html Diff
rm - protected/locale/sr-Latn/index.html Diff
rm - protected/locale/sr/index.html Diff
rm - protected/locale/sv/index.html Diff
rm - protected/locale/swh/index.html Diff
rm - protected/locale/ta/index.html Diff
rm - protected/locale/th/index.html Diff
rm - protected/locale/tr/index.html Diff
rm - protected/locale/uk/index.html Diff
rm - protected/locale/ur/index.html Diff
rm - protected/locale/vi/index.html Diff
rm - protected/locale/zh-Hans/index.html Diff
rm - protected/locale/zh-Hant-HK/index.html Diff
rm - protected/locale/zh-Hant-TW/index.html Diff
rm - protected/locale/zu/index.html Diff
rm - protected/models/index.html Diff
rm - protected/plugins/AuditLog/assets/index.html Diff
rm - protected/plugins/index.html Diff
rm - protected/tests/index.html Diff
rm - protected/third_party/index.html Diff
rm - protected/views/index.html Diff

2.5 f4c8dbe6

2015-09-23 16:46

LouisGac


Details Diff		 Dev: merge queXML
mod - application/controllers/admin/export.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File

develop 09644b5a

2015-09-23 16:40

sammousa


Details Diff		 Dev More clean up, now use yii asset manager for bower assets.
mod - composer.json Diff File
mod - composer.lock Diff File
mod - index.php Diff File
mod - protected/components/AssetManager.php Diff File
mod - protected/components/SurveySession.php Diff File
mod - protected/config/internal.php Diff File
mod - protected/controllers/FilesController.php Diff File
mod - protected/controllers/Statistics_userController.php Diff File
mod - protected/controllers/TemplatesController.php Diff File
rm - protected/controllers/admin/limereplacementfields.php Diff
rm - protected/controllers/admin/templates.php Diff
mod - protected/controllers/admin/translate.php Diff File
mod - protected/core/WebApplication.php Diff File
mod - protected/entry.php Diff File
mod - protected/extensions/LimeScript/LimeScript.php Diff File
mod - protected/extensions/LimeScript/assets/script.js Diff File
mod - protected/extensions/yii-jsoneditor/JsonEditor.php Diff File
mod - protected/helpers/admin/statistics_helper.php Diff File
mod - protected/helpers/common_helper.php Diff File
mod - protected/helpers/globals.php Diff File
mod - protected/libraries/admin/pdf.php Diff File
mod - protected/models/Template.php Diff File
add - protected/themes/default/assets/images/ajax-loader.gif Diff File
add - protected/themes/default/assets/images/donate.png Diff File
rm - protected/views/admin/survey/subview/tabCopy_view.php Diff
rm - protected/views/admin/survey/subview/tabGeneralEditSurvey_view.php Diff
rm - protected/views/admin/survey/subview/tabGeneralNewSurvey_view.php Diff
rm - protected/views/admin/survey/subview/tabImport_view.php Diff
rm - protected/views/admin/survey/subview/tabNotification_view.php Diff
rm - protected/views/admin/survey/subview/tabPanelIntegration_view.php Diff
rm - protected/views/admin/survey/subview/tabPluginSettings_view.php Diff
rm - protected/views/admin/survey/subview/tabPresentation_view.php Diff
rm - protected/views/admin/survey/subview/tabPublication_view.php Diff
rm - protected/views/admin/survey/subview/tabResourceManagement_view.php Diff
rm - protected/views/admin/survey/subview/tabTokens_view.php Diff
rm - protected/views/admin/survey/subview/tab_view.php Diff
rm - protected/views/admin/update/step2.php Diff
rm - protected/views/admin/update/step3.php Diff
rm - protected/views/admin/update/step4.php Diff
rm - protected/views/admin/update/update.php Diff
rm - protected/views/admin/update/updaterupdate.php Diff
mod - protected/views/global/footer.php Diff File
mod - protected/views/global/templateMenu.php Diff File
mod - protected/views/layouts/main.php Diff File
mod - protected/views/layouts/survey.php Diff File
rm - public/components/.gitkeep Diff
mod - public/index.php Diff File
mod - public/scripts/htmleditor.js Diff File
rm - public/third_party/jquery-ace/README.md Diff
rm - public/third_party/jquery-ace/jquery.ace.js Diff

2.5 47baf1a8

2015-09-23 16:20

LouisGac


Details Diff		 fixed: close button for assesments
mod - application/controllers/admin/assessments.php Diff File

2.5 9dff9b59

2015-09-23 16:16

LouisGac


Details Diff		 fixed: assesments bar shown after save
dev : corrected display
mod - application/controllers/admin/assessments.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/views/admin/assessments_view.php Diff File

2.5 8b206a21

2015-09-23 15:17

LouisGac


Details Diff		 Dev: connexion of stats in admin menus. Some refactoring.
mod - application/controllers/admin/database.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/views/admin/super/_configuration_menu.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/subview/accordion/_resources_panel.php Diff File

develop 16ba3ea7

2015-09-23 12:13

sammousa


Details Diff		 Merge branch 'feature-separate-public' into develop
mod - .gitignore Diff File
rm - application/components/AssetManager.php Diff
rm - application/config/index.html Diff
rm - application/core/LSHttpRequest.php Diff
mod - composer.json Diff File
mod - composer.lock Diff File
mod - index.php Diff File
add - protected/components/AssetManager.php Diff File

develop aef31a51

2015-09-23 12:13

sammousa


Details Diff		 Dev Reorganized folders for better security.
mod - index.php Diff File
mod - protected/components/AssetManager.php Diff File
mod - protected/config/internal.php Diff File
mod - protected/core/HttpRequest.php Diff File
rm - protected/core/LSHttpRequest.php Diff
mod - protected/helpers/expressions/em_manager_helper.php Diff File
rm - protected/index.html Diff
mod - protected/models/questions/OpenArrayQuestion.php Diff File
add - public/index.php Diff File
add - public/scripts/timers.js Diff File

develop d8b2688a

2015-09-23 11:26

sammousa


Details Diff		 Dev updated dependencies and gitignore for new folder structure.
mod - .gitignore Diff File
mod - composer.json Diff File
mod - composer.lock Diff File

develop 19041ad9

2015-09-23 11:25

sammousa


Details Diff		 Dev Moved lots of files to public / protected folders.

develop 18b92b1f

2015-09-23 11:08

sammousa


Details Diff		 Revert "Dev: Fixed issue 09912: All view broken JS and/or CSS"

This reverts commit 5115ce247b25f790aca732eddbfa215a4689f95f.		 Affected Issues
09912
mod - application/config/internal.php Diff File
mod - application/config/third_party.php Diff File

develop 2bee7554

2015-09-23 11:05

sammousa


Details Diff		 Merge branch 'develop' of github.com:LimeSurvey/LimeSurvey into develop
mod - application/config/internal.php Diff File
mod - application/config/third_party.php Diff File

develop b2d3d675

2015-09-23 11:05

sammousa


Details Diff		 Dev Throw exception on failed immport.
mod - application/core/plugins/PermissionDb/PermissionDb.php Diff File
mod - application/helpers/import/importers/Import178.php Diff File
mod - application/models/Permission.php Diff File

2.5 c0b76d5b

2015-09-23 11:03

LouisGac


Details Diff		 Dev: in survey summary, quick action, the switch to display questions group by group is now working
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/views/admin/super/header.php Diff File
mod - application/views/admin/survey/surveySummary_view.php Diff File

develop 5115ce24

2015-09-23 10:09

DenisChenu


Details Diff		 Dev: Fixed issue 09912: All view broken JS and/or CSS
Dev: use same bower-asset than composer
Dev: surely some other broken		 Affected Issues
09912
mod - application/config/internal.php Diff File
mod - application/config/third_party.php Diff File

2.5 45be4529

2015-09-22 17:51

LouisGac


Details Diff		 Dev: ressources buttons
mod - application/views/admin/survey/subview/accordion/_resources_panel.php Diff File

2.5 1f78a2c3

2015-09-22 17:27

LouisGac


Details Diff		 Dev: saving survey option from editlocalsetting
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/views/admin/super/header.php Diff File
mod - application/views/admin/survey/_subview/tabPanelIntegration_view.php Diff File
mod - application/views/admin/survey/editLocalSettings_main_view.php Diff File
mod - application/views/admin/survey/editLocalSettings_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_accordion_container.php Diff File
mod - application/views/admin/survey/subview/accordion/_integration_panel.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - scripts/admin/surveysettings.js Diff File

develop 3480544a

2015-09-22 16:39

sammousa


Details Diff		 Dev Add redirect on failed import.
mod - application/controllers/SurveysController.php Diff File

develop a39efac1

2015-09-22 16:38

sammousa


Details Diff		 Dev Fixed error whe ntmep directory does not exist.
mod - application/helpers/common_helper.php Diff File

master b8445767

2015-09-22 14:55

DenisChenu


Details Diff		 Fixed issue 09907: Invitations can not be sent before the start date of the tokens / inappropriate error message
Dev: Add a checkbox to bypass date control
Dev: TokenDynamic->findUninvitedIDsfind don't accept more Criteria : review it for 3.0		 Affected Issues
09907
mod - application/controllers/admin/tokens.php Diff File
mod - application/views/admin/token/emailwarning.php Diff File
mod - application/views/admin/token/invite.php Diff File
mod - application/views/admin/token/remind.php Diff File

2.5 1c54c202

2015-09-22 11:27

LouisGac


Details Diff		 Dev: create new survey from survey list, and some cleaning
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/views/admin/super/fullpagebar_view.php Diff File
mod - application/views/admin/super/welcome.php Diff File
rm - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php Diff

2.5 21f613eb

2015-09-22 11:04

LouisGac


Details Diff		 Dev: personal settings
mod - application/controllers/admin/useraction.php Diff File
mod - application/views/admin/user/personalsettings.php Diff File

2.5 10f8184e

2015-09-22 10:31

LouisGac


Details Diff		 Dev: import and copy, design
mod - application/views/admin/survey/copySurvey_view.php Diff File
mod - application/views/admin/survey/importSurvey_view.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 832 833 834 835 836 837 838 ... 900 ... 1050 ... 1200 ... 1350 ... 1471 1472 1473  Next  Last