Michael
7ad4a8ca93
The warning if a group contains members of several network types can now be supressed.
2016-11-20 12:09:18 +00:00
Michael Vogel
7ca4648ffd
Merge pull request #2945 from tobiasd/20161119-admindbwarn
...
Show a warning message in the admin panel when MyISAM is still in use
2016-11-20 12:38:52 +01:00
Tobias Diekershoff
38f9fab6c4
mysql keywords
2016-11-20 10:44:54 +01:00
Tobias Diekershoff
20f987e814
Merge pull request #2946 from annando/1611-bugfix-groups
...
Bugfix: Filtering by group has to be done with the contact id in the thread table
2016-11-20 10:39:01 +01:00
Michael
68a31e084a
Bugfix: Filtering by group has always to be done with the contact id in the thread table
2016-11-20 09:24:56 +00:00
Tobias Diekershoff
7aaaa0a3c7
Show a warning message in the admin panel when MyISAM is still in use
2016-11-20 09:50:14 +01:00
Tobias Diekershoff
24d31d3092
Merge pull request #2944 from annando/1611-bugfix-utf8
...
Avoid UTF8 warning in mod/proxy.php
2016-11-20 09:44:38 +01:00
Michael
d6be33cbbb
Avoid UTF8 warning in mod/proxy.php
2016-11-20 08:30:30 +00:00
Tobias Diekershoff
ef3c87b487
Merge pull request #2943 from rabuzarus/berlin_frio_fix_code_wrap
...
Bugfix: frio - use white-space: pre-wrap for code elements
2016-11-20 06:38:45 +01:00
rabuzarus
72953cd1e1
fix indent
2016-11-20 02:07:58 +01:00
rabuzarus
cf07a4413c
Bugfix: frio - use white-space: pre-wrap for code elements
2016-11-20 01:51:32 +01:00
rabuzarus
79ab2b5a86
Merge pull request #2942 from annando/1611-avoid-warning
...
Avoid a warning with activated rendertime
2016-11-20 01:37:20 +01:00
Michael
d93f44b493
Avoid a warning with activated rendertime
2016-11-19 23:41:53 +00:00
Hypolite Petovan
003e6a7371
Improve BBCode javascript stripping regex
2016-11-19 18:01:45 -05:00
Tobias Diekershoff
914330bb8f
Merge pull request #2940 from annando/1611-dead-contacts
...
Mark contacts as dead or undead while transmitting and receiving messages
2016-11-19 22:59:57 +01:00
Michael Vogel
5be5fa1b1d
Merge pull request #2930 from Hypolite/issue/#2925
...
Overhauling proxy_url/Fix encoded ampersand
2016-11-19 21:57:57 +01:00
Michael Vogel
8a62470599
Merge pull request #2939 from rabuzarus/berlin_frio_fix_match_wrapper_floating
...
Bugfix: float for remote-friends-in-common wrapper
2016-11-19 21:55:40 +01:00
Tobias Diekershoff
65c4e8d4ff
some work at the Hackathon
2016-11-19 21:42:16 +01:00
Michael Vogel
67c1a20ed0
Merge pull request #2941 from Hypolite/improvement/ping-php-json
...
ping.php performance: fix typo
2016-11-19 21:40:31 +01:00
Michael Vogel
a7a6a1a378
Merge pull request #2936 from tobiasd/20161119-issue844
...
Additional info in registration request
2016-11-19 21:40:02 +01:00
Hypolite Petovan
61afd71897
ping.php performance: fix typo
2016-11-19 15:23:36 -05:00
rabuzarus
1d8f18ff86
Bugfix: float for remote-friends-in-common wrapper
2016-11-19 21:14:28 +01:00
Michael
89d5aa64ba
Mark contacts as dead or undead while transmitting and receiving messages
2016-11-19 20:10:29 +00:00
Hypolite Petovan
1cf9506646
Overhauling proxy_url: use $shortpath for long URL in writemode
2016-11-19 14:03:31 -05:00
Tobias Diekershoff
ba24b1b651
Merge pull request #2937 from rabuzarus/1811_jot_charackter_counter
...
frio: add a very simple character counter to the jot
2016-11-19 19:37:41 +01:00
Tobias Diekershoff
d170f4119f
Merge pull request #2935 from silke/deprecated-themes
...
Deprecated themes
2016-11-19 19:36:39 +01:00
Tobias Diekershoff
b95bf00e89
Additional info in registration request
2016-11-19 18:22:49 +01:00
Silke Meyer
d22807e613
Removes a number of deprecated themes
2016-11-19 18:19:15 +01:00
Silke Meyer
e32a39d129
Marked themes frost and frost-mobile as unsupported
2016-11-19 18:17:21 +01:00
Silke Meyer
18f59b6bfe
Vagrant: corrected hostnames
2016-11-19 18:05:38 +01:00
Michael Vogel
240bdf15ef
Merge pull request #2934 from tobiasd/develop
...
DE update of the SSL doc
2016-11-19 16:24:59 +01:00
Silke Meyer
bb3385a7e3
Adapted documentation for Vagrant multiple machines
2016-11-19 16:09:20 +01:00
Silke Meyer
5024b7426c
Vagrant: Allow to choose between Ubuntu 14.04 und 16.04
2016-11-19 16:08:08 +01:00
Tobias Diekershoff
1cc0cc5b82
DE update of the SSL doc
2016-11-19 15:51:12 +01:00
Tobias Diekershoff
b63f2ac754
2614 is closed
2016-11-19 15:35:46 +01:00
Michael Vogel
ea38af9799
Merge pull request #2931 from tobiasd/20161118-issue2926
...
send email confirming pending registration #2916
2016-11-19 15:21:06 +01:00
Tobias Diekershoff
a7dae15e82
added return value to doxygen header
2016-11-19 14:34:06 +01:00
Tobias Diekershoff
32c0a9ef43
added return value to doxygen header
2016-11-19 14:32:01 +01:00
Michael Vogel
83b30bbc78
Merge pull request #2933 from silke/develop
...
Updated SSL documentation
2016-11-19 14:03:06 +01:00
Tobias Diekershoff
4534d5f8c2
Hackathon work 1st day
2016-11-19 13:58:39 +01:00
Silke Meyer
5d779941e7
Updated SSL documentation
2016-11-19 13:28:45 +01:00
Michael Vogel
9657fed705
Merge pull request #2927 from Hypolite/improvement/ping-php-json
...
ping.php performance: Add JSON output
2016-11-19 13:23:10 +01:00
Hypolite Petovan
c2eb2f460b
Fix Friendica private image URL replacing
...
- Add baseurl to redir_private_images to prevent empty src attribute in
generated HTML
- URL encode the URL parameter url and conurl
- Formatting
- Documentation
2016-11-18 22:05:56 -05:00
rabuzarus
a8d1a3f997
frio: add a very simple character counter to the jot
2016-11-18 23:48:31 +01:00
Tobias Diekershoff
f4c52f5a0e
send email confirming pending registration #2916
2016-11-18 20:16:22 +01:00
Tobias Diekershoff
23bc0eae29
Merge pull request #2929 from annando/1611-onepoll-priority
...
Polling feeds is now done with a higher priority.
2016-11-18 07:20:27 +01:00
Hypolite Petovan
a6bdb2c34a
overhauling proxy_url
...
- Decode possible HTML entities in the input URL
- Add the safe extension for the shortpath as well
- Formatting
- Documentation
2016-11-17 23:08:00 -05:00
Michael
ccd484643d
Polling feeds is now done with a higher priority.
2016-11-17 23:06:22 +00:00
fabrixxm
90f100578b
Merge pull request #2928 from tobiasd/20161117-es
...
ES translation of the core THX Albert
2016-11-17 09:10:18 +01:00
Tobias Diekershoff
7aef99a4f0
ES translation of the core THX Albert
2016-11-17 07:42:41 +01:00
