sfos/ttrss
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
567 commits 1 branch 0 tags 3 MiB
Commit graph

567 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hauke Schade
f5c22995fc readded resources folder (as the js files are needed) and moved the images someplace else 2014-11-02 18:53:42 +01:00
Hauke Schade
a50490a7d7 using the resource file in harmattan 2014-11-02 18:46:57 +01:00
Hauke Schade
9db33d872d [sailfish] allow landscape orientation for FeedItem view, closes #129 2014-11-02 18:44:10 +01:00
Hauke Schade
9ef6d8d796 Merge branch 'michael-k-labels' 
Conflicts:
	qml/ttrss/models/FeedItemModel.qml
 2014-11-02 18:16:31 +01:00
Hauke Schade
141bb79994 Merge branch 'labels' of git://github.com/michael-k/ttrss into michael-k-labels 
Conflicts:
	qml/ttrss/sailfish/pages/FeedItem.qml
	qml/ttrss/sailfish/pages/LabelUpdater.qml
 2014-11-02 17:45:25 +01:00
Hauke Schade
00cac761ef [harmattan] added fixme notes 2014-11-02 17:31:40 +01:00
Hauke Schade
c591811c33 Merge branch 'callbacks' of git://github.com/michael-k/ttrss into michael-k-callbacks 2014-11-02 17:24:43 +01:00
Hauke Schade
77c7923ca3 Merge pull request #128 from michael-k/cropping 
[sailfish] Fixed cropping in “All articles” feed and top Categories view
 2014-11-02 17:23:09 +01:00
Hauke Schade
6c443b850b Merge pull request #126 from michael-k/fix 
Fixed Reference Error
 2014-11-02 17:22:03 +01:00
Michael Käufl
883906776c [sailfish] Fixed cropping in CategoryDelegate 
Regards #127
 2014-11-01 19:44:40 +01:00
Michael Käufl
628b1c4054 [sailfish] Fixed cropping in “All articles” feed 
Regards #127
 2014-11-01 19:44:30 +01:00
Michael Käufl
45d0c04d0b [sailfish] Added ViewPlaceholder: hint on how to create labels 2014-10-31 22:05:47 +01:00
Michael Käufl
923fe408b1 [sailfish] Disabled label changes while network is loading 2014-10-31 22:05:40 +01:00
Michael Käufl
e22a102acb Fixed Reference Error 
Introduced by a combination of commits
b9a432bd24 and
5eb1adce67 .

Regards #114
 2014-10-31 19:53:21 +01:00
Michael Käufl
29513896f2 Added callback to togglePublished() 
Regards #119
 2014-10-30 16:19:12 +01:00
Michael Käufl
544317acf8 Added callback to toggleStar() 
Regards #119
 2014-10-30 16:19:07 +01:00
Michael Käufl
6ede751916 Added callback to toggleRead() 
Regards #119
 2014-10-30 16:18:54 +01:00
Michael Käufl
1abbd9ecc6 Cache defined labels 2014-10-29 13:51:53 +01:00
Michael Käufl
0ebe26b975 [sailfish] Added UI for assigning labels 
Closes #55
 2014-10-29 11:43:57 +01:00
Hauke Schade
8ae36d16dc whoopsie 2014-10-28 20:44:00 +01:00
Hauke Schade
79662069c1 Merge branch 'labels' of git://github.com/michael-k/ttrss into michael-k-labels 2014-10-28 19:56:22 +01:00
Michael Käufl
30b74d54c7 [sailfish] Added UI for assigning labels 
Closes #55
 2014-10-27 23:23:35 +01:00
Hauke Schade
9c8d4c93b4 [sailfish] properly load the special category on startup if wanted by user 
also indicate how this could be done for other categories.

This code needs some refactoring, as the model properly should generate the objects used as params

regards #68
 2014-10-27 21:49:59 +01:00
Hauke Schade
43c9a1990a [sailfish] added a context menu for marking all items above as read , closes #94 2014-10-27 21:09:44 +01:00
Michael Käufl
08fb54629d Added calls to API's methods getLabels() and setArticleLabel() 2014-10-27 17:09:28 +01:00
Michael Käufl
dd5eabbe1a [sailfish] Made feed item id available in FeedItem.qml 2014-10-27 16:32:46 +01:00
Michael Käufl
1e658b0e8e Changed naming of label's properties to stay close to API 2014-10-27 16:31:48 +01:00
Michael Käufl
36a2da73af Fixed QtCreator warning 2014-10-27 13:26:44 +01:00
Michael Käufl
0e01172768 [sailfish] Hide container if there are no labels 2014-10-27 13:26:44 +01:00
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