Hauke Schade
736094a1eb
[sailfish] images as resources, new images for special feeds
2014-10-26 19:15:16 +01:00
Hauke Schade
16e93b19d2
Merge branch 'js-cleanup' of git://github.com/michael-k/ttrss into michael-k-js-cleanup
...
Conflicts:
qml/ttrss/sailfish/pages/Feeds.qml
2014-10-26 18:20:05 +01:00
Hauke Schade
f7028db67a
fix for undefined notes
2014-10-26 18:04:01 +01:00
Hauke Schade
cfa0d2491c
Merge branch 'notes' of git://github.com/michael-k/ttrss into michael-k-notes
2014-10-26 17:46:59 +01:00
Hauke Schade
e99bd35c13
Merge branch 'michael-k-0.4.x-fix'
2014-10-26 17:43:41 +01:00
Hauke Schade
17cdeaee0d
Merge branch 'michael-k-ico'
2014-10-26 17:35:44 +01:00
Hauke Schade
52f6ef18be
Merge branch 'mardy-qt5'
2014-10-26 17:33:22 +01:00
Hauke Schade
3604b5d06f
Merge branch 'qt5' of git://github.com/mardy/ttrss into mardy-qt5
2014-10-26 17:32:39 +01:00
Hauke Schade
88d75f67bc
Merge branch 'v0.4.x'
2014-10-26 17:32:18 +01:00
Michael Käufl
ebe05a0516
[sailfish] Bugfix: Feeds.qml lost category after adding a new feed
...
Closes #114 (on sailfish)
2014-10-26 14:23:19 +01:00
Michael Käufl
f76cc0bd83
[sailfish] Fixed typo
...
Is everywhere else.
2014-10-26 14:23:06 +01:00
Michael Käufl
6d27e3fde5
[sailfish] Fixed overlapping of Label with Bubble
...
The width was 3*Theme.paddingMedium (or 2*Theme.paddingMedium without
an icon) to big. Correct calculation:
width: parent.width - anchors.margins
- (icon.visible ? (icon.width + icon.anchors.margins) : 0)
- bubble.width - bubble.anchors.margins
- Theme.paddingMedium
Details:
• anchors.margins
Padding to anchors.left of Label
• icon.anchors.margins
Padding between Icon and ListItem
• bubble.anchors.margins
Padding between Bubble and ListItem
• Theme.paddingMedium
Padding between Label and Bubble
This commit simplifies the code.
2014-10-26 14:22:48 +01:00
Hauke Schade
ed646329bd
Merge branch '0.4.x-fix' of git://github.com/michael-k/ttrss into michael-k-0.4.x-fix
2014-10-26 14:19:52 +01:00
Michael Käufl
5eb1adce67
[sailfish] Bugfix: Feeds.qml lost category after adding a new feed
...
Closes #114 (on sailfish)
2014-10-24 19:31:11 +02:00
Hauke Schade
b701b8f495
Merge pull request #118 from cnlpete/v0.5.x
...
V0.5.x
2014-10-24 08:42:10 +02:00
Michael Käufl
4ab39bd5c0
[sailfish] Added basic support for notes
...
Notes are displayed; Optional in item list
Regards #106
2014-10-23 15:07:09 +02:00
Michael Käufl
cf7ac8206f
Adjusted callbacks of updateFeedStar(), -RSS(), and -Unread()
2014-10-23 13:49:30 +02:00
Michael Käufl
1cdd570d5b
Unified process_X() functions
...
Eliminates a bunch of duplicate code.
2014-10-23 13:15:49 +02:00
Alberto Mardegan
73bafabb59
Update .gitignore
2014-10-22 23:51:33 -04:00
Alberto Mardegan
0a82b42f5a
Improve Qt5 support
...
Make the source code compatible with Qt5.
2014-10-22 23:51:29 -04:00
Michael Käufl
05cdc4c8dc
Changed ordering of tinytinyrss.js and documented it
...
The ordering in this file is as follows:
1. Variables
2. Functions without any network traffic
3. Functions with network traffic (beginning with login())
2014-10-23 01:45:55 +02:00
Michael Käufl
7844f8ee76
Annotated private functions
2014-10-23 01:45:55 +02:00
Michael Käufl
6b97093eec
Adjusted callback of unsubscribe()
2014-10-23 01:45:55 +02:00
Michael Käufl
787bbd0de0
Documented subscribe()
2014-10-23 00:55:51 +02:00
Michael Käufl
259e2fb14a
Adjusted callback of catchUp()
2014-10-23 00:55:51 +02:00
Michael Käufl
e25690dcec
Adjusted callback of updateFeedItems()
2014-10-23 00:55:51 +02:00
Michael Käufl
5147124d33
Adjusted callback of updateFeeds()
2014-10-23 00:55:51 +02:00
Michael Käufl
9609087dd8
Added more function documentation
2014-10-23 00:55:51 +02:00
Michael Käufl
3d1df4de46
[sailfish] Renamed FeedModel in rootWindow
2014-10-23 00:55:51 +02:00
Michael Käufl
a2a9c573f1
[sailfish] Renamed FeedItemModel in rootWindow
2014-10-23 00:55:51 +02:00
Michael Käufl
b9a432bd24
[sailfish] Renamed CategoryModel in rootWindow
2014-10-23 00:55:51 +02:00
Michael Käufl
a968623457
Adjusted callback of updateCategories()
2014-10-23 00:55:51 +02:00
Michael Käufl
542931d526
Worked through login process
2014-10-23 00:36:59 +02:00
Michael Käufl
b980f9112e
[Refactoring] Extracted functions
2014-10-23 00:36:59 +02:00
Michael Käufl
6b4603f534
Support ico image type in emulator
2014-10-22 22:28:56 +02:00
Michael Käufl
57fdfdf158
Added missing callbacks
2014-10-21 22:53:01 +02:00
Michael Käufl
04f5e3991a
Removed unused function getFeedItem()
...
Was introduced in commit e9cdfeaf84 and
is unused since commit 6877b6bbf6 .
2014-10-21 22:33:45 +02:00
Michael Käufl
4849ef9665
Started documenting javascript functions
2014-10-21 22:33:45 +02:00
Michael Käufl
82f7d522be
Moved categorySort() and dateSort() and annotated them as private
2014-10-21 21:58:49 +02:00
Michael Käufl
3def17f8fd
Removed unused function dateSortInverse()
...
Was introduced in commit 8de0de11fd and
is unused since commit 178fccaeea .
2014-10-21 21:53:21 +02:00
Michael Käufl
89fa77b9d2
Removed unused function isEmpty()
...
Was introduced in commit 49875713dc and
is unused since commit f6d004f7eb .
2014-10-21 21:34:37 +02:00
Michael Käufl
c2420ce140
Added missing callback
2014-10-21 19:03:16 +02:00
Michael Käufl
847387c3c6
Removed unused code
2014-10-21 19:00:32 +02:00
Michael Käufl
c74a25a82e
Renamed updateConfig() to getConfig()
2014-10-21 19:00:32 +02:00
Michael Käufl
4638185571
Code style: whitespace
2014-10-21 19:00:32 +02:00
Michael Käufl
92525ee055
Switch from clearState() to initState()
2014-10-21 19:00:32 +02:00
Michael Käufl
0903fa067c
Removed unused requestsPending['token']
2014-10-21 19:00:21 +02:00
Michael Käufl
6b6eb745e3
Removed unused code
2014-10-21 17:01:25 +02:00
Michael Käufl
8d17fd6997
[Refactoring] JS code style
2014-10-21 17:01:25 +02:00
Michael Käufl
7f2fadf112
[sailfish] Fixed typo
...
Is everywhere else.
2014-10-21 16:40:58 +02:00