View Issue Details

Related ChangesetsJump to NotesJump to History
This bug affects 1 person(s).
 6
IDProjectCategoryView StatusDate SubmittedLast Update
10090Bug reportsSurvey editingpublic2015-12-08 13:232016-01-08 15:36
ReporterMazi Assigned ToLouisGac 
PrioritynormalSeverityminor 
Status closedResolutionfixed 
Product Version2.50.x 
Target Version2.50.x 
Summary10090: Some older commits are lost at LS 2.5
Description

Louis, please merge these older commits: https://github.com/LimeSurvey/LimeSurvey/commit/f094eed6806c570404a5574f8367590f19de2901 and https://github.com/LimeSurvey/LimeSurvey/commit/b9536e41ad325ddc9e697325f78b2bc60cb350b4

Please also check what else got lost on the way since I have no idea how that happened and what else we might have lost during previous merges.

TagsNo tags attached.
Bug heat6
Complete LimeSurvey version number (& build)151208
I will donate to the project if issue is resolvedNo
Browser
Database type & versionMySQL
Server OS (if known)Linux
Webserver software & version (if known)Apache
PHP Version5.3.x

Users monitoring this issue

There are no users monitoring this issue.

Activities

DenisChenu

DenisChenu

2015-12-08 13:44

developer   ~33741

Think there are a lot of bug (not feature) was not merged in actual 2.5.

We have to list whole ?
LouisGac

LouisGac

2015-12-22 10:30

developer   ~34084

Fix committed to 2.5 branch: http://bugs.limesurvey.org/plugin.php?page=Source/view&id=16684
LouisGac

LouisGac

2015-12-22 12:59

developer   ~34085

I just did a full manual merge with 2.06 :

https://github.com/LimeSurvey/LimeSurvey/commit/f98a5adb5da1acdd24b83584aa110b99cb547ae4

https://github.com/LimeSurvey/LimeSurvey/commit/5e8182158813b1196424a78d65284082d0cf2e85

https://github.com/LimeSurvey/LimeSurvey/commit/713016abe5256d99904ca56c4bd22b73125d46bb

https://github.com/LimeSurvey/LimeSurvey/commit/348dbc90fa7d3a71221df8d77e4cc91a6798c581

https://github.com/LimeSurvey/LimeSurvey/commit/7d5414ae6086a2cb439de1b68702ad191bf42a8e

https://github.com/LimeSurvey/LimeSurvey/commit/1bfb907dd322848fd774fe212508ca4cacd66bf7

https://github.com/LimeSurvey/LimeSurvey/commit/83a41a99c42c2a36ddd61ea1959a655472c01817

https://github.com/LimeSurvey/LimeSurvey/commit/9485ef81adb82f1c72a601c3b3f09fb6e99f7f56

https://github.com/LimeSurvey/LimeSurvey/commit/24df982e28fcef5af3b8758fd439595ad2e922e0

https://github.com/LimeSurvey/LimeSurvey/commit/67bcee094b210ec8dc8370c8ca412a66b4d97501

https://github.com/LimeSurvey/LimeSurvey/commit/e4b522e0f3f28541b6e40d9cb4b198d99d3865e5

https://github.com/LimeSurvey/LimeSurvey/commit/4af3da14fba6e42a82125d9006573a4214300dbc
c_schmitz

c_schmitz

2016-01-08 15:36

administrator   ~34202

Version 2.5RC6 released

Related Changesets

LimeSurvey: 2.5 f98a5adb

2015-12-22 10:30

LouisGac


Details Diff		 Fixed issue 10090: restored mazi merges Affected Issues
10090
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/views/admin/survey/surveySummary_view.php Diff File

Issue History

Date Modified Username Field Change
2015-12-08 13:23 Mazi New Issue
2015-12-08 13:23 Mazi Status new => assigned
2015-12-08 13:23 Mazi Assigned To => LouisGac
2015-12-08 13:44 DenisChenu Note Added: 33741
2015-12-21 17:20 LouisGac Status assigned => confirmed
2015-12-22 10:30 LouisGac Changeset attached => LimeSurvey 2.5 f98a5adb
2015-12-22 10:30 LouisGac Note Added: 34084
2015-12-22 10:30 LouisGac Resolution open => fixed
2015-12-22 10:31 LouisGac Status confirmed => resolved
2015-12-22 12:59 LouisGac Note Added: 34085
2016-01-08 15:36 c_schmitz Note Added: 34202
2016-01-08 15:36 c_schmitz Status resolved => closed
2019-11-01 17:25 c_schmitz Category Survey design => Survey editing