Commit graph

6250 commits

Author SHA1 Message Date
Andrew Dolgov
2bf5783f81 Merge branch 'master' of git://github.com/HeikoAdams/Tiny-Tiny-RSS into HeikoAdams-master
Conflicts:
	locale/de_DE/LC_MESSAGES/messages.mo
	locale/de_DE/LC_MESSAGES/messages.po
2013-04-02 16:55:13 +04:00
Andrew Dolgov
ed61425af0 rebase translations 2013-04-02 16:46:23 +04:00
Andrew Dolgov
9db8e60784 update pref descriptions 2013-04-02 16:46:08 +04:00
Andrew Dolgov
274272b4bc rebase translations 2013-04-02 16:38:18 +04:00
Andrew Dolgov
5f462963a0 remove blank string gettext invocations 2013-04-02 16:38:12 +04:00
Andrew Dolgov
923b5c8b11 schema: remove unused prefs help_text/short_desc/section_name 2013-04-02 16:34:08 +04:00
Andrew Dolgov
dfad9d7a36 pref-prefs: don't use schema-defined help/desc/section names 2013-04-02 16:20:43 +04:00
Andrew Dolgov
9eeb6d5e23 label_create: set default owner_uid 2013-04-02 15:42:49 +04:00
Heiko Adams
127585a05c Merge branch 'master' of https://github.com/HeikoAdams/Tiny-Tiny-RSS 2013-04-02 13:38:42 +02:00
Andrew Dolgov
f17cac6b26 retire DEFAULT_ARTICLE_LIMIT, infinite scrolling is fast enough to make it superfluous 2013-04-02 15:32:47 +04:00
Heiko Adams
58f42816c5 updated german translation 2013-04-02 13:30:53 +02:00
Andrew Dolgov
4b7726f0b4 rpc: move labelops to article 2013-04-02 14:56:08 +04:00
Andrew Dolgov
9c96a3e28c rpc: remove getArticles 2013-04-02 14:54:34 +04:00
Andrew Dolgov
c83554bddd rpc: move completeTags to article 2013-04-02 14:53:36 +04:00
Andrew Dolgov
5df8be5c0a rpc: move setArticleTags to article 2013-04-02 14:52:21 +04:00
Andrew Dolgov
195187c490 rpc: move several feed-related calls to pref-feeds 2013-04-02 14:47:43 +04:00
Andrew Dolgov
d719b06240 rpc: move setScore to article 2013-04-02 14:41:41 +04:00
Andrew Dolgov
8956b3a607 remove obsolete checkDate stuff 2013-04-02 14:36:00 +04:00
Andrew Dolgov
c88e4a2af3 remove small_article_preview 2013-04-02 14:34:17 +04:00
Andrew Dolgov
96e3ae8cce move batchAddFeeds to pref-feeds 2013-04-02 14:32:10 +04:00
Andrew Dolgov
8f2ad8e134 remove some old ?op syntax notation calls 2013-04-02 14:29:11 +04:00
Andrew Dolgov
76f2113b35 instances: fix a few wrong calls, move genHash method from rpc 2013-04-02 14:27:15 +04:00
Andrew Dolgov
c35b6d8e14 initialize session connection in ttrss_open but define session_connection in global context 2013-04-02 14:04:47 +04:00
Andrew Dolgov
168680976f sessions: initialize connection on include, not in ttrss_open 2013-04-02 13:58:08 +04:00
Andrew Dolgov
a55857db50 installer: mention lack of curl 2013-04-02 13:24:49 +04:00
Daniel Andersson
4785420034 Add hook to add explanations of hotkey actions via plugins. 2013-04-02 09:05:17 +02:00
Andrew Dolgov
8d192d025b update 'no articles in label' hint 2013-04-02 10:21:45 +04:00
Andrew Dolgov
7ff4d1fa8b af_redditimgur: insert br after image 2013-04-02 10:01:52 +04:00
Andrew Dolgov
ffd0786416 api: add a few logical spaces 2013-04-02 09:34:32 +04:00
Andrew Dolgov
7461774f0f Merge pull request #118 from vapier/x-sendfile
add optional support for the X-Sendfile header
2013-04-01 22:29:48 -07:00
Andrew Dolgov
f58df87234 import_export: fix syntax error, adapt to work with new gettext syntax 2013-04-02 09:28:47 +04:00
Andrew Dolgov
eab5a5e241 Revert "add php native gzdecode()"
This reverts commit f2c624a236.
2013-04-02 09:19:20 +04:00
Andrew Dolgov
108efe408a Merge pull request #117 from j0nson/patch-1
add sort order to API getHeadlines
2013-04-01 22:12:47 -07:00
Andrew Dolgov
129562e0b1 opml: add some data length limiting 2013-04-02 09:03:35 +04:00
Mike Frysinger
2d0838e6d3 add optional support for the X-Sendfile header 2013-04-02 00:56:20 -04:00
Andrew Dolgov
0671359f28 make show empty cats menu item more visible, move unsubscribe to feeds dropdown 2013-04-02 08:55:35 +04:00
Andrew Dolgov
97e2c731b8 move HOOK_TOOLBAR_BUTTON elements inside actionChooser 2013-04-02 08:45:51 +04:00
j0nson
0bbd14146a adds sort order to API
Allows sort by feed date or by reverse order
api Params:
order_by (string = feed_dates, date_reverse)
2013-04-01 22:21:36 -03:00
Andrew Dolgov
f2c624a236 add php native gzdecode() 2013-04-02 00:04:05 +04:00
Andrew Dolgov
d3dc4b4741 Merge pull request #116 from dandersson/load_user_js_last
Load plugin JS after native JS to enhance plugin capabilities
2013-04-01 13:00:51 -07:00
Daniel Andersson
d94fba61c1 Load plugin JS last to enhance plugin capabilities 2013-04-01 21:08:04 +02:00
Andrew Dolgov
df806921e0 rebase translations 2013-04-01 21:35:29 +04:00
Andrew Dolgov
2324f15325 add sv_SE translation 2013-04-01 21:35:00 +04:00
Andrew Dolgov
9b176694f5 Revert "another attempt to workaround against feedtree scroll issues"
This reverts commit 9f8b2e6ea8.
2013-04-01 21:24:26 +04:00
Andrew Dolgov
2faef8349c generated feeds: lower default query limit 2013-04-01 21:15:50 +04:00
Andrew Dolgov
d6ba77f3ad fix 304 being returned all the time 2013-04-01 21:13:13 +04:00
Andrew Dolgov
2e35a7070b generated feeds: support if-modified-since 2013-04-01 21:08:32 +04:00
Andrew Dolgov
f0e015c428 daemon2: make wrong schema version error display if quiet 2013-04-01 19:51:59 +04:00
Andrew Dolgov
0ae9f7460b update.php --daemon did not respect --quiet 2013-04-01 19:51:43 +04:00
Barak Korren
e470a273cf Merge branch 'master' into tunable-fetches 2013-04-01 18:40:46 +03:00