Ubuntu Shorts App

Merge lp:~qqworini/ubuntu-rssreader-app/uitk-1_3 into lp:ubuntu-rssreader-app

  1. uitk-1_3
  2. Merge into reboot
Proposed by Joey Chan
Status: Merged
Approved by: Roman Shchekin
Approved revision: 410
Merged at revision: 410
Proposed branch: lp:~qqworini/ubuntu-rssreader-app/uitk-1_3
Merge into: lp:ubuntu-rssreader-app
Diff against target: 589 lines (+105/-97)
29 files modified
manifest.json.in (+1/-1)
shorts.apparmor (+1/-1)
shorts/po/com.ubuntu.shorts.pot (+38/-30)
shorts/qml/components/ArticleViewItem.qml (+3/-3)
shorts/qml/components/BottomEdgeTabs.qml (+1/-1)
shorts/qml/components/FakeHeader.qml (+1/-1)
shorts/qml/components/GridModeItem.qml (+3/-3)
shorts/qml/components/ListModeItem.qml (+3/-3)
shorts/qml/components/NetworkManager.qml (+3/-3)
shorts/qml/components/OrganicGrid.qml (+1/-1)
shorts/qml/components/ReadingOptions.qml (+3/-3)
shorts/qml/content/SharePage.qml (+1/-1)
shorts/qml/delegates/ArticleFullImg.qml (+2/-2)
shorts/qml/delegates/ArticleOneImgA.qml (+2/-2)
shorts/qml/delegates/ArticleTextA.qml (+2/-2)
shorts/qml/delegates/ArticleTextB.qml (+2/-2)
shorts/qml/pages/AppendFeedPage.qml (+3/-3)
shorts/qml/pages/ArticleViewPage.qml (+3/-3)
shorts/qml/pages/ChooseTopicPage.qml (+3/-3)
shorts/qml/pages/CreateTopicPage.qml (+3/-3)
shorts/qml/pages/EditFeedPage.qml (+5/-5)
shorts/qml/pages/FeedComponent.qml (+1/-1)
shorts/qml/pages/TopicComponent.qml (+2/-2)
shorts/qml/pages/TopicManagement.qml (+3/-3)
shorts/qml/shorts-app.qml (+3/-3)
shorts/qml/tabs/BaseTab.qml (+3/-3)
shorts/qml/tabs/SavedTab.qml (+3/-3)
shorts/qml/tabs/ShortsTab.qml (+3/-3)
shorts/qml/tabs/TopicTab.qml (+3/-3)
To merge this branch: bzr merge lp:~qqworini/ubuntu-rssreader-app/uitk-1_3
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Roman Shchekin Needs Fixing
Review via email: mp+275620@code.launchpad.net

Commit message

migrate to UITK 1.3

Description of the change

migrate to UITK 1.3

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:410
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/3/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/53/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/3/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Roman Shchekin (mrqtros) wrote :

Please see inline comments!

Revision history for this message
Roman Shchekin (mrqtros) wrote :

Misslicked on "Approve", but you should fix some staff :)

review: Needs Fixing
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:410
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/344/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/72/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-vivid-amd64-ci/69/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/344/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-autolanding/200/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-autolanding/52/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-vivid-amd64-autolanding/22/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:410
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/8/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/134/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/8/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'manifest.json.in'
--- manifest.json.in 2015-07-17 14:42:42 +0000
+++ manifest.json.in 2015-10-24 07:10:31 +0000
@@ -1,7 +1,7 @@
1{1{
2 "architecture": "@CLICK_ARCH@",2 "architecture": "@CLICK_ARCH@",
3 "description": "Rss Reader application",3 "description": "Rss Reader application",
4 "framework": "ubuntu-sdk-15.04",4 "framework": "ubuntu-sdk-15.04.1-qml",
5 "hooks": {5 "hooks": {
6 "shorts": {6 "shorts": {
7 "apparmor": "shorts.apparmor",7 "apparmor": "shorts.apparmor",
88
=== modified file 'shorts.apparmor'
--- shorts.apparmor 2015-07-04 08:38:18 +0000
+++ shorts.apparmor 2015-10-24 07:10:31 +0000
@@ -4,4 +4,4 @@
4 "content_exchange_source"4 "content_exchange_source"
5 ],5 ],
6 "policy_version": 1.36 "policy_version": 1.3
7}
8\ No newline at end of file7\ No newline at end of file
8}
99
=== modified file 'shorts/po/com.ubuntu.shorts.pot'
--- shorts/po/com.ubuntu.shorts.pot 2015-08-11 12:07:22 +0000
+++ shorts/po/com.ubuntu.shorts.pot 2015-10-24 07:10:31 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2015-08-11 20:00+0800\n"11"POT-Creation-Date: 2015-10-23 22:15+0800\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,32 +18,32 @@
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
2020
21#: ../qml/components/ArticleViewItem.qml:12221#: ../qml/components/ArticleViewItem.qml:120
22msgid "Select article"22msgid "Select article"
23msgstr ""23msgstr ""
2424
25#: ../qml/components/ReadingOptions.qml:4025#: ../qml/components/ReadingOptions.qml:39
26msgid "Dark"26msgid "Dark"
27msgstr ""27msgstr ""
2828
29#: ../qml/components/ReadingOptions.qml:5029#: ../qml/components/ReadingOptions.qml:46
30msgid "Light"30msgid "Light"
31msgstr ""31msgstr ""
3232
33#: ../qml/components/ReadingOptions.qml:10733#: ../qml/components/ReadingOptions.qml:96
34msgid "Small"34msgid "Small"
35msgstr ""35msgstr ""
3636
37#: ../qml/components/ReadingOptions.qml:10937#: ../qml/components/ReadingOptions.qml:98
38msgid "Mid"38msgid "Normal"
39msgstr ""39msgstr ""
4040
41#: ../qml/components/ReadingOptions.qml:11041#: ../qml/components/ReadingOptions.qml:99
42msgid "Large"42msgid "Large"
43msgstr ""43msgstr ""
4444
45#: ../qml/pages/AppendFeedPage.qml:31 ../qml/shorts-app.qml:23445#: ../qml/pages/AppendFeedPage.qml:31 ../qml/shorts-app.qml:243
46#: ../qml/shorts-app.qml:36946#: ../qml/shorts-app.qml:378
47msgid "Add feeds"47msgid "Add feeds"
48msgstr ""48msgstr ""
4949
@@ -63,28 +63,28 @@
63msgid "Type a keyword or URL"63msgid "Type a keyword or URL"
64msgstr ""64msgstr ""
6565
66#: ../qml/pages/AppendFeedPage.qml:18766#: ../qml/pages/AppendFeedPage.qml:185
67msgid "Search results"67msgid "Search results"
68msgstr ""68msgstr ""
6969
70#: ../qml/pages/AppendFeedPage.qml:245 ../qml/pages/CreateTopicPage.qml:3870#: ../qml/pages/AppendFeedPage.qml:243 ../qml/pages/CreateTopicPage.qml:38
71#: ../qml/pages/TopicManagement.qml:239 ../qml/shorts-app.qml:44771#: ../qml/pages/TopicManagement.qml:239 ../qml/shorts-app.qml:456
72msgid "Cancel"72msgid "Cancel"
73msgstr ""73msgstr ""
7474
75#: ../qml/pages/AppendFeedPage.qml:27875#: ../qml/pages/AppendFeedPage.qml:276
76msgid "Next"76msgid "Next"
77msgstr ""77msgstr ""
7878
79#: ../qml/pages/AppendFeedPage.qml:307 ../qml/pages/CreateTopicPage.qml:18179#: ../qml/pages/AppendFeedPage.qml:305 ../qml/pages/CreateTopicPage.qml:181
80msgid "No feeds"80msgid "No feeds"
81msgstr ""81msgstr ""
8282
83#: ../qml/pages/ArticleViewPage.qml:4483#: ../qml/pages/ArticleViewPage.qml:47
84msgid "Save"84msgid "Save"
85msgstr ""85msgstr ""
8686
87#: ../qml/pages/ArticleViewPage.qml:4487#: ../qml/pages/ArticleViewPage.qml:47
88msgid "Remove"88msgid "Remove"
89msgstr ""89msgstr ""
9090
@@ -161,7 +161,7 @@
161msgid "Topic: "161msgid "Topic: "
162msgstr ""162msgstr ""
163163
164#: ../qml/pages/TopicManagement.qml:13 ../qml/shorts-app.qml:218164#: ../qml/pages/TopicManagement.qml:13 ../qml/shorts-app.qml:217
165msgid "Edit topics"165msgid "Edit topics"
166msgstr ""166msgstr ""
167167
@@ -185,51 +185,59 @@
185msgid "List view"185msgid "List view"
186msgstr ""186msgstr ""
187187
188#: ../qml/shorts-app.qml:300188#: ../qml/shorts-app.qml:227
189msgid "Disable night mode"
190msgstr ""
191
192#: ../qml/shorts-app.qml:227
193msgid "Enable night mode"
194msgstr ""
195
196#: ../qml/shorts-app.qml:309
189msgid "Saved"197msgid "Saved"
190msgstr ""198msgstr ""
191199
192#: ../qml/shorts-app.qml:308 shorts.desktop.in.in.h:1200#: ../qml/shorts-app.qml:317 shorts.desktop.in.in.h:1
193msgid "Shorts"201msgid "Shorts"
194msgstr ""202msgstr ""
195203
196#: ../qml/shorts-app.qml:439204#: ../qml/shorts-app.qml:448
197msgid "Checking for new articles"205msgid "Checking for new articles"
198msgstr ""206msgstr ""
199207
200#: ../qml/shorts-app.qml:463208#: ../qml/shorts-app.qml:472
201msgid "Perhaps some of the channels have not been updated."209msgid "Perhaps some of the channels have not been updated."
202msgstr ""210msgstr ""
203211
204#: ../qml/shorts-app.qml:464212#: ../qml/shorts-app.qml:473
205msgid "Errors occurred during the update"213msgid "Errors occurred during the update"
206msgstr ""214msgstr ""
207215
208#: ../qml/shorts-app.qml:482216#: ../qml/shorts-app.qml:491
209msgid "+ Add feeds"217msgid "+ Add feeds"
210msgstr ""218msgstr ""
211219
212#: ../qml/shorts-app.qml:494220#: ../qml/shorts-app.qml:503
213msgid "Add online accounts"221msgid "Add online accounts"
214msgstr ""222msgstr ""
215223
216#: ../qml/shorts-app.qml:497224#: ../qml/shorts-app.qml:506
217msgid "Online accounts are not available for now"225msgid "Online accounts are not available for now"
218msgstr ""226msgstr ""
219227
220#: ../qml/shorts-app.qml:498 ../qml/shorts-app.qml:507228#: ../qml/shorts-app.qml:507 ../qml/shorts-app.qml:516
221msgid "We are sorry"229msgid "We are sorry"
222msgstr ""230msgstr ""
223231
224#: ../qml/shorts-app.qml:503232#: ../qml/shorts-app.qml:512
225msgid "Import subscriptions"233msgid "Import subscriptions"
226msgstr ""234msgstr ""
227235
228#: ../qml/shorts-app.qml:506236#: ../qml/shorts-app.qml:515
229msgid "Importing subscriptions is not available for now"237msgid "Importing subscriptions is not available for now"
230msgstr ""238msgstr ""
231239
232#: ../qml/shorts-app.qml:521240#: ../qml/shorts-app.qml:530
233msgid "Ok"241msgid "Ok"
234msgstr ""242msgstr ""
235243
236244
=== modified file 'shorts/qml/components/ArticleViewItem.qml'
--- shorts/qml/components/ArticleViewItem.qml 2015-10-10 11:24:04 +0000
+++ shorts/qml/components/ArticleViewItem.qml 2015-10-24 07:10:31 +0000
@@ -8,9 +8,9 @@
88
9import QtQuick 2.49import QtQuick 2.4
10import QtQuick.XmlListModel 2.010import QtQuick.XmlListModel 2.0
11import Ubuntu.Components 1.211import Ubuntu.Components 1.3
12import Ubuntu.Components.ListItems 1.0 as ListItem12import Ubuntu.Components.ListItems 1.3 as ListItem
13import Ubuntu.Components.Popups 1.013import Ubuntu.Components.Popups 1.3
1414
15import "../utils/dateutils.js" as DateUtils15import "../utils/dateutils.js" as DateUtils
16import "../utils/databasemodule_v2.js" as DB16import "../utils/databasemodule_v2.js" as DB
1717
=== modified file 'shorts/qml/components/BottomEdgeTabs.qml'
--- shorts/qml/components/BottomEdgeTabs.qml 2015-07-04 08:38:18 +0000
+++ shorts/qml/components/BottomEdgeTabs.qml 2015-10-24 07:10:31 +0000
@@ -73,7 +73,7 @@
73*/73*/
7474
75import QtQuick 2.475import QtQuick 2.4
76import Ubuntu.Components 1.276import Ubuntu.Components 1.3
7777
78Tabs {78Tabs {
79 id: page79 id: page
8080
=== modified file 'shorts/qml/components/FakeHeader.qml'
--- shorts/qml/components/FakeHeader.qml 2015-07-04 08:38:18 +0000
+++ shorts/qml/components/FakeHeader.qml 2015-10-24 07:10:31 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Column {22Column {
23 id: fakeHeader23 id: fakeHeader
2424
=== modified file 'shorts/qml/components/GridModeItem.qml'
--- shorts/qml/components/GridModeItem.qml 2015-07-04 08:38:18 +0000
+++ shorts/qml/components/GridModeItem.qml 2015-10-24 07:10:31 +0000
@@ -1,7 +1,7 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.3
55
6Item {6Item {
7 id: gridPage7 id: gridPage
88
=== modified file 'shorts/qml/components/ListModeItem.qml'
--- shorts/qml/components/ListModeItem.qml 2015-10-10 11:24:04 +0000
+++ shorts/qml/components/ListModeItem.qml 2015-10-24 07:10:31 +0000
@@ -1,7 +1,7 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItems3import Ubuntu.Components.ListItems 1.3 as ListItems
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.3
55
6import "../utils/dateutils.js" as DateUtils6import "../utils/dateutils.js" as DateUtils
77
88
=== modified file 'shorts/qml/components/NetworkManager.qml'
--- shorts/qml/components/NetworkManager.qml 2015-07-04 08:38:18 +0000
+++ shorts/qml/components/NetworkManager.qml 2015-10-24 07:10:31 +0000
@@ -1,9 +1,9 @@
1import QtQuick 2.41import QtQuick 2.4
2import QtQuick.XmlListModel 2.02import QtQuick.XmlListModel 2.0
33
4import Ubuntu.Components 1.24import Ubuntu.Components 1.3
5import Ubuntu.Components.ListItems 1.0 as ListItems5import Ubuntu.Components.ListItems 1.3 as ListItems
6import Ubuntu.Components.Popups 1.06import Ubuntu.Components.Popups 1.3
77
8import "../utils/databasemodule_v2.js" as DB8import "../utils/databasemodule_v2.js" as DB
9import "../utils/imgSeparator.js" as ImageUtils9import "../utils/imgSeparator.js" as ImageUtils
1010
=== modified file 'shorts/qml/components/OrganicGrid.qml'
--- shorts/qml/components/OrganicGrid.qml 2015-10-10 11:24:04 +0000
+++ shorts/qml/components/OrganicGrid.qml 2015-10-24 07:10:31 +0000
@@ -1,6 +1,6 @@
1import QtQuick 2.41import QtQuick 2.4
2import QtGraphicalEffects 1.02import QtGraphicalEffects 1.0
3import Ubuntu.Components 1.23import Ubuntu.Components 1.3
44
5Item {5Item {
6 id: organicGridRoot6 id: organicGridRoot
77
=== modified file 'shorts/qml/components/ReadingOptions.qml'
--- shorts/qml/components/ReadingOptions.qml 2015-10-10 11:24:04 +0000
+++ shorts/qml/components/ReadingOptions.qml 2015-10-24 07:10:31 +0000
@@ -8,9 +8,9 @@
88
9import QtQuick 2.49import QtQuick 2.4
10import QtQuick.XmlListModel 2.010import QtQuick.XmlListModel 2.0
11import Ubuntu.Components 1.211import Ubuntu.Components 1.3
12import Ubuntu.Components.ListItems 1.0 as ListItem12import Ubuntu.Components.ListItems 1.3 as ListItem
13import Ubuntu.Components.Popups 1.013import Ubuntu.Components.Popups 1.3
1414
15Popover {15Popover {
16 id: readingOptionsPopover16 id: readingOptionsPopover
1717
=== modified file 'shorts/qml/content/SharePage.qml'
--- shorts/qml/content/SharePage.qml 2015-07-04 08:38:18 +0000
+++ shorts/qml/content/SharePage.qml 2015-10-24 07:10:31 +0000
@@ -1,5 +1,5 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Content 1.13import Ubuntu.Content 1.1
44
5Page {5Page {
66
=== modified file 'shorts/qml/delegates/ArticleFullImg.qml'
--- shorts/qml/delegates/ArticleFullImg.qml 2015-10-10 11:24:04 +0000
+++ shorts/qml/delegates/ArticleFullImg.qml 2015-10-24 07:10:31 +0000
@@ -1,6 +1,6 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
44
5import "../utils/dateutils.js" as DateUtils5import "../utils/dateutils.js" as DateUtils
66
77
=== modified file 'shorts/qml/delegates/ArticleOneImgA.qml'
--- shorts/qml/delegates/ArticleOneImgA.qml 2015-10-10 11:24:04 +0000
+++ shorts/qml/delegates/ArticleOneImgA.qml 2015-10-24 07:10:31 +0000
@@ -1,6 +1,6 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
44
5import "../utils/dateutils.js" as DateUtils5import "../utils/dateutils.js" as DateUtils
66
77
=== modified file 'shorts/qml/delegates/ArticleTextA.qml'
--- shorts/qml/delegates/ArticleTextA.qml 2015-10-10 11:24:04 +0000
+++ shorts/qml/delegates/ArticleTextA.qml 2015-10-24 07:10:31 +0000
@@ -1,6 +1,6 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
44
5import "../utils/dateutils.js" as DateUtils5import "../utils/dateutils.js" as DateUtils
66
77
=== modified file 'shorts/qml/delegates/ArticleTextB.qml'
--- shorts/qml/delegates/ArticleTextB.qml 2015-10-10 11:24:04 +0000
+++ shorts/qml/delegates/ArticleTextB.qml 2015-10-24 07:10:31 +0000
@@ -1,6 +1,6 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
44
5import "../utils/dateutils.js" as DateUtils5import "../utils/dateutils.js" as DateUtils
66
77
=== modified file 'shorts/qml/pages/AppendFeedPage.qml'
--- shorts/qml/pages/AppendFeedPage.qml 2015-10-10 11:24:04 +0000
+++ shorts/qml/pages/AppendFeedPage.qml 2015-10-24 07:10:31 +0000
@@ -16,9 +16,9 @@
1616
17import QtQuick 2.417import QtQuick 2.4
18import QtQuick.XmlListModel 2.018import QtQuick.XmlListModel 2.0
19import Ubuntu.Components 1.219import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 1.0 as ListItem20import Ubuntu.Components.ListItems 1.3 as ListItem
21import Ubuntu.Components.Popups 1.021import Ubuntu.Components.Popups 1.3
2222
23import "../components"23import "../components"
24import "../utils/databasemodule_v2.js" as DB24import "../utils/databasemodule_v2.js" as DB
2525
=== modified file 'shorts/qml/pages/ArticleViewPage.qml'
--- shorts/qml/pages/ArticleViewPage.qml 2015-10-10 11:24:04 +0000
+++ shorts/qml/pages/ArticleViewPage.qml 2015-10-24 07:10:31 +0000
@@ -8,9 +8,9 @@
88
9import QtQuick 2.49import QtQuick 2.4
10import QtQuick.XmlListModel 2.010import QtQuick.XmlListModel 2.0
11import Ubuntu.Components 1.211import Ubuntu.Components 1.3
12import Ubuntu.Components.ListItems 1.0 as ListItem12import Ubuntu.Components.ListItems 1.3 as ListItem
13import Ubuntu.Components.Popups 1.013import Ubuntu.Components.Popups 1.3
1414
15import "../components"15import "../components"
16import "../utils/dateutils.js" as DateUtils16import "../utils/dateutils.js" as DateUtils
1717
=== modified file 'shorts/qml/pages/ChooseTopicPage.qml'
--- shorts/qml/pages/ChooseTopicPage.qml 2015-07-04 08:38:18 +0000
+++ shorts/qml/pages/ChooseTopicPage.qml 2015-10-24 07:10:31 +0000
@@ -1,8 +1,8 @@
1import QtQuick 2.41import QtQuick 2.4
2import QtQuick.XmlListModel 2.02import QtQuick.XmlListModel 2.0
3import Ubuntu.Components 1.23import Ubuntu.Components 1.3
4import Ubuntu.Components.ListItems 1.0 as ListItem4import Ubuntu.Components.ListItems 1.3 as ListItem
5import Ubuntu.Components.Popups 1.05import Ubuntu.Components.Popups 1.3
66
7import "../utils/databasemodule_v2.js" as DB7import "../utils/databasemodule_v2.js" as DB
88
99
=== modified file 'shorts/qml/pages/CreateTopicPage.qml'
--- shorts/qml/pages/CreateTopicPage.qml 2015-07-04 08:38:18 +0000
+++ shorts/qml/pages/CreateTopicPage.qml 2015-10-24 07:10:31 +0000
@@ -1,8 +1,8 @@
1import QtQuick 2.41import QtQuick 2.4
2import QtQuick.XmlListModel 2.02import QtQuick.XmlListModel 2.0
3import Ubuntu.Components 1.23import Ubuntu.Components 1.3
4import Ubuntu.Components.ListItems 1.0 as ListItem4import Ubuntu.Components.ListItems 1.3 as ListItem
5import Ubuntu.Components.Popups 1.05import Ubuntu.Components.Popups 1.3
66
7import "../utils/databasemodule_v2.js" as DB7import "../utils/databasemodule_v2.js" as DB
88
99
=== modified file 'shorts/qml/pages/EditFeedPage.qml'
--- shorts/qml/pages/EditFeedPage.qml 2015-07-04 08:38:18 +0000
+++ shorts/qml/pages/EditFeedPage.qml 2015-10-24 07:10:31 +0000
@@ -1,7 +1,7 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.3
5import Ubuntu.Layouts 1.05import Ubuntu.Layouts 1.0
66
7import "../utils/databasemodule_v2.js" as DB7import "../utils/databasemodule_v2.js" as DB
@@ -11,7 +11,7 @@
11 objectName: "editfeedpage"11 objectName: "editfeedpage"
12 title: i18n.tr("Edit Feed")12 title: i18n.tr("Edit Feed")
13 flickable: null/*content*/13 flickable: null/*content*/
14 tools: null14// tools: null
1515
16 head.actions: [16 head.actions: [
17 Action {17 Action {
@@ -68,7 +68,7 @@
68 }68 }
6969
70 function reloadPageContent() {70 function reloadPageContent() {
71 editPage.tools = toolbar71// editPage.tools = toolbar
72 }72 }
7373
74 Flickable {74 Flickable {
7575
=== modified file 'shorts/qml/pages/FeedComponent.qml'
--- shorts/qml/pages/FeedComponent.qml 2015-07-21 19:42:29 +0000
+++ shorts/qml/pages/FeedComponent.qml 2015-10-24 07:10:31 +0000
@@ -1,5 +1,5 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import "../utils/databasemodule_v2.js" as DB3import "../utils/databasemodule_v2.js" as DB
44
5ListItem {5ListItem {
66
=== modified file 'shorts/qml/pages/TopicComponent.qml'
--- shorts/qml/pages/TopicComponent.qml 2015-10-10 11:24:04 +0000
+++ shorts/qml/pages/TopicComponent.qml 2015-10-24 07:10:31 +0000
@@ -1,6 +1,6 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItems3import Ubuntu.Components.ListItems 1.3 as ListItems
44
5import "../utils/databasemodule_v2.js" as DB5import "../utils/databasemodule_v2.js" as DB
66
77
=== modified file 'shorts/qml/pages/TopicManagement.qml'
--- shorts/qml/pages/TopicManagement.qml 2015-07-21 19:42:29 +0000
+++ shorts/qml/pages/TopicManagement.qml 2015-10-24 07:10:31 +0000
@@ -1,7 +1,7 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.3
5import Ubuntu.Layouts 1.05import Ubuntu.Layouts 1.0
66
7import "../utils/databasemodule_v2.js" as DB7import "../utils/databasemodule_v2.js" as DB
88
=== modified file 'shorts/qml/shorts-app.qml'
--- shorts/qml/shorts-app.qml 2015-10-10 11:24:04 +0000
+++ shorts/qml/shorts-app.qml 2015-10-24 07:10:31 +0000
@@ -1,7 +1,7 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.3
55
6import "./pages"6import "./pages"
7import "./tabs"7import "./tabs"
88
=== modified file 'shorts/qml/tabs/BaseTab.qml'
--- shorts/qml/tabs/BaseTab.qml 2015-07-04 08:38:18 +0000
+++ shorts/qml/tabs/BaseTab.qml 2015-10-24 07:10:31 +0000
@@ -1,7 +1,7 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.3
55
6import "../components"6import "../components"
7import "../utils/databasemodule_v2.js" as DB7import "../utils/databasemodule_v2.js" as DB
88
=== modified file 'shorts/qml/tabs/SavedTab.qml'
--- shorts/qml/tabs/SavedTab.qml 2015-07-04 08:38:18 +0000
+++ shorts/qml/tabs/SavedTab.qml 2015-10-24 07:10:31 +0000
@@ -1,7 +1,7 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.3
55
6import "../utils/databasemodule_v2.js" as DB6import "../utils/databasemodule_v2.js" as DB
77
88
=== modified file 'shorts/qml/tabs/ShortsTab.qml'
--- shorts/qml/tabs/ShortsTab.qml 2015-07-04 08:38:18 +0000
+++ shorts/qml/tabs/ShortsTab.qml 2015-10-24 07:10:31 +0000
@@ -1,7 +1,7 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.3
55
6import "../utils/databasemodule_v2.js" as DB6import "../utils/databasemodule_v2.js" as DB
77
88
=== modified file 'shorts/qml/tabs/TopicTab.qml'
--- shorts/qml/tabs/TopicTab.qml 2015-07-04 08:38:18 +0000
+++ shorts/qml/tabs/TopicTab.qml 2015-10-24 07:10:31 +0000
@@ -1,7 +1,7 @@
1import QtQuick 2.41import QtQuick 2.4
2import Ubuntu.Components 1.22import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
4import Ubuntu.Components.Popups 1.04import Ubuntu.Components.Popups 1.3
55
6import "../utils/databasemodule_v2.js" as DB6import "../utils/databasemodule_v2.js" as DB
77

Subscribers

People subscribed via source and target branches