Hannes Mannerheim
351a1fc461
this actually solves #46
2016-03-07 18:43:01 +01:00
Hannes Mannerheim
e321f40a64
hopefully fixes #46
2016-03-07 18:35:25 +01:00
Hannes Mannerheim
6494335e79
incompatible with older gs, and unnecessary
2016-03-07 18:35:03 +01:00
Hannes Mannerheim
6ecf09bf5c
fixes #47
2016-03-07 18:05:58 +01:00
Hannes Mannerheim
a743c6994e
escape html in fullname !35
2016-03-07 17:45:40 +01:00
Hannes Mannerheim
be1d393706
some svg that someone might find useful
2016-03-07 17:44:52 +01:00
Hannes Mannerheim
17a2b7d7ee
manual merge of !38 by @grmpyoldman because of merge conflict
2016-03-07 17:01:10 +01:00
hannes
84550f6d95
Merge branch 'patch-2' into 'master'
...
and german translations for lines 180–197…
just added some more missing translations for the lines 180–197…
See merge request !39
2016-03-07 10:57:44 -05:00
Grumpy OldMan
db3ffd5249
and german translations for lines 180–197…
2016-03-07 08:01:21 -05:00
Hannes Mannerheim
afb3c6450d
add userArray in script tag in profile cards, to be used by e.g. plugins
2016-03-05 14:50:30 +01:00
hannes
68b3d377e8
Merge branch 'mediafile_fromfilehandle_avatar' into 'master'
...
MediaFile::fromFilehandle on profile avatar upload
This is mainly because I in GNU social want to change the constructor of
MediaFile and thus use fromFilehandle in Qvitter, so we don't have to sync
the changes as much.
This also will make sure that uploaded files can be reused if they match a
SHA256 hash of the avatar we want to set. Parts of my rewriting also provide
a pretty good example of how we can reuse existing File entries as Avatar sources.
See merge request !34
2016-03-05 04:57:46 -05:00
hannes
cafa618671
Merge branch 'patch-1' into 'master'
...
German translation edited and new translations added.
See merge request !33
2016-03-05 04:53:38 -05:00
Hannes Mannerheim
e224d98593
dutch update by @discussthang
2016-03-05 10:51:37 +01:00
Mikael Nordfeldth
2dbd6c539c
FileNotFoundException won't be thrown if MediaFile works as it should
...
In newer GNU social MediaFile will make sure the local file exists, if
we're trying to upload something that matches by hash in the File table.
For the current 'master' when I'm pushing this that won't be handled
correctly, but then again it would only be a problem if something has
been f'd already and you're missing files from the filesystem that are
listed in the File table.
2016-03-05 02:30:28 +01:00
Mikael Nordfeldth
0e0a92638f
Profile banner and background uploads with MediaFile::fromFilehandle
2016-03-05 02:27:58 +01:00
Mikael Nordfeldth
3bbfabfd4b
Don't keep $this->img in memory the whole time
2016-03-05 01:52:16 +01:00
Mikael Nordfeldth
04eefb7836
MediaFile::fromFilehandle on profile avatar upload
...
This is mainly because I in GNU social want to change the constructor of
MediaFile and thus use fromFilehandle in Qvitter, so we don't have to sync
the changes as much.
This also will make sure that uploaded files can be reused if they match a
SHA256 hash of the avatar we want to set. Parts of my rewriting also provide
a pretty good example of how we can reuse existing File entries as Avatar sources.
2016-03-05 01:35:18 +01:00
Walter Sobchak
6f7370ad4b
Übersetzung überarbeitet und weitere Übersetzungen.
2016-03-04 17:34:59 -05:00
Hannes Mannerheim
9bf92d11aa
mute and bugfixes
2016-03-04 23:07:15 +01:00
hannes
4d5b8e2907
Merge branch 'master' into 'master'
...
Various grammar fixes to the eo translation
See merge request !31
2016-03-04 17:01:39 -05:00
hannes
40eed77d50
Merge branch 'master' into 'master'
...
Updated norwegian translation
Updated norwegian translation
See merge request !32
2016-03-04 17:01:25 -05:00
abjectio
974d964905
Updated norwegian translation
2016-03-04 20:57:11 +01:00
Nicolas Maia
d87cc71034
various grammar fixes to the eo translation
2016-03-04 16:46:49 -03:00
hannes
56e55bb253
Merge branch 'master' into 'master'
...
Update Esperanto translations
This is an update of the esperanto translations to include all previously untranslated strings. I have used the same vocabulary as the rest of the document where possible.
See merge request !30
2016-03-03 17:52:41 +00:00
hannes
9139b33bb4
Merge branch 'master' into 'master'
...
Update Brazilian Portuguese translation
See merge request !29
2016-03-03 17:52:25 +00:00
reality
08a35313a1
oops forgot one
2016-03-03 14:00:01 +00:00
reality
1f0e63cfa8
some fixes after review
2016-03-03 13:58:32 +00:00
reality
db30b4487b
esperanto translations
2016-03-03 12:17:54 +00:00
Alexei Ivanov
3199c944c0
Update Brazilian Portuguese translation
2016-03-02 20:38:57 -03:00
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
