Commit Graph

937 Commits

Author SHA1 Message Date
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
Resi Respati
d58a88d54d Fixed missing trailing semicolon 2016-02-14 02:15:30 +07:00
Resi Respati
baa8d224d7 Prevent words from breaking mid-word in Notifications 2016-02-14 02:14:13 +07:00
Mikael Nordfeldth
970bfb4090 in-notice video elements with local thumbs as posters 2016-02-13 02:08:38 +01:00
hannes
bdc9eb8aae Merge branch 'translation-1' into 'master'
translate some strings to German



See merge request !17
2016-02-12 13:55:56 +00:00
Benedikt Geißler
72d19b1e14 change all pronouns to lower case 2016-02-12 04:25:49 +01:00
Benedikt Geißler
89de83b103 replace all occurences of '" : "' and '":"' by '": "' for a more unified look in
the German translation file
2016-02-12 04:07:33 +01:00
Benedikt Geißler
dc7cdeb4f9 translate some strings to German 2016-02-12 03:59:33 +01:00
Hannes Mannerheim
2816507545 twitter cards and opengraph 2016-02-11 17:48:57 +01:00
Hannes Mannerheim
aa828e620c don't flash the no-javascript message while loading 2016-02-11 14:55:27 +01:00
hannes
fda1da319f Merge branch 'tr-translate' into 'master'
added turkish translation



See merge request !16
2016-02-11 13:46:46 +00:00
Hannes Mannerheim
086991fab8 custom terms from menu and links 2016-02-11 14:29:57 +01:00
Hannes Mannerheim
6909aea0ba follow button for external users directly 2016-02-11 14:29:42 +01:00
Hannes Mannerheim
6023bf8a87 terms fix 2016-02-11 14:29:02 +01:00
Hannes Mannerheim
9eed5c6ed8 sort TWKN by id not created 2016-02-11 14:28:50 +01:00
Yalın Pala
6ebae1f2f0 added turkish translation 2016-02-11 14:56:29 +02:00
hannes
d9a1351036 Merge branch 'master' into 'master'
Update a few terms on pt_br translation

Hopefully this is the last commit until new strings are added.

See merge request !15
2016-02-10 13:17:37 +00:00
Alexandre Oliveira
22559c314a Update a few terms on pt_br translation
Hopefully this is the last commit until new strings are added.
2016-02-10 11:15:06 -02:00
abjectio
9d0d8df2d6 Merge branch 'master' of git.gnu.io:h2p/Qvitter 2016-02-09 20:47:54 +01:00
hannes
e8f2668879 Merge branch 'master' into 'master'
Added Finnish translations



See merge request !14
2016-02-09 19:20:48 +00:00
Mikko Niemikorpi
14b524f0ac Added Finnish translations 2016-02-09 19:50:13 +02:00
hannes
0ca69fab72 Merge branch 'master' into 'master'
Fix pt_br translation



See merge request !13
2016-02-09 14:20:02 +00:00
Alexandre Oliveira
2baf5bde07 Fix pt_br translation 2016-02-08 23:49:28 -02:00
abjectio
dc0747bc39 merging 2016-02-08 23:21:56 +01:00
Hannes Mannerheim
d2a81a6f9c pt_br update by @alexivanov 2016-02-08 11:12:48 +01:00
Hannes Mannerheim
130febadf7 spanish faq addition by @simsa01@quitter.se 2016-02-08 11:09:09 +01:00
Hannes Mannerheim
9db1d67fca nl update 2016-02-08 11:04:08 +01:00
Hannes Mannerheim
a0bd41d9f7 no > nb, fixes #11 2016-02-08 11:00:43 +01:00
hannes
3e7ce55384 Merge branch 'master' into 'master'
Ending spanish translation.

Ending spanish translation.

See merge request !10
2016-02-08 09:53:14 +00:00
abjectio
2b8065e047 Merge branch 'master' of git.gnu.io:h2p/Qvitter 2016-02-07 18:58:21 +01:00
Hannes Mannerheim
93cfed124f terms addition 2016-02-07 14:38:02 +01:00
Hannes Mannerheim
97fa39126b terms for logged in users 2016-02-07 14:17:31 +01:00
Hannes Mannerheim
c60d1101f9 xss fix, thx @chc4@quitter.se 2016-02-07 02:23:50 +01:00
abjectio
6d3a8695bb Changed no.json to nb.json - Norwegian Bokmål 2016-02-06 20:52:36 +01:00
radikal
296df6357d Acabando traducción 2016-02-04 21:17:32 +01:00
Hannes Mannerheim
60acc52638 sort twkn by id, since we scroll using max_id 2016-02-04 13:52:29 +01:00
hannes
4c6a860bae Merge branch 'master' into 'master'
Updated norwegian translation

Updated norwegian translation

See merge request !9
2016-02-04 01:05:29 +00:00
abjectio
f722720cc3 updated norwegian translation 2016-02-03 22:10:40 +01:00
Hannes Mannerheim
8abbdeb3c0 blocks you tooltip 2016-02-02 16:25:07 +01:00
Hannes Mannerheim
949162b258 blocking 2016-02-02 00:44:44 +01:00
Hannes Mannerheim
7285e3a8b4 set api format so client errors work 2016-02-01 18:22:35 +01:00
hannes
e1554be53b Merge branch 'master' into 'master'
Updated norwegian translation

changed my fork repo to point to git.gnu.io and updated norwegian translation.

See merge request !8
2016-01-31 01:20:48 +00:00
Knut Erik Hollund
55bfc12a1b Merge branch 'master' of git.gnu.io:abjectio/Qvitter 2016-01-31 01:15:11 +01:00
Knut Erik Hollund
9714829ec9 Updated norwegian translation 2016-01-30 12:21:29 +01:00