Roland Häder
7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2
...
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-11 14:54:26 +02:00
Michael Vogel
bc724f2b68
Merge pull request #3458 from Hypolite/bug/missing-require-poco
...
Missing require for poco_serverlist
2017-05-09 06:56:32 +02:00
Hypolite Petovan
108f0b2d1e
Improve refactoring
...
- Rename $contacts to $users where meaningful
- Use Config::get instead of get_config
- Move requires for lazy inclusion
2017-05-08 23:03:52 -04:00
Hypolite Petovan
d5b660a72f
Add missing require for poco_serverlist
2017-05-08 21:55:19 -04:00
Hypolite Petovan
70cc2ccc7a
Fix standards + refactored variables with meaningful names
2017-05-08 21:55:04 -04:00
Hypolite Petovan
6f6b029c4d
Merge pull request #3456 from annando/1704-mastodon-html
...
HTML for OStatus posts look better (in Mastodon and GNU Social)
2017-05-08 16:54:45 -04:00
rabuzarus
899bfacb73
Merge pull request #3457 from annando/1705-probe
...
Small bugfix for PR 3454
2017-05-08 22:28:42 +02:00
Michael
f6fe11ff49
Small bugfix for PR 3454
2017-05-08 20:01:18 +00:00
Michael
3db3d2f1f7
This should make posts fine on GNU Social as well
2017-05-08 19:11:47 +00:00
Hypolite Petovan
63b900a5cd
Merge pull request #3455 from rabuzarus/20170508_-_fix_frio_register_tooltip
...
Bugfix: frio - make register tooltip work
2017-05-08 14:13:03 -04:00
Michael
f602ec30cc
Shared links create now a better HTML
2017-05-08 18:11:37 +00:00
rabuzarus
757f3a3f5d
Bugfix: frio - make register tooltip work
2017-05-08 19:39:06 +02:00
Michael
722e03cc58
Added documentation
2017-05-08 17:29:46 +00:00
Hypolite Petovan
d51ddce5e5
Merge pull request #3454 from rabuzarus/20170508_-_camelCase
...
Bugfix: correct uninitialized variables
2017-05-08 13:26:16 -04:00
rabuzarus
3d5ff8bab3
remove use of PConfig Class from Probe class because we don't use it here
2017-05-08 19:04:01 +02:00
rabuzarus
8a2ffffe71
Bugfix: correct uninitialized variables
2017-05-08 19:02:34 +02:00
Hypolite Petovan
bb6a27bb06
Merge pull request #3453 from rabuzarus/20170508_-_camelCase
...
Probe.php: some work for standardization
2017-05-08 12:42:42 -04:00
rabuzarus
035c79f355
add some spaces for better readability
2017-05-08 18:28:30 +02:00
rabuzarus
8830d20ed0
rename some variables for comprehensibility
2017-05-08 18:07:06 +02:00
rabuzarus
51372bc314
improve readability
2017-05-08 17:36:04 +02:00
rabuzarus
450a4920fd
apply coding standard
2017-05-08 17:06:57 +02:00
Michael
aa4eafc304
Even better?
2017-05-08 14:31:37 +00:00
rabuzarus
cc8a3a4101
rename methods of the Probe class to camelCase
2017-05-08 16:19:10 +02:00
Michael
5abef34284
Should work now ...
2017-05-08 14:02:32 +00:00
Michael
3f975f6751
More URL can be styled
2017-05-08 12:35:44 +00:00
Michael
2002fc8a2a
Better design for links in Mastodon posts
2017-05-08 12:18:30 +00:00
Tobias Diekershoff
077941a116
Merge pull request #3451 from annando/issue-basepath-writable
...
Don't check if basepath is writeable / convert App.php to unix newlines
2017-05-08 08:29:51 +02:00
Michael
52a4e09711
Don't check if basepath is writable / convert App.php to unix newlines
2017-05-08 06:11:38 +00:00
Tobias Diekershoff
1f58bcc114
Merge pull request #3418 from gerhard6380/develop
...
New API calls for photo management
2017-05-08 06:56:24 +02:00
Hypolite Petovan
bb834f8d51
Merge pull request #3450 from annando/1705-more-classes
...
And even more global classes ...
2017-05-07 18:35:21 -04:00
Michael
a8caeefb52
And even more global classes ...
2017-05-07 22:21:12 +00:00
Michael Vogel
d9f8fbeb4f
Merge pull request #3449 from Hypolite/improvement/move-probe-to-src
...
Hotfix: Yet more global classes to escape
2017-05-08 00:18:53 +02:00
Hypolite Petovan
f123f6df10
Yet more global classes to escape
2017-05-07 18:12:26 -04:00
Michael Vogel
6680ce1dd7
Merge pull request #3445 from Hypolite/improvement/move-probe-to-src
...
Move Probe to src
2017-05-07 23:14:22 +02:00
Hypolite Petovan
74479c4020
Merge pull request #3448 from annando/1705-dba-functions
...
The first queries are replaced with the new functions. More to come ...
2017-05-07 17:10:39 -04:00
Hypolite Petovan
45ec3fb5d8
Add missing include/probe require for probe_url support
2017-05-07 17:08:32 -04:00
Michael
2c11e91e65
The first queries are replaced with the new functions. More to come ...
2017-05-07 20:52:00 +00:00
Michael Vogel
cb0727743f
Merge pull request #3447 from Alkarex/message-sql-bug
...
Fix SQL syntax bug in mod message
2017-05-07 22:32:21 +02:00
gerhard6380
0039ccf382
applied documentation convention
2017-05-07 21:43:29 +02:00
Alexandre Alapetite
02faf42403
Fix SQL syntax bug in mod message
2017-05-07 21:39:00 +02:00
Tobias Diekershoff
5c77f45bda
Merge pull request #3446 from Hypolite/improvement/move-app-to-src-2
...
Hotfix for missing Exception class
2017-05-07 21:27:12 +02:00
Hypolite Petovan
b4f2fc4e2f
Hotfix for missing Exception class
2017-05-07 15:22:11 -04:00
Hypolite Petovan
92550861e9
Updated doc in include/probe.php
...
- Fix standards
2017-05-07 15:00:38 -04:00
Hypolite Petovan
ee7650795d
Updated composer static autoloader
2017-05-07 14:50:47 -04:00
Hypolite Petovan
3a2988c3fd
Rename include/Scrape to include/probe
2017-05-07 14:45:19 -04:00
Hypolite Petovan
36e515ee6d
Move Probe to src
2017-05-07 14:44:30 -04:00
Hypolite Petovan
82b423c5ac
Fix require_once format
2017-05-07 14:40:23 -04:00
Hypolite Petovan
1c38540f20
Merge pull request #3444 from annando/1705-mail-duplicates
...
Mails shouldn't be duplicated anymore when sending
2017-05-07 13:45:34 -04:00
Michael Vogel
fa3fa42d96
Merge pull request #3423 from Hypolite/improvement/move-app-to-src-2
...
Move App to `src` redux
2017-05-07 19:37:50 +02:00
Michael
824141d3e5
Mails shouldn't be duplicated anymore when sending
2017-05-07 17:11:09 +00:00
