Michael Vogel
cae6a0c9fb
Merge pull request #3026 from tobiasd/20161219-lng
...
DE translation of the core
2016-12-19 14:09:57 +01:00
85dec3cf30
DE translation of the core
2016-12-19 12:22:47 +01:00
Michael Vogel
fd1afcbd35
Merge pull request #3025 from tobiasd/20161219-messagespo
...
regenerated master messages.po file
2016-12-19 08:40:49 +01:00
5507a2caeb
regenerated master messages.po file
2016-12-19 07:47:52 +01:00
6aba536957
Merge pull request #3023 from annando/1612-attachment-link
...
Bugfix: Reimported Friendica posts from pump.io had the links missing.
2016-12-19 07:44:42 +01:00
5a4c5ac8f7
Merge pull request #3024 from beardyunixer/develop
...
This error message had me confused for about twenty minutes. I couldn't
2016-12-19 07:44:10 +01:00
Thomas Willingham
a58d8d2c71
This error message had me confused for about twenty minutes. I couldn't
...
figure out what was wrong with my imagick install that would make it give
me an orange button if it was installed. Of course, the problem was that
it wasn't installed, and the message was worded badly. This is a bit less
confusing.
2016-12-19 00:10:11 +00:00
8cab220387
Bugfix: Reimported Friendica posts from pump.io had the links missing.
2016-12-18 23:39:44 +00:00
b3fa0a4e90
Merge pull request #3022 from annando/1612-ostatus-follow2
...
Ostatus: The follow/unfollow XML should now be even more compliant.
2016-12-18 22:27:02 +01:00
3f6fd4bf84
Mastodon: Hopefully we can now detect reshares better
2016-12-18 20:34:34 +00:00
a8e80ef0a6
Ostatus: The follow/unfollow XML should now be even more compliant.
2016-12-18 20:02:13 +00:00
463a80e91d
Merge pull request #3021 from annando/1612-ostatus-follow
...
OStatus: Follow/Unfollow should now work again.
2016-12-18 19:11:34 +01:00
099f51c7b5
Removal of test code
2016-12-18 17:36:48 +00:00
bc323b0bfa
OStatus: Follow/Unfollow should now work again.
2016-12-18 17:10:38 +00:00
e92135a2dc
Merge pull request #3014 from annando/1612-missing-self-contact
...
Create missing self contact
2016-12-15 18:44:44 +01:00
53417aaf39
Create missing self contact
2016-12-15 07:15:33 +00:00
29bc27fa6a
Merge pull request #3009 from annando/issue-2999
...
Issue 2999: Better Mastodon handling
2016-12-12 07:54:59 +01:00
73e330abbe
Restore empty line
2016-12-12 06:51:08 +00:00
17f15e793f
Issue 2999: Better Mastodon handling
2016-12-12 06:46:02 +00:00
352b168e2d
Merge pull request #3007 from annando/1607-performance
...
Some more performance stuff
2016-12-12 07:04:16 +01:00
rabuzarus
68bcb99d3a
Merge pull request #3008 from annando/1612-probe-logging
...
Issue 2835: Some logging to detect possible problems with the probing
2016-12-11 20:01:09 +01:00
0c99cee092
Some logging to detect possible problems with the probing
2016-12-11 18:39:39 +00:00
5c04402448
String is no integer
2016-12-11 17:37:12 +00:00
23a97465e5
Avoid SQL errors
2016-12-11 07:09:48 +00:00
Michael Vogel
28cb2857eb
Merge pull request #3006 from rabuzarus/20161210_-_frio_submit_fix
...
frio: delete unneeded button attributes in search forms
2016-12-11 00:22:20 +01:00
rabuzarus
7dcf44aa96
frio: delete unneeded button attributes in search forms
2016-12-10 21:25:40 +01:00
c666c98559
Code bautification
2016-12-10 12:28:49 +00:00
00c74a7d6d
Some more ...
2016-12-10 12:21:16 +00:00
5572bd0cf9
Redo the index changes for testing purposes
2016-12-10 12:19:57 +00:00
fc3c1601b1
Merge remote-tracking branch 'upstream/develop' into 1607-performance
2016-12-10 12:18:11 +00:00
Michael Vogel
b43691cc4b
Merge pull request #3004 from tobiasd/20161210-2932followup
...
add allowed protocols during installation
2016-12-10 08:02:19 +01:00
132477990d
move that option up, as the admin panel has no control over it ATM
2016-12-10 07:16:16 +01:00
89caa18fe0
add the kickstart allowed protocols to htconfig.tpl. 2932 follow-up
2016-12-10 07:05:35 +01:00
ef29e03491
make vier also the default from the emergency htconfig file
2016-12-10 07:04:39 +01:00
Michael Vogel
5065def530
Merge pull request #3000 from tobiasd/20161208-convert
...
only convert tables in friendica DB
2016-12-09 18:13:27 +01:00
6f3e91d4c0
Michael may keep the typo
2016-12-09 18:11:27 +01:00
a564e31451
use %placeholder% instead of Friendica
2016-12-09 16:43:40 +01:00
Michael Vogel
af42e5e481
Merge pull request #2932 from Hypolite/issue/missing-private-image-src
...
Fix Friendica private image URL replacing
2016-12-09 15:54:11 +01:00
Michael Vogel
b010a7db0d
Merge pull request #3003 from tobiasd/20161209-lang
...
DE, ES update to the translation
2016-12-09 15:53:20 +01:00
rabuzarus
e88e030c28
Merge pull request #3002 from tobiasd/20161209-docissues
...
in docs there was a wrong link to the issue tracker
2016-12-09 13:43:21 +01:00
3512c87e64
DE, ES update to the translation
2016-12-09 12:36:28 +01:00
8659a09e17
Merge pull request #3001 from annando/1612-store-gcontact
...
The gcontact-id and the object field can now be stored with item_post
2016-12-09 11:42:28 +01:00
52b8474be7
in docs there was a wrong link to the issue tracker
2016-12-09 11:38:08 +01:00
e12227c000
The gcontact-id and the object field can now be stored with item_post
2016-12-09 09:57:02 +00:00
4059e58bbf
Merge pull request #2990 from Hypolite/fix-diaspora-medium-link
...
Improve diaspora2bb autolinker
2016-12-08 21:11:47 +01:00
f9b0beff8d
only convert tables in friendica DB
2016-12-08 20:29:06 +01:00
Hypolite Petovan
cd354d3a57
Adding default protocols on missing config value for backward compatibility
2016-12-07 23:18:10 -05:00
Hypolite Petovan
88e336b3bc
Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private-image-src
...
# Conflicts:
# doc/htconfig.md
2016-12-07 23:15:46 -05:00
Hypolite Petovan
e29023dc8c
Standards
2016-12-07 23:11:53 -05:00
a4959626ad
Merge pull request #2996 from rabuzarus/20161206_-_help_doc_move_content
...
docu docs: some polishing
2016-12-06 22:05:08 +01:00