Michael Vogel
b43691cc4b
Merge pull request #3004 from tobiasd/20161210-2932followup
...
add allowed protocols during installation
2016-12-10 08:02:19 +01:00
Tobias Diekershoff
132477990d
move that option up, as the admin panel has no control over it ATM
2016-12-10 07:16:16 +01:00
Tobias Diekershoff
89caa18fe0
add the kickstart allowed protocols to htconfig.tpl. 2932 follow-up
2016-12-10 07:05:35 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
6f3e91d4c0
Michael may keep the typo
2016-12-09 18:11:27 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
3512c87e64
DE, ES update to the translation
2016-12-09 12:36:28 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
52b8474be7
in docs there was a wrong link to the issue tracker
2016-12-09 11:38:08 +01:00
Michael
e12227c000
The gcontact-id and the object field can now be stored with item_post
2016-12-09 09:57:02 +00:00
Tobias Diekershoff
4059e58bbf
Merge pull request #2990 from Hypolite/fix-diaspora-medium-link
...
Improve diaspora2bb autolinker
2016-12-08 21:11:47 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
a4959626ad
Merge pull request #2996 from rabuzarus/20161206_-_help_doc_move_content
...
docu docs: some polishing
2016-12-06 22:05:08 +01:00
Michael Vogel
9457d30751
Merge pull request #2994 from tobiasd/20161206-frontendworker
...
add frontend worker to the admin panel and regen master messages.po file
2016-12-06 22:01:29 +01:00
Tobias Diekershoff
71cfe6db94
show some of the worker options only when the worker process is active
2016-12-06 21:47:37 +01:00
rabuzarus
b65433c823
docu docs: some polishing
2016-12-06 15:03:57 +01:00
Tobias Diekershoff
26e771d913
Merge pull request #2995 from rabuzarus/20161206_-_frio_nav_bar_link_change
...
frio: change some link behavior of user menu in the nav bar
2016-12-06 14:19:00 +01:00
rabuzarus
11507440ae
frio: change some link behavior of user menu in the nav bar
2016-12-06 14:11:22 +01:00
Tobias Diekershoff
ac5617c40c
add frontend worker to the admin panel and regen master messages.po file
2016-12-06 08:44:59 +01:00
Hypolite Petovan
aef2c7373c
Formatting
2016-12-05 22:48:02 -05:00
Hypolite Petovan
d0cb8cdccf
Fixs edge case where single stars on succeeding lines are wrongly turned into multi-line <em>
2016-12-05 22:47:52 -05:00
Hypolite Petovan
60b9203dd5
Add <br> for each carriage return
...
Fixes #2993
2016-12-05 22:46:51 -05:00
Hypolite Petovan
2b75ad5e0a
src and href attributes sanitization touchups
...
- Use Config::get
- Add default to config call
- Add always allowed protocol to href
- Remove relative root URLs from allowed forms
2016-12-04 21:33:29 -05:00
Hypolite Petovan
5e20aed428
Revert adding a leading slash to redir links
2016-12-04 21:31:28 -05:00
Michael Vogel
a25910db84
Merge pull request #2989 from tobiasd/20161203-de
...
Update DE translation THX Rabuzarus
2016-12-05 00:32:15 +01:00
Tobias Diekershoff
9899c30d0f
Merge pull request #2991 from rabuzarus/20161204_-_allowfullscreen
...
Bugfix: Fix full screen for embedded videos
2016-12-04 17:49:15 +01:00
Tobias Diekershoff
acf2e42e24
Merge pull request #2992 from rabuzarus/20161204_-_fix_cache_call_in_identity.php
...
Bugfix: cached data doesn't need to get unserialized anymore
2016-12-04 17:48:46 +01:00
rabuzarus
3d4e1176ec
Bugfix: cached data doesn't need to get unserialized anymore
2016-12-04 15:15:23 +01:00
rabuzarus
5ca93d0541
Bugfix: Fix full screen for embedded videos
2016-12-04 14:55:57 +01:00
Hypolite Petovan
166df0180b
Improve diaspora2bb autolinker for URLs
...
- Add @ support for URLs (Medium URLs)
- Exclude trailing commas from autolinked URLs, likely to be normal text
- Formatting
2016-12-03 22:04:13 -05:00
Hypolite Petovan
979fc6d38a
Add protocol whitelist for href/src attributes
...
- Add strict URL checker for src attributes
- Add protocol whitelist for href attributes
- Add error styling if URL fails to pass filter
- Add doc for new htconfig value
- Add emphasis to config key names in htconfig doc
2016-12-03 14:19:57 -05:00
Hypolite Petovan
47a370c5e3
Revert adding baseurl to private image URL
2016-12-03 10:39:06 -05:00
Hypolite Petovan
0f2c27e041
Merge branch 'develop' into issue/missing-private-image-src
2016-12-03 10:34:48 -05:00
Tobias Diekershoff
7ecc0a063c
Update DE translation THX Rabuzarus
2016-12-03 10:09:40 +01:00
Tobias Diekershoff
bdae456e5d
Merge pull request #2988 from rabuzarus/20161202_-_embed_text_complete
...
autocomplete: add [embed] tag to tag autocomplete and to docu docs
2016-12-02 20:20:20 +01:00
rabuzarus
7a9a1b3722
autocomplete: add [embed] tag to tag autocomplete and to docu docs
2016-12-02 19:39:35 +01:00
Tobias Diekershoff
e20e64390b
Merge pull request #2986 from annando/1612-spool
...
Spool items that weren't stored before
2016-12-02 17:14:10 +01:00
Michael
b904aaff11
Merge remote-tracking branch 'upstream/develop' into 1612-spool
2016-12-02 09:54:34 +00:00
Michael
6619e0791d
Much more standards
2016-12-01 22:52:35 +00:00
Michael
c97306e734
Standards ...
2016-12-01 22:50:07 +00:00
Michael
13150c09a5
File was missing
2016-12-01 21:11:52 +00:00
Michael
6845775ff9
Store spooled data
2016-12-01 20:53:18 +00:00
Tobias Diekershoff
df8db7d90d
Merge pull request #2985 from annando/1612-ping
...
Little improvements to the queries in ping.php
2016-12-01 20:37:45 +01:00
