Commit Graph

18214 Commits

Author SHA1 Message Date
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
Hypolite Petovan 170e84e9f2
Merge pull request #4443 from rabuzarus/20180212_-_fix_variables_part_three
fix undeclared variables or wrong variable names (/src) part 3
2018-02-12 11:05:58 -05:00
rabuzarus af3a57376a Item::tagDeliver(): remove contact as array key for hooks because it was never declared 2018-02-12 17:05:01 +01:00
Hypolite Petovan 8bd8a9ea87
Merge pull request #4444 from rabuzarus/20180212_-_fix_variables_part_four
fix undeclared variables or wrong variable names (/view) part 4
2018-02-12 11:01:18 -05:00
rabuzarus 58b4169097 fix undeclared $uid variables in Item::insert() 2018-02-12 16:56:52 +01:00
rabuzarus 02ef222fe1 fix undeclared variables or wrong variable names (/view) 2018-02-12 16:50:05 +01:00
rabuzarus 342b9af734 fix undeclared variables or wrong variable names (/src) 2018-02-12 16:08:28 +01:00
Michael Vogel 7e15a9f0f5
Merge pull request #4441 from tobiasd/20180212-de
update for DE translation
2018-02-12 10:46:24 +01:00
Tobias Diekershoff d4fccc6ce8 update for DE translation 2018-02-12 08:46:14 +01:00
Michael Vogel e90b3f606d
Merge pull request #4439 from MrPetovan/bug/4396-use-dba-exists-in-uimport
Add dba::exists usages to UserImport::importAccount
2018-02-12 06:02:30 +01:00
rabuzarus 049a4f5f86 some polishing 2018-02-12 04:10:11 +01:00
Hypolite Petovan f68667e301
Merge pull request #4438 from rabuzarus/20180211_-_fix_variables_part_one
fix undeclared variables or wrong variable names (/include) - part 1
2018-02-11 22:00:42 -05:00
rabuzarus 5fe7a21482 add $no_photos parameter to add_page_info_data() 2018-02-12 03:56:20 +01:00
rabuzarus 2e03a3a47f fix undeclared variables or wrong variable names (/mod) 2018-02-12 03:25:09 +01:00
Hypolite Petovan 1d035ae2ae Add dba::exists usages to UserImport::importAccount 2018-02-11 19:28:39 -05:00
Hypolite Petovan 30e8361dcb
Merge pull request #4437 from annando/worker-cleanup
Some clean up for the worker, arrays are now supported as parameter
2018-02-11 18:21:28 -05:00
rabuzarus 26fd6b1c33 fix undeclared variables or wrong variable names (/include) 2018-02-11 22:13:29 +01:00
Michael 2a762868e9 Some clean up for the worker, arrays are now supported as parameter 2018-02-11 16:18:39 +00:00
Hypolite Petovan ab7646016b
Merge pull request #4436 from tobiasd/20180211-support
added ways to get some help on EN and DE landing page of the documentation
2018-02-11 09:22:33 -05:00
Tobias Diekershoff a8d1a9b6fc typo 2018-02-11 10:48:29 +01:00
Tobias Diekershoff d828375fd8 use the correct markup for 2nd level list elements 2018-02-11 10:41:46 +01:00