Hypolite Petovan
|
133120007c
|
Merge remote-tracking branch 'friendica/develop' into improvement/ping-php-json
|
2016-11-22 21:14:25 -05:00 |
|
|
Hypolite Petovan
|
58e03c5155
|
ping.php: Ensure data structure consistency
- Formatting
- Documentation
|
2016-11-22 21:11:22 -05:00 |
|
Michael Vogel
|
61da46677d
|
Merge pull request #2967 from Hypolite/issue/#2955
ping.php: Prevent $register_count from being undefined
|
2016-11-22 21:00:34 +01:00 |
|
Hypolite Petovan
|
e0322546d8
|
ping.php improvement: Prevent $register_count from being undefined
|
2016-11-22 14:17:05 -05:00 |
|
 Tobias Diekershoff
|
22732fef12
|
Merge pull request #2966 from annando/1611-myisam
Bugfix: We should only search in the current database for MyISAM tables
|
2016-11-22 17:53:01 +01:00 |
|
 Michael
|
edbdd0e34a
|
Bugfix: We should only search in the current database for MyISAM tables
|
2016-11-22 16:47:08 +00:00 |
|
|
Tobias Diekershoff
|
754de768f2
|
Merge pull request #2960 from Hypolite/issue/#2955
ping.php Fix confusion between count vars and array vars
|
2016-11-22 08:13:36 +01:00 |
|
rabuzarus
|
67f966a0b1
|
Merge pull request #2954 from tobiasd/20161121-de
DE, ES translation of the core THX Andreas and Albert
|
2016-11-21 22:05:23 +01:00 |
|
|
Hypolite Petovan
|
cc242d52f8
|
ping.php Fix confusion between count vars and array vars
|
2016-11-21 16:02:36 -05:00 |
|
|
Tobias Diekershoff
|
01b46f5ec0
|
ES translation of the core THX Albert
|
2016-11-21 18:35:17 +01:00 |
|
|
Tobias Diekershoff
|
e375517a31
|
DE translation of the core THX Andreas
|
2016-11-21 11:45:19 +01:00 |
|
|
Michael Vogel
|
46ba1a46f5
|
Merge pull request #2896 from rabuzarus/0311_fix_photo_albums
chache: check for valid serialized data + uncomment caching of contac…
|
2016-11-21 04:04:36 +01:00 |
|
|
rabuzarus
|
282de40452
|
Merge pull request #2953 from tobiasd/20161120-regenmsgHackathon
regenerated master messages.po files after Hackathon 2016
|
2016-11-21 00:40:25 +01:00 |
|
|
Tobias Diekershoff
|
9f428bb264
|
regenerated master messages.po files after Hackathon 2016
|
2016-11-20 21:47:51 +01:00 |
|
|
Tobias Diekershoff
|
0628068977
|
Merge pull request #2952 from annando/issue-2772
Issue 2772: Posts from pending contacts should be displayed as well.
|
2016-11-20 17:56:05 +01:00 |
|
|
Michael
|
3de862712d
|
Issue 2772: Posts from pending contacts should be displayed as well.
|
2016-11-20 16:52:57 +00:00 |
|
|
rabuzarus
|
721ac5fb9e
|
cache: use unserialize(false)
|
2016-11-20 17:32:37 +01:00 |
|
|
Michael Vogel
|
b33e817586
|
Merge pull request #2951 from tobiasd/20161120-mysql
add MySQL warning in admin panel
|
2016-11-20 17:09:49 +01:00 |
|
|
Tobias Diekershoff
|
dd4a23070c
|
Merge pull request #2950 from rabuzarus/berlin_fix_post_preview
Bugfix: preview has sometimes phantom mentions and tags
|
2016-11-20 16:46:31 +01:00 |
|
|
Tobias Diekershoff
|
c99c98ab8b
|
script is moved
|
2016-11-20 16:33:56 +01:00 |
|
|
Tobias Diekershoff
|
97c6f668e6
|
add a warning to the admin panel when the MySQL version is problematic
|
2016-11-20 16:32:38 +01:00 |
|
|
rabuzarus
|
66341046d2
|
Bugfix: preview has sometimes phantom mentions and tags
|
2016-11-20 16:19:55 +01:00 |
|
|
Tobias Diekershoff
|
b03009d962
|
use an array for warnings in admin panel
|
2016-11-20 16:14:09 +01:00 |
|
|
Tobias Diekershoff
|
1e40cdd1d4
|
Merge pull request #2947 from annando/1611-nowarn-insecure
The warning if a group contains members of several network types can …
|
2016-11-20 16:00:29 +01:00 |
|
|
Tobias Diekershoff
|
59c12db020
|
Merge pull request #2949 from silke/vagrant-1604
Added Vagrant for Ubuntu 16.04
|
2016-11-20 15:39:31 +01:00 |
|
Silke Meyer
|
d0d746a3be
|
Switched to a vagrant box that works for Ubuntu Xenial
|
2016-11-20 15:32:57 +01:00 |
|
|
Silke Meyer
|
2308a7d33e
|
Vagrant does not download addons by default
|
2016-11-20 15:32:17 +01:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|