Commit graph

3332 commits

Author SHA1 Message Date
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
23a97465e5 Avoid SQL errors 2016-12-11 07:09:48 +00:00
c666c98559 Code bautification 2016-12-10 12:28:49 +00:00
fc3c1601b1 Merge remote-tracking branch 'upstream/develop' into 1607-performance 2016-12-10 12:18:11 +00:00
e12227c000 The gcontact-id and the object field can now be stored with item_post 2016-12-09 09:57:02 +00:00
ac5617c40c add frontend worker to the admin panel and regen master messages.po file 2016-12-06 08:44:59 +01:00
b904aaff11 Merge remote-tracking branch 'upstream/develop' into 1612-spool 2016-12-02 09:54:34 +00:00
6845775ff9 Store spooled data 2016-12-01 20:53:18 +00:00
aea122cd20 Little improvements to the queries in ping.php 2016-12-01 13:44:30 +00:00
1fc35d5f44 Merge pull request #2979 from annando/issue-2772
Issue 2772: Pending contacts should now be displayed
2016-12-01 08:51:04 +01:00
57c95c93e1 The frontend worker is now working as a full replacement for the crontab. 2016-11-30 19:24:58 +00:00
1f50dc368e Merge remote-tracking branch 'upstream/develop' into 1611-frontend 2016-11-30 04:46:47 +00:00
cc5eebd173 The frontend worker can now fork background processes 2016-11-29 22:40:19 +00:00
Michael Vogel
d620c5d996 Merge pull request #2982 from rabuzarus/20161129_-_small_dfrn_request_polish
dfrn_request: include the graphic of the connection process into the doxygen header
2016-11-29 21:09:59 +01:00
rabuzarus
a208d2e72b dfrn_request: include the graphic of the connection process into the doxygen header 2016-11-29 19:57:30 +01:00
Michael Vogel
efb2df41ba Merge pull request #2977 from rabuzarus/20161128_-_help_page_polishing
Add protocol docu to the help docs
2016-11-29 19:38:31 +01:00
Michael Vogel
fa8eb101d4 Merge pull request #2981 from rabuzarus/20161129_-_small_dfrn_request_polish
dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries
2016-11-29 19:33:57 +01:00
rabuzarus
54f3867ebd dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries 2016-11-29 15:52:12 +01:00
Michael Vogel
86665d47a6 Merge pull request #2980 from rabuzarus/20161129_-_small_dfrn_request_polish
dfrn_request: added $blocked and $pending as variable to make code mo…
2016-11-29 09:42:26 +01:00
d55d500e35 Merge pull request #2975 from annando/1611-frontend-worker
The worker can now run from the frontend as well
2016-11-29 09:40:59 +01:00
rabuzarus
0d223aa6f1 dfrn_request: added $blocked and $pending as variable to make code more understandable 2016-11-29 03:08:46 +01:00
3a76a6766f Issue 2772: Pending contacts should now be displayed 2016-11-28 22:11:13 +00:00
Michael Vogel
0ef764b167 Merge pull request #2970 from Hypolite/improvement/ping-php-json
ping.php: Ensure data structure consistency
2016-11-28 21:08:36 +01:00
Michael Vogel
37e8f6b442 Merge pull request #2973 from rabuzarus/berlin_parse_url
parse_url: recognize image/video/audio files + move functions into own class
2016-11-28 21:05:31 +01:00
rabuzarus
ac39928e5d upload connection graphics & update doxygen headers to insert link to the spec 2016-11-28 16:23:47 +01:00
rabuzarus
d0cdf863a1 fix accidentally deleted line with local_user() 2016-11-28 15:30:36 +01:00
rabuzarus
743378129b legacy support for function parseurl_getsiteinfo_cached() 2016-11-28 15:26:51 +01:00
rabuzarus
5458f40f6a Bugfix: better detection dfrn_request of double connection requests 2016-11-28 01:13:47 +01:00
rabuzarus
f229d65f85 ParseUrl: some docu work 2016-11-27 23:41:55 +01:00
df0d33c138 Try to get more execution time 2016-11-27 10:01:24 +00:00
636a033364 Added documentation, config stuff, ... 2016-11-27 09:02:08 +00:00
e856ab9a09 The worker can now run from the frontend as well 2016-11-27 00:55:05 +00:00
rabuzarus
c96a53b4b4 parse_url: fix typo 2016-11-26 04:10:50 +01:00
rabuzarus
26664c22e0 parse_url: add some docu 2016-11-25 16:59:31 +01:00
rabuzarus
e9226eaf45 parse_url: recognize image/video/audio files + move functions into own class 2016-11-24 01:11:22 +01:00
Hypolite Petovan
0f33311f65 pig.php: remove debug 2016-11-22 23:04:00 -05:00
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
edbdd0e34a Bugfix: We should only search in the current database for MyISAM tables 2016-11-22 16:47:08 +00:00
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
Hypolite Petovan
cc242d52f8 ping.php Fix confusion between count vars and array vars 2016-11-21 16:02:36 -05:00
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
3de862712d Issue 2772: Posts from pending contacts should be displayed as well. 2016-11-20 16:52:57 +00: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
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
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
b03009d962 use an array for warnings in admin panel 2016-11-20 16:14:09 +01:00