Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/jsDocs into lp:ubuntu-ui-toolkit/staging
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/jsDocs | ||||
| Merge into: | lp:ubuntu-ui-toolkit/staging | ||||
| Diff against target: |
615 lines (+476/-10) 10 files modified
components.api (+5/-5) documentation/ubuntu-ui-toolkit-common.qdocconf (+2/-1) modules/Ubuntu/Components/1.2/mathUtils.js (+23/-4) modules/Ubuntu/Components/1.3/colorUtils.js (+36/-0) modules/Ubuntu/Components/1.3/dateUtils.js (+145/-0) modules/Ubuntu/Components/1.3/mathUtils.js (+61/-0) modules/Ubuntu/Components/1.3/pageUtils.js (+10/-0) modules/Ubuntu/Components/1.3/scrollbarUtils.js (+141/-0) modules/Ubuntu/Components/1.3/sliderUtils.js (+48/-0) modules/Ubuntu/Components/qmldir (+5/-0) |
||||
| To merge this branch: | bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/jsDocs | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Needs Fixing on 2015-07-05 | |
| Ubuntu SDK team | 2015-07-05 | Pending | |
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-07-07.
Commit Message
Include Javascript libraries in QML documentation
Description of the Change
Note: I duplicated all Javascript files because docs don't include older API folders.
- 1548. By Zoltan Balogh on 2015-07-06
-
In the initctl test fixture, add the option to unset an environment variable. lp:~canonical-platform-qa/ubuntu-ui-toolkit/fixture_unset_env
- 1549. By Zoltan Balogh on 2015-07-06
-
Fix AlamrModel segfault when updating elements. lp:~zsombi/ubuntu-ui-toolkit/alarmmodel-segfault
- 1550. By Christian Dywan on 2015-07-07
-
Add a deprecated note to ListItems.
ThinDivider. Fixes: https:/ /bugs.launchpad .net/bugs/ 1470951. Approved by PS Jenkins bot.
- 1551. By Christian Dywan on 2015-07-17
-
Fix annotations and include popupUtils
- 1552. By Christian Dywan on 2015-07-17
-
Tweak the wording of popupUtils::open
- 1553. By Christian Dywan on 2015-07-23
-
Move Slider-/ Scrollbar-/ ColorUtils into Ambiance for 1.3
These are all internal components.
- 1554. By Christian Dywan on 2015-07-23
-
Fix types in qmldir of Ambiance theme
- 1555. By Christian Dywan on 2015-07-24
- 1556. By Christian Dywan on 2015-07-24
-
Add js files to .pro files
- 1557. By Christian Dywan on 2015-07-24
- 1558. By Christian Dywan on 2015-07-24
-
Change excluse dir in ubuntu-
ui-toolkit- common. qdocconf - 1559. By Christian Dywan on 2015-07-24
-
qdoc tweaks

FAILED: Continuous integration, rev:1548 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/1965/ jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-amd64- ci/693/ console jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-armhf- ci/695/ console jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-i386- ci/692/ console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/1965/ rebuild
http://