Commit Graph

930 Commits

Author SHA1 Message Date
Hannes Mannerheim
e468470fd2 manual merge of !28 by @discussthang 2016-03-01 16:35:39 +01:00
Hannes Mannerheim
7e33c337cb it really is quotes 2016-03-01 12:55:29 +01:00
hannes
a1902a221e Merge branch 'master' into 'master'
Updated English to Dutch



See merge request !26
2016-03-01 11:53:25 +00:00
Discuss Thang
4898445d62 Updated English to Dutch 2016-03-01 11:45:23 +00:00
Hannes Mannerheim
eff168e70f that hid the arrows when browsing images.. 2016-03-01 02:11:21 +01:00
Hannes Mannerheim
049049d8bf user cog menu in user lists too 2016-03-01 01:58:12 +01:00
Hannes Mannerheim
c3aed808ba silence & sandbox in user cog wheel menu and stream item ellipsis menu 2016-03-01 01:08:55 +01:00
Hannes Mannerheim
bab2335cd9 japanese by @akionux !25 2016-02-29 21:38:08 +01:00
Hannes Mannerheim
fbc5cdfba5 hidden-conversations that are always-hidden are really always hidden so we don't count those in 2016-02-29 19:45:28 +01:00
Hannes Mannerheim
876b15a5cd silence&sandbox api 2016-02-29 19:37:06 +01:00
Hannes Mannerheim
9f24af8a02 user cog wheel menu 2016-02-29 19:36:50 +01:00
Hannes Mannerheim
75aec590ca bugfixes 2016-02-29 16:07:31 +01:00
hannes
363de485f4 Merge branch 'translate-fr' into 'master'
Complete french translation



See merge request !24
2016-02-27 08:42:44 +00:00
postblue
e9d4634fb0 Complete french translation 2016-02-27 08:08:43 +01:00
Hannes Mannerheim
9271c4e5f0 keep stream-item container for notices in reply and delete popups 2016-02-27 03:12:06 +01:00
Hannes Mannerheim
80a8ad5f30 mods can delete others notices 2016-02-27 02:01:27 +01:00
Hannes Mannerheim
1d63aa14f0 link to sandboxed from silenced and vice versa 2016-02-27 02:01:09 +01:00
Hannes Mannerheim
5dc4b74fb7 user rights in api user array 2016-02-27 02:00:25 +01:00
Hannes Mannerheim
f2a6bbf685 fixed width stream-item menu 2016-02-27 01:59:31 +01:00
hannes
ec8204794e Merge branch 'master' into 'master'
Updated norwegian translation

Updated norwegian translation

See merge request !23
2016-02-26 23:12:09 +00:00
abjectio
09b7d070f6 updated norwegian translation 2016-02-26 23:59:47 +01:00
abjectio
154614322a Merge branch 'master' of git.gnu.io:h2p/Qvitter 2016-02-26 23:49:28 +01:00
Hannes Mannerheim
11186c14b8 silenced & sandboxed flags and streams, only show notifications from people you follow, ghost notification fix, mentions no longer default stream, block stream link in menu, etc 2016-02-26 23:18:02 +01:00
Hannes Mannerheim
fcd41e8c2b don't show sandboxed users in public timelines, unless you are a mod 2016-02-26 18:22:41 +01:00
Hannes Mannerheim
a2a38680a3 what's quipping? 2016-02-25 11:09:07 +01:00
Hannes Mannerheim
131f9a673d oembed fixes 2016-02-25 11:08:47 +01:00
hannes
f977f9ba8a Merge branch 'rel_me_for_indieweb' into 'master'
rel="me" links for the IndieWeb audience

This will make https://indiewebify.me/validate-rel-me/?url=https%3A%2F%2Fquitter.se%2Fhannes2peer recognize rel="me" tags that help IndieWeb sites and services determine who you are based on which other websites you publish (such as blog etc)

See for example: https://indiewebify.me/validate-rel-me/?url=https%3A%2F%2Fsocial.umeahackerspace.se%2Fmmn where my blog links back to my GNU social account and the service recognizes it.

See merge request !22
2016-02-23 21:54:52 +00:00
Mikael Nordfeldth
4592c65939 rel="me" links for the IndieWeb audience 2016-02-23 22:14:58 +01:00
abjectio
11d79dbee9 Merge branch 'master' of git.gnu.io:h2p/Qvitter 2016-02-23 21:08:47 +01:00
Hannes Mannerheim
35f6515cab notice.is_local can be -1 for silenced remote users, we can't use that for determining if a notice is local. use user.is_local instead 2016-02-23 12:03:01 +01:00
Hannes Mannerheim
b1852c79c0 don't include attentions to groups 2016-02-17 01:37:15 +01:00
Hannes Mannerheim
4898d83fe8 notification count in front of site title, makes it show even if the tab width is small 2016-02-17 00:44:38 +01:00
Hannes Mannerheim
a6fbae5938 better transition with cached notices without some new attributes 2016-02-17 00:26:18 +01:00
Hannes Mannerheim
b3200f993a fixes 2) in #33, tags can contain and end with . and - 2016-02-16 23:41:29 +01:00
Hannes Mannerheim
a4661e15eb closes #21 2016-02-16 20:00:26 +01:00
Hannes Mannerheim
0f9ec45a06 removes error in blocked-feed when we haven't blocked anyone 2016-02-16 19:20:44 +01:00
Hannes Mannerheim
4be6c25996 use attentions for building reply strings and reply-to elements 2016-02-16 19:20:20 +01:00
Hannes Mannerheim
1e57eba7d1 fixes 1) in #33 2016-02-16 14:37:16 +01:00
Hannes Mannerheim
5675069b6b fixes #30 2016-02-16 14:28:00 +01:00
Hannes Mannerheim
f8e93650e8 remove debug message 2016-02-16 13:39:26 +01:00
Hannes Mannerheim
f82589398b updated favicons 2016-02-16 13:37:29 +01:00
Hannes Mannerheim
2c66b7e39c Any click empties the mentions-suggestions 2016-02-16 12:36:23 +01:00
Hannes Mannerheim
de078b42b5 revert !18 and fix bug that didn't expand videos 2016-02-16 12:21:06 +01:00
hannes
2dbcda40b1 Merge branch 'video_elements_in_queets' into 'master'
in-notice video elements with local thumbs as posters

This is the best I could do with my knowledge of javascript and how everything is designed.


What I'm curious about is however that I thought we already had HTML generation for video elements in Qvitter? That's where I copied the inArray if-statement from anyway...

See merge request !18
2016-02-16 11:00:04 +00:00
hannes
0bc9d2cd26 Merge branch 'align_with_newer_gnusocial' into 'master'
Align with newer gnusocial

In case someone updates GNU social then the NoticeStream "selectVerbs" class variables have changed behaviour.

This request makes Qvitter work with both the old and new.

A consequence of this is that I call parent::__construct() in actions/apitimelinefriendshiddenreplies.php for RawInboxNoticeStreamHiddenReplies, which is why I have to set the class variable $selectVerbs = array(); (because it would otherwise only select POST verbs as a result of parent::__construct(), this retains the old behaviour and everything is exactly as it should be).

See merge request !21
2016-02-16 10:50:46 +00:00
hannes
3b3ddbe83d Merge branch 'semicolon' into 'master'
Fixed missing trailing semicolon

Trailing colon (:) where it should've been a semicolon (;).

See merge request !20
2016-02-16 10:49:37 +00:00
hannes
a5d114cd0c Merge branch 'word-break' into 'master'
Prevent words from breaking mid-word in Notifications

By current behaviour, Notifications will break a word and wrap onto a new line even if it has to cut off the word in half. This is sometimes a good approach for link-intensive posts, but not as much on text-intensive ones.

![chrome_2016-02-14_02-17-16](/uploads/fe76a46fdaa8bb3509fd5ac0db9016f1/chrome_2016-02-14_02-17-16.png)


See merge request !19
2016-02-16 10:49:10 +00:00
Mikael Nordfeldth
92611273c3 Also set selectVerbs so we don't ignore Shares for example. 2016-02-14 20:42:26 +01:00
Mikael Nordfeldth
b442f365a1 Need to call parent construct in order to set selectVerbs stuff 2016-02-14 20:33:28 +01:00
Mikael Nordfeldth
2a75c0b31c align code with newer GNU social 2016-02-14 20:33:06 +01:00