friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
18,234 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

819 Commits

Author SHA1 Message Date
Michael 6c26dcf1c7 The network is now just a 4 character field 2018-02-19 13:58:04 +00:00
Michael 0062fede79 Issue 1312: Improve account expiry 2018-02-18 22:19:20 +00:00
Michael d0fa80b195 Issue 4228: Don't post an item if it belongs to a picture upload without an post 2018-02-18 17:29:14 +00:00
Michael a9a85849f4 Issue 4369: Added logging to know why a post is stored 2018-02-18 16:43:18 +00:00
Michael d119beef3f Issue 4396: Avoid SQL error during UImport 2018-02-17 10:37:14 +00:00
Hypolite Petovan 9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -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
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
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
rabuzarus af3a57376a Item::tagDeliver(): remove contact as array key for hooks because it was never declared 2018-02-12 17:05:01 +01:00
rabuzarus 58b4169097 fix undeclared $uid variables in Item::insert() 2018-02-12 16:56:52 +01:00
rabuzarus 342b9af734 fix undeclared variables or wrong variable names (/src) 2018-02-12 16:08:28 +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
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
Hypolite Petovan 1d035ae2ae Add dba::exists usages to UserImport::importAccount 2018-02-11 19:28:39 -05:00
Michael 2a762868e9 Some clean up for the worker, arrays are now supported as parameter 2018-02-11 16:18:39 +00:00
Michael 30cfca40d8 Use a more simple HTML for API output 2018-02-10 13:33:15 +00:00
Hypolite Petovan 8b557c3157
Merge pull request #4433 from annando/direct-block 
Suppress content from hidden or blocked contacts
 2018-02-10 07:49:34 -05:00
Michael ee7c587693 Suppress content from hidden or blocked contacts 2018-02-10 12:34:10 +00:00
rabuzarus 9a4d19e284 move membersince addon to core 2018-02-09 20:44:45 +01:00
Michael Vogel 25fbdd21c5
Merge pull request #4429 from MrPetovan/bug/4426-handle-auth-exceptions 
Handle authentication exceptions in Login module
 2018-02-09 19:03:52 +01:00
Michael a2f172e084 Bugfix for check that the DFRN entry already exists 2018-02-09 06:20:01 +00:00
Hypolite Petovan 8a9917857e Handle authentication exceptions in Login module 
- Break down large methods into smaller ones
- Add more authentication exception
- Add a legacy User::authenticate method
 2018-02-09 00:08:01 -05:00
Michael 15a857e411 Line endings are converted to unix style 2018-02-09 03:49:49 +00:00
Michael d42f86e218 We can now delegate again like before 2018-02-08 22:18:34 +00:00
Michael 1424559bee Forgotten "+" 2018-02-08 19:47:47 +00:00
Michael 70c31a6149 Improved date time formula thing. 2018-02-08 19:33:40 +00:00
Michael d70a20a466 We now incrementally calculate the queue delivery time 2018-02-08 18:39:48 +00:00
Michael ac7b0661d2 Added documentation 2018-02-08 15:03:18 +00:00
Michael 8ea572ebd1 Added a config value to ignore server checks 2018-02-08 13:09:09 +00:00
Michael 0093f863fd Don't add already queued items from Diaspora to the queue again 2018-02-08 11:26:24 +00:00
Michael 87280ebf57 Bugfix: a forgotten "use" in bbcode.php 2018-02-08 06:08:07 +00:00
Michael 3890dfee4a Wrong function order in Item::update 2018-02-07 20:09:37 +00:00
Michael b1e91f7401 Quickfix: Removed exception since it blocked message delivery 2018-02-07 13:31:17 +00:00
Tobias Diekershoff 85c8bf0228
Merge pull request #4399 from MrPetovan/task/3878-move-include-bbcode-to-src 
Move include/bbcode to src/ part 1 : Everything but bbcode()
 2018-02-07 07:18:39 +01:00
Michael 4859a18ae4 Fixed wrong capitalation (or however this is written) 2018-02-06 23:17:18 +00:00
Michael 053cb31eea Forgotten commented out text 2018-02-06 22:57:56 +00:00
Michael 47d165cb25 Hook calls can now be forked into a worker queue entry 2018-02-06 22:52:36 +00:00
Michael 66e3c1836e Addon.php was in DOS format 2018-02-06 19:35:10 +00:00
Michael 7be59dbeab Priority and capitalisation 2018-02-06 16:32:00 +00:00
Michael e609de2957 Many item calls are now isolated in a single function 2018-02-06 12:40:22 +00:00
Hypolite Petovan 9a76a14778 Missing dba::selectFirst in Model\Item 2018-02-05 20:45:12 -05:00
Hypolite Petovan c1c4c32966
Merge pull request #4402 from rabuzarus/20180205_-_fix_get_addr_in_probe 
Bugfix: Probe - get the contact address from xrd 'subject' key
 2018-02-05 15:36:01 -05:00
rabuzarus 984bb2a808 Bugfix: Probe - get the contact address from xrd 'subject' key 2018-02-05 21:27:40 +01:00
rabuzarus 91a346960a fix tagcloud 2018-02-05 21:05:11 +01:00
Hypolite Petovan a62b46375d Move PROTOCOL_* constants to Model\Conversation 2018-02-05 14:09:03 -05:00
Hypolite Petovan a0cdd9c674 Rename Core\Network to Core\Protocol 2018-02-05 12:57:41 -05:00
Adam Magness 4c93b592a5 Rebase 
fix from rebase
 2018-02-05 12:49:03 -05:00
Adam Magness db8ef98537 Rename functions 
rename functions from review comments
 2018-02-05 12:48:22 -05:00
Adam Magness 992836e261 Some standards and dba 
update some calls to use dba functions and some standards updates
 2018-02-05 12:47:37 -05:00
Adam Magness 4be49e706b Remove requires 
remove require_once for old file
 2018-02-05 12:47:37 -05:00
Adam Magness 7ffcb25321 Update function names and calls 
update function names and calls from other files
 2018-02-05 12:47:04 -05:00
Adam Magness f4fa8f085b Functions to Item class 
copy functions to Item class
 2018-02-05 12:45:52 -05:00
Michael Vogel fa95911fdb
Merge pull request #4393 from MrPetovan/task/3878-move-include-tags-to-src 
Move include/tags to src/
 2018-02-05 18:11:29 +01:00
Hypolite Petovan 157027a6f5 Improve BBCode documentation/comment 2018-02-05 11:42:06 -05:00
Hypolite Petovan d75bb8e970 Rename BBCode::removeAbstract() to BBCode::stripAbstract() 2018-02-04 23:38:40 -05:00
Hypolite Petovan 6e53c615c4 Add missing requires in Text\BBCode 2018-02-04 19:33:39 -05:00
Hypolite Petovan 010cf3b1e8 Update references to BBCode methods 
- Resolve name conflicts with Util\Network
 2018-02-04 19:26:22 -05:00
Hypolite Petovan f91ad28319 Copy include/bbcode functions to src methods 
- Add Core\Network class
 2018-02-04 19:25:22 -05:00
Hypolite Petovan 2a5431a59e Rename Model\Term methods 2018-02-04 16:48:50 -05:00
Michael Vogel dad58e0f6f
Merge pull request #4387 from MrPetovan/task/3878-move-datetime-to-src 
Move include/datetime to src/ - Part 2
 2018-02-04 21:05:27 +01:00
Michael Vogel b0e8bedb8b
Merge pull request #4391 from MrPetovan/bug/4390-convert-last-updated-to-mysql 
Convert Atom last updated date to MySQL format
 2018-02-04 16:46:42 +01:00
Michael 69c851bd6f Don't generate a new guid anymore when moving the account. 2018-02-04 12:32:56 +00:00
Hypolite Petovan 2a486903d1 Remove references to include/tags.php 2018-02-03 23:59:31 -05:00
Hypolite Petovan 9f3acceac7 Replace references to include/tags functions 2018-02-03 23:57:47 -05:00
Hypolite Petovan 507bea0e9f Copy functions from include/tags to src 
- Create Content\Widget\TagCloud
- Populate Worker\TagUpdate::execute
- Add Content\Widget::tagCloud
- Add Model\Term::insertFromItemId and Model\Term::insertFromItemUri
 2018-02-03 23:51:40 -05:00
Hypolite Petovan 0abe4158d2 Rename Term methods ahead of the move 
- Rename createFromItemURI() to insertFromItemFileByUri()
- Rename createFromItem() to insertFromItemFileById()
 2018-02-03 22:42:31 -05:00
Hypolite Petovan 7333296b8d Deprecate DBM::date() 2018-02-03 21:39:53 -05:00
Hypolite Petovan 143b453c17 Use DateTimeFormat::utc on Atom feed dates 
- Fix some formatting in Protocol\PortableContact
 2018-02-03 21:39:35 -05:00
Hypolite Petovan 4050a7b8dc Replace forgotten datetime_convert() instances 2018-02-03 20:47:37 -05:00
Hypolite Petovan f020292408 Remove references to include/datetime 2018-02-03 20:47:37 -05:00
Hypolite Petovan cea80c78e4 Replace remaining functions in include/datetime by Temporal methods 
- Fix uses statements
 2018-02-03 20:47:37 -05:00
Michael Vogel d0c9e7939c
Merge pull request #4388 from MrPetovan/develop 
Use syntaxic sugar in L10n::t()
 2018-02-03 22:12:36 +01:00
Hypolite Petovan 16cab7c6ce Use syntaxic sugar in L10n::t() 2018-02-03 13:46:01 -05:00
Hypolite Petovan 876acd68a0
Merge branch 'develop' into task/3878-move-session-to-src 2018-02-03 11:59:43 -05:00
Tobias Diekershoff e5a5a7dc7b
Merge pull request #4386 from MrPetovan/task/3878-move-friendica_smarty-to-src 
Move SMARTY3_TEMPLATE_FOLDER to FriendicaSmarty
 2018-02-03 17:01:30 +01:00
Hypolite Petovan 5cca8562bc Move datetimepicker javascript to field_datetime.tpl 
- Add type hint to getDateTimeField() arguments
 2018-02-03 09:53:45 -05:00
Hypolite Petovan 593774b613 Update moved method Item::performLike() with DateTypeFormat 
- Update use list
 2018-02-03 08:56:55 -05:00
Hypolite Petovan 59a5b13d2a Remove stray semicolon in Util\Temporal 2018-02-03 08:56:55 -05:00
Hypolite Petovan 0454d0a670 Fix incorrect Temporal reference after Item function move rebase 2018-02-03 08:56:55 -05:00
Hypolite Petovan bb5670016e Fix wrong self references in Util\Temporal 2018-02-03 08:56:55 -05:00
Hypolite Petovan 5e7285b9ba Move Temporal::convert() to DateTimeFormat::convert() 2018-02-03 08:56:55 -05:00