Commit graph

18184 commits

Author SHA1 Message Date
Michael Vogel
b52252bf39
Merge pull request #4470 from tobiasd/20180218-de
update for DE translation
2018-02-18 11:05:49 +01:00
Michael Vogel
a920896fa5
Merge pull request #4469 from tobiasd/20180218-missingL10n
missing L10n::t for date string formatting
2018-02-18 11:04:42 +01:00
Tobias Diekershoff
0611093d4e update for DE translation 2018-02-18 10:14:55 +01:00
Tobias Diekershoff
59aed9533e missing L10n::t for date string formatting 2018-02-18 09:56:27 +01:00
Hypolite Petovan
07c35935f9
Merge pull request #4468 from annando/issue-4396
Issue 4396: Avoid SQL error during UImport
2018-02-17 09:08:12 -05:00
Michael
d119beef3f Issue 4396: Avoid SQL error during UImport 2018-02-17 10:37:14 +00:00
Hypolite Petovan
35974a9c7b
Merge pull request #4467 from friendica/revert-4464-develop
Revert "Fix PHP Warning: preg_replace(): Compilation failed in include/items"
2018-02-16 11:12:56 -05:00
Hypolite Petovan
e2d8c80f33
Revert "Fix PHP Warning: preg_replace(): Compilation failed in include/items" 2018-02-16 11:12:41 -05:00
Hypolite Petovan
171c052a1d
Merge pull request #4466 from tobiasd/20180216-entranslation
EN US and GB translation updates
2018-02-16 07:35:14 -05:00
Tobias Diekershoff
9fa274ff2f
Merge pull request #4464 from MrPetovan/develop
Fix PHP Warning: preg_replace(): Compilation failed in include/items
2018-02-16 11:05:36 +01:00
Tobias Diekershoff
a4ba2fcafa EN US and GB translation updates 2018-02-16 10:33:10 +01:00
Hypolite Petovan
31831b9fdb Remove partial preg_quote in include/items 2018-02-16 00:31:32 -05:00
Hypolite Petovan
f4d76d10b2 Fix PHP Warning: preg_replace(): Compilation failed in include/items 2018-02-15 22:13:45 -05:00
Michael Vogel
753f92c234
Merge pull request #4462 from MrPetovan/task/3878-move-include-bbcode-to-src
Move include/bbcode to src/ part 2: bbcode()
2018-02-15 21:35:27 +01:00
Hypolite Petovan
956ed54800 Remove IDE quirk in mod/register 2018-02-15 15:10:00 -05:00
Hypolite Petovan
71cb1523d5 Remove include/bbcode.php 2018-02-14 22:05:16 -05:00
Hypolite Petovan
9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -05:00
Hypolite Petovan
05a2ea4220 Refactor comments including "bbcode()" 2018-02-14 22:00:43 -05:00
Hypolite Petovan
4e4f5862b2 Remove unused $preserve_nl parameter from bb2diaspora() 2018-02-14 21:45:41 -05:00
Hypolite Petovan
0c52866693 Refactor bbcode() into BBCode::convert() 2018-02-14 21:33:55 -05:00
Hypolite Petovan
29f5270313 Remove unused parameter preserve_nl in BBCode::convert 2018-02-14 21:31:28 -05:00
Hypolite Petovan
ee380c3149 Fix undeclared variable in Content\Text\BBCode 2018-02-14 20:25:23 -05:00
Hypolite Petovan
029df40b87
Merge pull request #4461 from annando/bugfix-uimport
Issue 4396: WSOD with uimport
2018-02-14 18:32:11 -05:00
Michael
3e456ddcb8 Issue 4396: WSOD with uimport 2018-02-14 23:13:53 +00:00
Hypolite Petovan
bcd896c604
Merge pull request #4460 from annando/bugfix-dfrn-mail
DFRN: Bugfix for not storing mails
2018-02-14 17:11:47 -05:00
Michael
2f71a6f80f DFRN: Bugfix for not storing mails 2018-02-14 22:08:16 +00:00
Hypolite Petovan
41cd5af54f
Merge pull request #4459 from annando/unmark-contact
Bugfix and improvements for unmarking potentially archived contacts
2018-02-14 17:01:17 -05:00
Michael Vogel
79696a19e5
Merge pull request #4455 from MrPetovan/task/4176-fix-undeclared-variables-2
[Scrutinizer] Fix undeclared variables part 6: src/ (except Protocol/)
2018-02-14 22:49:43 +01:00
Michael
43b1eccbcd Bugfix and improvements for unmarking potentially archived contacts 2018-02-14 21:18:16 +00:00
Hypolite Petovan
cdc8a3b68d
Merge pull request #4457 from annando/accept-archived
Diaspora: Accept posts from archived contacts
2018-02-14 09:46:24 -05:00
Michael
878b2be63d Diaspora: Accept posts from archived contacts 2018-02-14 14:29:28 +00:00
Michael Vogel
af0e10ee20
Merge pull request #4456 from MrPetovan/task/4176-fix-undeclared-variables-3
[Scrutinizer] Fix undeclared variables part 7: mod/ and view/
2018-02-14 07:48:35 +01:00
Michael Vogel
156bce737c
Merge pull request #4454 from MrPetovan/task/4176-fix-undeclared-variables-1
[Scrutinizer] Fix undeclared variables part 5: src/Protocol/
2018-02-14 07:30:20 +01:00
Hypolite Petovan
7a38fbf84b [Scrutinizer] Fix undeclared variables part 7: mod/ and view/
- Remove unused function `salmon_return()`
2018-02-14 00:07:26 -05:00
Hypolite Petovan
d419d07f73 [Scrutinizer] Fix undeclared variables in src/ (except Protocol/)
- Use dba::selectFirst to remove intermediate variables `$r`
- Remove unused variable `$url_recipients` in Worker\Dellivery
2018-02-14 00:05:00 -05:00
Hypolite Petovan
d8e9ed5ff8 [Scrutinizer] Fix undeclared variables in src/Protocol/
- Use dba::selectFirst to remove intermediate variables `$r`
- Remove unused variable `$sender` in Protocol\Email
- Simplify Protocol\OStatus:fetchAuthor cascading queries
2018-02-13 23:58:46 -05:00
Hypolite Petovan
2234bb92ae
Merge pull request #4449 from annando/probe-pump
Improved profile probing for pump.io
2018-02-13 08:25:47 -05:00
Michael
6a486aa92b Remove address from name 2018-02-13 07:10:05 +00:00
Tobias Diekershoff
4c91729bc9
Merge pull request #4447 from MrPetovan/bug/4445-improve-bbcode-quote-html
Add paragraph to BBCode conversion of [quote]
2018-02-13 07:09:22 +01:00
Michael
7df60ae634 Improved profile probing for pump.io 2018-02-13 05:54:09 +00:00
Hypolite Petovan
4bc1672921 Add paragraph to BBCode conversion of [quote] 2018-02-12 22:37:30 -05:00
Hypolite Petovan
219182d41e
Merge pull request #4446 from annando/worker-priority
Bugfix: The provided worker priority had been ignored
2018-02-12 22:29:53 -05:00
Michael
6289e307aa Bugfix: The provided worker priority had been ignored 2018-02-13 02:26:35 +00:00
Hypolite Petovan
724a58e79a
Merge pull request #4440 from rabuzarus/20180211_-_fix_variables_part_two
fix undeclared variables or wrong variable names (/mod) part 2
2018-02-12 19:53:39 -05:00
rabuzarus
fb81d266bd declare $bang variable in editpost_content() 2018-02-13 01:20:16 +01:00
rabuzarus
2f8d78fd9f the lockstate should be now correct in editpost_content() 2018-02-12 22:26:25 +01:00
rabuzarus
abe0d8355a remove code with undeclared variable in function poke_init( 2018-02-12 20:27:10 +01:00
rabuzarus
ea770ed778 remove code in function follow_post() that was never executed. 2018-02-12 20:24:33 +01:00
rabuzarus
1a87fcb5b3 tagger_content(): handle case where $owner_nick is empty 2018-02-12 19:28:14 +01:00
rabuzarus
02654c28f7 tagger_content(): use the $owner_nickname for constructing the link 2018-02-12 17:46:34 +01:00