Commit graph

7106 commits

Author SHA1 Message Date
Hypolite Petovan
bec46d7b01 Remove content warning processing in put_item_in_cache 2018-04-04 23:08:48 -04:00
Hypolite Petovan
586b0b6e57 Add bash to text_highlight language list 2018-03-29 19:29:09 -04:00
Hypolite Petovan
daffc27061 Move suppress_tags config to template
- Add new item.suppress_tags template variable
- Fix template formatting
2018-03-25 00:38:23 -04:00
Hypolite Petovan
4eaf0d76b0 Remove include/event 2018-03-23 06:32:34 -04:00
Hypolite Petovan
6e7c6ab0fa Remove references to include/event 2018-03-23 06:32:34 -04:00
Hypolite Petovan
f7e2071117 Replace include/event function with method calls
- Updated scope of Model\Event methods
- Updated use list
2018-03-23 06:32:34 -04:00
Hypolite Petovan
5aecc758f9 Replace include/event function content by method calls 2018-03-23 06:32:34 -04:00
Hypolite Petovan
27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
e74f186b34 Event: Prevent SQL errors with events without end 2018-03-21 20:16:43 +00:00
73efdb99e3 Fix for incorrect datetime values 2018-03-21 05:20:55 +00:00
f082f0da4f
Merge pull request #4636 from annando/event-diaspora
Fix: Events on Diaspora now should look fine
2018-03-20 08:48:37 +01:00
f4ba5d9799 Fix: Events on Diaspora now should look fine 2018-03-20 06:32:17 +00:00
fabrixxm
e6c59b0593
fix docstring of get_poke_verbs() 2018-03-19 10:20:01 +01:00
fabrixxm
8a2a4510ec
Small fixes to translatable string
and some small cosmetic fixup to docstring for `notification()`
2018-03-19 10:15:09 +01:00
Hypolite Petovan
881c7ccfc1 Add meaningful return value to dba::connect
- Move System::unavailable call to index
2018-03-18 05:15:14 -04:00
537ef83a24 If we aren't connected to the database, we shouldn't return "true" on connect 2018-03-17 09:21:06 +00:00
Hypolite Petovan
c53c00ba4e Add rendred-hash to put_item_in_cache todo 2018-03-15 03:23:11 -04:00
Hypolite Petovan
644767519e Ensure the item body stays the same in put_item_in_cache()
- Add documentation
2018-03-15 02:13:00 -04:00
Hypolite Petovan
e28020c68a Fix for CW: Items weren't cached 2018-03-15 01:32:04 -04:00
Hypolite Petovan
65b0159282
Merge pull request #4593 from annando/fix-ostatus
OStatus: Fixed communication issues with deleted contacts
2018-03-14 18:46:21 -04:00
5bd519efff There is now a "content-warning" field 2018-03-14 22:28:35 +00:00
d98c6819e7 $contact isn't called by reference anymore 2018-03-14 20:53:03 +00:00
32ee4ca4b1 OStatus: Fixed communication issues with deleted contacts 2018-03-13 06:21:44 +00:00
4bb9263e43 Fix: The acl lookup now works in multi threaded posts as well 2018-03-12 04:51:27 +00:00
052ad155a2 Issue 4115: Events are now formatted better for Diaspora 2018-03-11 21:10:36 +00:00
Hypolite Petovan
9f693cc443 Display attach with missing title
- Rework preg_match_all call to remove 3 indentation levels
2018-03-08 23:52:01 -05:00
Hypolite Petovan
f633acd8d1 Remove include/html2*.php files 2018-03-07 16:34:48 -05:00
Hypolite Petovan
789561c7a2 Remove/Update references to include/html2*.php 2018-03-07 16:34:17 -05:00
Hypolite Petovan
5e806ff598 Replace html2plain calls by HTML::toPlaintext 2018-03-07 16:29:44 -05:00
Hypolite Petovan
b5666bd27f Replace html2bbcode calls by HTML::toBBCode 2018-03-07 16:24:13 -05:00
Hypolite Petovan
3bb2f72d05 Replace html2* function content by references to HTML class 2018-03-07 16:21:02 -05:00
Michael Vogel
cc688e2b4f
Merge pull request #4549 from MrPetovan/task/4518-add-memcached-support
[develop] Performance: Add memcached support/Improve database cache (redux)
2018-03-06 16:34:28 +01:00
Hypolite Petovan
95752b79e8 Add cache performance to API and worker 2018-03-04 23:13:19 -05:00
Hypolite Petovan
6447a45a06 Remove include/bb2diaspora.php 2018-03-04 17:43:51 -05:00
Hypolite Petovan
fe5ce67ef8 Move bb2diaspora() content to Content\Text\BBCode::toMarkdown
- Use self where appropriate
- Add BaseObject extension
2018-03-04 17:34:59 -05:00
506f851b23 Bugfix: Avoid that Twidere is crashing 2018-03-04 19:25:02 +00:00
Hypolite Petovan
49f99d94f6 Replace disapora2bb function content with Markdown::toBBCode call 2018-03-04 08:31:40 -05:00
Hypolite Petovan
7bd4a52156
Merge pull request #4532 from annando/dba-array
[develop] We now accept array as condition parameters
2018-03-03 18:14:19 -05:00
74f6dc5373 Renamed functions / each is replaced 2018-03-03 23:02:45 +00:00
Hypolite Petovan
b8fca5efe7 [PHP 7.2] Fix missing Countable warning 2018-03-03 08:48:30 -05:00
194da423e0 An array with fieldnames as keys is important for the "insert" in the "update" function 2018-03-03 13:26:23 +00:00
1510b3d948 tyoi, found by 朱陈锬 thanks for that! 2018-03-03 11:02:40 +01:00
5bda6c7f6d We now accept array as condition parameters 2018-03-03 08:47:13 +00:00
Hypolite Petovan
2f463dfb17 Remove include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan
09c717d751 Remove references to include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan
207eac4a16 Move navbar_complete to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan
824262b824 Move populate_acl to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan
2b35938e34 Move get_acl_permissions to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan
ce9e0f3649 Move prune_deadguys to Contact 2018-03-02 18:40:08 -05:00
Hypolite Petovan
113ea38d50 Move contact_select to Acl
- Simplify Acl::getMessageContactSelectHTML parameters
2018-03-02 18:40:08 -05:00
Hypolite Petovan
eef25a3259 Move contact_selector() 2018-03-02 18:40:08 -05:00
Hypolite Petovan
e2de86de46 Update references in acl_selectors to new functions 2018-03-02 18:40:08 -05:00
1be5275eef Some more performance measuring for database stuff 2018-03-02 13:37:49 +00:00
Hypolite Petovan
4fe1d804ab
Merge pull request #4511 from annando/no-activity
Only show visible activities
2018-02-27 04:41:12 -05:00
74ff36eee9 Only show visible activities 2018-02-27 09:29:11 +00:00
20368cbbf4 Fix for network update (number of maximum comments set to 0) 2018-02-26 22:15:57 +00:00
d2728cad2e Children for the network page are now fetched correctly in the conversation 2018-02-26 06:38:27 +00:00
a1eb5a584f Improve the queries on the network page 2018-02-25 21:33:15 +00:00
a59796d1d4 No gcontact-id anymore (It wasn't really used) 2018-02-21 05:15:55 +00:00
a3af6807ac Improved resource id creation 2018-02-20 10:02:07 +00: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
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
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
rabuzarus
5fe7a21482 add $no_photos parameter to add_page_info_data() 2018-02-12 03:56:20 +01:00
rabuzarus
26fd6b1c33 fix undeclared variables or wrong variable names (/include) 2018-02-11 22:13:29 +01:00
30cfca40d8 Use a more simple HTML for API output 2018-02-10 13:33:15 +00:00
ee7c587693 Suppress content from hidden or blocked contacts 2018-02-10 12:34:10 +00:00
Hypolite Petovan
164f4f7cdf
Merge pull request #4424 from annando/manage-admin
We can now delegate again like before
2018-02-08 21:41:51 -05:00
Hypolite Petovan
6f9c66b0bc Add missing require in include/text 2018-02-08 19:59:34 -05:00
d42f86e218 We can now delegate again like before 2018-02-08 22:18:34 +00:00
c953784945 Forgotten "use" 2018-02-07 20:22:40 +00:00
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
1ec6359faa Duplicate check 2018-02-06 16:44:48 +00:00
e609de2957 Many item calls are now isolated in a single function 2018-02-06 12:40:22 +00:00
Hypolite Petovan
a0cdd9c674 Rename Core\Network to Core\Protocol 2018-02-05 12:57:41 -05:00
Adam Magness
8906b98426 Remove old file
remove old file
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
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
8b60cffcb5 Remove most moved functions from include/bbcode 2018-02-04 19:26:22 -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
b4651870db Add references to new methods and constants in include/bbcode
- Remove all private callback functions from include/bbcode
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
Hypolite Petovan
fd76b15638 Add is_null check 2018-02-04 08:58:29 -05:00
Hypolite Petovan
ef77a772e5 Remove include/tags.php 2018-02-04 00:00:11 -05:00
Hypolite Petovan
2a486903d1 Remove references to include/tags.php 2018-02-03 23:59:31 -05:00
Hypolite Petovan
d00c6111fd Replace include/tags function content with references to src methods 2018-02-03 23:52:36 -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
3dda70baf1 Add system.dlogip setting usage in dlogger() 2018-02-03 21:46:28 -05:00
Hypolite Petovan
6b50c42de6 Actually delete include/datetime.php 2018-02-03 20:47:37 -05:00
Hypolite Petovan
d037300d3b Remove include/datetime.php 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
Hypolite Petovan
876acd68a0
Merge branch 'develop' into task/3878-move-session-to-src 2018-02-03 11:59:43 -05:00
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
5e7285b9ba Move Temporal::convert() to DateTimeFormat::convert() 2018-02-03 08:56:55 -05:00
Hypolite Petovan
b7a7355292 Simplify include/bb2diaspora event format 2018-02-03 08:56:53 -05:00
Hypolite Petovan
0bee706e51 Add Temporal::local() shorthand for Temporal::convert() 2018-02-03 08:56:53 -05:00
Hypolite Petovan
25954314ec Add missing Temporal::utc() 2018-02-03 08:56:53 -05:00
Hypolite Petovan
a2ee2b56d2 Add Temporal::localNow() shorthand for Temporal::convert() 2018-02-03 08:56:53 -05:00
Hypolite Petovan
89602e44da Add Temporal::timezoneNow() shorthand for Temporal::convert() 2018-02-03 08:56:53 -05:00
Hypolite Petovan
35d06bd9eb Add Temporal::utc() shorthand to Temporal::convert() 2018-02-03 08:56:53 -05:00
Hypolite Petovan
8aff8a76eb Add Temporal::utcNow() 2018-02-03 08:56:52 -05:00
Hypolite Petovan
38ff1b455b Add Temporal::MYSQL constant
- Rename Temporal::convert() parameter names
2018-02-03 08:56:52 -05:00
Hypolite Petovan
b854905150 Move ATOM_TIME to Temporal::ATOM 2018-02-03 08:56:52 -05:00
Hypolite Petovan
dc366bf1f7 Refactor datetime_convert into Temporal::convert
- Changed parameter order to save space
- Refactor select_timezone into Temporal::getTimezoneSelect
- Refactor field_timezone into Temporal::getTimezoneField
2018-02-03 08:56:51 -05:00
Hypolite Petovan
d478ef6c6d Add Util\Temporal to src
- Map include/datetime functions to Temporal methods
- Move update_contact_birthdays() to Model\Contact::updateBirthdays()
2018-02-03 08:56:51 -05:00
Hypolite Petovan
7be49913d4 Remove get_template_file function 2018-02-03 08:52:55 -05:00
Hypolite Petovan
87b19dd9ac Remove include/session file 2018-02-03 08:40:18 -05:00
Hypolite Petovan
99eb696386 Remove include/friendica_smarty 2018-02-02 07:46:13 -05:00
Hypolite Petovan
65713f26f4 Remove references to include/friendica_smarty 2018-02-02 07:46:13 -05:00
Hypolite Petovan
1ef02bd36b Remove include/like 2018-02-01 14:17:31 -05:00
Hypolite Petovan
974539913c Remove include/like references 2018-02-01 14:17:22 -05:00
Hypolite Petovan
a286e8bf3b Replace do_like() calls 2018-02-01 14:17:08 -05:00
Hypolite Petovan
d1001bf158 Replace do_like() content 2018-02-01 14:14:27 -05:00
03aafa8228 Public commenting is now always enabled 2018-01-31 23:22:41 +00:00
9cbc4a7355 Basic forum support for Diaspora 2018-01-30 06:22:09 +00:00
7b27dda784 Most functions now moved from include/items.php 2018-01-28 11:18:08 +00:00
Adam Magness
f04d40a37e Review update
Rename function, move others
2018-01-27 11:13:41 -05:00
Adam Magness
0f1be37279 Remove old file
remove network.php and all require_once statements
2018-01-27 08:28:20 -05:00
Adam Magness
ca76e49c23 Move remaining functions
update remaining function calls
2018-01-27 08:25:54 -05:00
Adam Magness
1eb7c19c1e Move multiple functions
move multiple smaller functions
2018-01-26 23:51:41 -05:00
Adam Magness
cd3643d174 Move xml_status and http_status_exit
move functions
2018-01-26 23:37:55 -05:00
Adam Magness
a32ba32ff4 Move post_url
move post_url function
2018-01-26 23:24:23 -05:00
Adam Magness
2f9642392d Move z_fetch_url
move z_fetch_url method
2018-01-26 23:18:38 -05:00
Adam Magness
c67452f72e Move fetch_url
move fetch_url function
2018-01-26 23:09:48 -05:00
Adam Magness
1b51777825 Create Network class
Create Network class and copy methods
2018-01-26 22:51:07 -05:00
Adam Magness
177edd2b6e Rename class to BBCode
Rename Plaintext class to BBCode
2018-01-26 20:01:32 -05:00
Adam Magness
c437b0c871 Remove old file
remove include/plaintext.php
2018-01-26 19:16:26 -05:00
Adam Magness
11c7441e94 Remove requires
remove require_once statements
2018-01-26 19:15:57 -05:00
Adam Magness
21881f2885 Update function calls
update to new function calls
2018-01-26 19:14:47 -05:00
cd7b81afd5 Use "sup" instead of "h5" for the link to the website 2018-01-26 13:27:16 +00:00
Adam Magness
5951ceeb6f Remove old file
remove include/post_update.php
2018-01-25 11:29:43 -05:00
Hypolite Petovan
9ab55181ed
Merge pull request #4331 from annando/other-hashtags
Support for hashtags with "#" inside the link (mastodon style?)
2018-01-25 10:02:04 -05:00
8abc4d25b4 Support for hashtags with "#" inside the link (mastodon style?) 2018-01-25 14:58:10 +00:00
66fe4cc5d6
Merge pull request #4326 from MrPetovan/task/fix-translation-strings
Fix translation strings
2018-01-25 07:02:09 +01:00
Hypolite Petovan
49b7a830dc
Merge pull request #4324 from annando/items-rework
Some functions had been moved away from include/items.php
2018-01-24 17:25:36 -05:00
Hypolite Petovan
9cd3b17743 Fix translation strings for use with util/extract.php
- Change parentheses to “\x28” and “\x29”
- Remove leading commas
- Remove quotes before commas
2018-01-24 16:51:32 -05:00
1294ac19c8 Issue 4227: Make hash tags always local links 2018-01-24 21:37:12 +00:00
3ace5d0d1d Some functions had been moved away from include/items.php 2018-01-24 20:27:32 +00:00
Hypolite Petovan
30c1cc0e8c
Merge pull request #4312 from zeroadam/feature/L10n
Move pgettext to src
2018-01-24 11:48:55 -05:00
Adam Magness
df7bdbfc66 More missed calls
missed t() calls
2018-01-24 10:19:58 -05:00
Adam Magness
428a22cc76 More sprintf
eliminate more sprintf( with L10n
2018-01-24 07:18:21 -05:00
Adam Magness
8eecad4c7f String correction
monthly is monthly
2018-01-23 22:43:22 -05:00
Adam Magness
5142e65726 Review updates
improve a t() call and move some to tt()
2018-01-23 22:38:47 -05:00
Adam Magness
c28f886179 Avoid branch conflict 2018-01-23 22:03:57 -05:00
Adam Magness
208a149a7b Review sprintf
remove more sprintf calls
2018-01-23 21:59:16 -05:00
3fbc873ffe Birthdays are now transmitted reliably to Diaspora 2018-01-23 22:51:30 +00:00
Adam Magness
f7e9b74dca Update function and sprintf
Update variable to static function and remove sprintf wrappers
2018-01-23 12:47:30 -05:00
Adam Magness
f0725ae384 Hopefully all t()
hopefully the last of the t()
2018-01-22 18:03:26 -05:00
Adam Magness
83f1149d04 More missing t()
update t() calls
2018-01-22 18:03:26 -05:00
Adam Magness
bae725c279 Security t()
missed t() calls in security
2018-01-22 18:03:26 -05:00
Adam Magness
6e758d0074 More missed use
a few more missed use statements for L10n
2018-01-22 18:03:26 -05:00
Adam Magness
06fc1d6588 Missing use
missed use statement for L10n
2018-01-22 18:03:26 -05:00
Adam Magness
b4d0df18c5 Remove old file and requires
Remove pgettext.php and remove require_once calls
2018-01-22 18:03:26 -05:00
Adam Magness
3b0f69599e Updat tt() calls
update function calls for tt()
2018-01-22 18:03:26 -05:00
Adam Magness
d49f986d1e Many t() calls
modify many t() calls.
2018-01-22 18:03:26 -05:00
Adam Magness
c8ecc31405 Update functions and calls
Update function names and calls.
2018-01-22 18:03:26 -05:00
2e333dea8f Code cleaned 2018-01-22 22:26:47 +00:00
b4d14164bb The url detection in BBCode is too greedy 2018-01-22 21:52:32 +00:00
004f46e600 Standards 2018-01-21 00:18:31 +00:00
efa8dbcfb3 Relocate functions in items.php into several classes 2018-01-20 23:52:54 +00:00
Adam Magness
b86b04a81a Change plugin to addon
change the use of plugin to addon where appropriate.
2018-01-20 07:48:22 -05:00
Adam Magness
3bad83f24e Remove old file
remove include/plugin.php
2018-01-20 07:48:22 -05:00
Adam Magness
6c4c567319 Remove require
remove require_once for plugins.php
2018-01-20 07:48:22 -05:00
Adam Magness
11cf36105c Update Addon functions and calls
Update function names and calls for Addon class.
2018-01-20 07:48:22 -05:00
Michael Vogel
104a03e82a
Merge pull request #4283 from MrPetovan/bug/2487-fix-autolink-regex
Fix autolink regular expression to include accents
2018-01-20 09:24:16 +01:00
Hypolite Petovan
4cca8280b4 Fix undefined variables PHP Notice
- $order_string in include/dba
- $limit_string in include/dba
- $search in mod/search
- $lang_list in include/pgettext.php
2018-01-19 22:52:49 -05:00
Hypolite Petovan
491a1373e0 Fix autolink regular expression to include accents 2018-01-19 21:39:57 -05:00
Hypolite Petovan
de70007a46 Update RINO settings 2018-01-19 11:27:53 -05:00
034d46196f "last-child" is not used anymore 2018-01-18 06:54:44 +00:00
2d66242b4f The delete function is now changed to the new function 2018-01-17 23:22:01 +00:00
Hypolite Petovan
f193f01a7d Fix issues in changed files
- Initializes $return in Process::insert
- Update the type hint of dba::fetch
- Remove unused $a parameter in worker_init()
- Fix uses
2018-01-17 00:17:58 -05:00
c4d3ab6878 Transfer all item shadow functions to the item class 2018-01-16 22:23:19 +00:00
Adam Magness
c98e558372 Remove old file
remove include/queue_fn.php
2018-01-15 20:16:51 -05:00
Adam Magness
bb08f87bba Remove old file
remove include/nav.php
2018-01-15 17:12:39 -05:00
Hypolite Petovan
e36f2bb1fb Use short form array syntax everywhere
- Add short form array syntax to po2php.php generation
2018-01-15 14:07:17 -05:00
Adam Magness
ebd071d181 Remove old file
remove include/message.php
2018-01-15 12:14:37 -05:00
Adam Magness
b3e6a1d283 Update functions and calls
Update functions and calls.
2018-01-15 12:14:09 -05:00
Hypolite Petovan
46bf82eeb7
Merge pull request #4247 from zeroadam/ProfileSel-#3878
Move profile_selector to src
2018-01-15 11:34:35 -05:00
Adam Magness
494f61a78f Remove old file
remove include/profile_selectors.php
2018-01-15 10:16:21 -05:00
Adam Magness
d4178d482b Remove old file
remove include/contact_widgets.php
2018-01-15 09:50:45 -05:00
Adam Magness
6cf6029ff5 Rename functions and calls
Rename functions and update calls
2018-01-15 09:50:06 -05:00
Adam Magness
edb8110555 Remove old file
remove include/attach.php
2018-01-15 08:33:12 -05:00
Adam Magness
41159cd14f use 2018-01-14 21:41:56 -05:00
Adam Magness
641ab5e247 Remove include/identity
remove no longer used file
2018-01-14 21:23:18 -05:00
Adam Magness
4fb2547df8 Update function calls
update function calls to use profile class
2018-01-14 21:22:39 -05:00
Hypolite Petovan
fabbf810b0 Move library/markdown.php to src 2018-01-14 19:01:09 -05:00
Hypolite Petovan
503e5847f9 Improve html2bbcode
- trim code blocks
- Add <code> conversion to <code> (from Diaspora)
2018-01-14 19:01:09 -05:00
Hypolite Petovan
f828afde83 Extend multi-line code blocks regular expression
- Covers the case where there's no new line after the [code] tag
2018-01-14 19:01:09 -05:00
Hypolite Petovan
64e3dbfaa4
Merge pull request #4225 from zeroadam/UserImport-#3878
Move include/uimport to src
2018-01-14 17:21:26 -05:00
Michael Vogel
1ecfa49f4c
Merge pull request #4233 from MrPetovan/task/4116-move-smarty-to-composer
Move Smarty to composer
2018-01-14 20:05:52 +01:00
Hypolite Petovan
e412cd7c51 Fix formatting in include/friendica_smarty 2018-01-14 13:36:48 -05:00
Hypolite Petovan
03b16c449f Remove library/Smarty 2018-01-14 13:36:27 -05:00
Hypolite Petovan
4dafdda99e Fix Deprecated error message 2018-01-14 09:04:46 -05:00
Hypolite Petovan
adfabeadb1 Rename param to condition in dba::delete
- Fix formatting
- Use new array syntax
2018-01-13 23:46:59 -05:00
Adam Magness
4e7657da99 Remove redir.php
remove old file
2018-01-13 09:41:26 -05:00
Adam Magness
88aeddab82 Remove old file
Remove include/uimport.php
2018-01-13 09:15:45 -05:00
fabrixxm
2d0fe7a30f
Fix api login 2018-01-13 09:22:40 +01:00
Hypolite Petovan
93355b574d Fix attachment display
- Move autolink before any potential OEmbed injection
- Add original URL attribute to invalid href and src
- Add loop to video to enable animated gifs
- Add URL domain to link attachments
- Hide link attachment description if equals the title
- Change attachment span to div to respect block order
2018-01-11 22:37:38 -05:00
Hypolite Petovan
b01daf18c5 Fix formatting of get_attachment_data() 2018-01-11 22:29:56 -05:00
6f1b1aee4b Bugfix: The name of the item owner was empty in notifications 2018-01-11 22:07:41 +00:00
a7b2db5db9 When no OEmbedding is wanted, the links are now created fine again 2018-01-11 21:31:44 +00:00
Hypolite Petovan
5ccbc95cef Guard dba::lastInsertId() with result conditions 2018-01-11 03:49:02 -05:00
Hypolite Petovan
5fc4927764 Improve dba::selectFirst calls
- Fix remaining $r[0] references
- Rename $r to meaningful names
2018-01-11 03:43:57 -05:00
Hypolite Petovan
5691564220 Trust OEmbed HTML when it's available
- Reworked bb_attachment() to trust OEmbed content when it's
successfully pulled
- Fix coding standard by renaming parameter and variables
2018-01-10 19:25:08 -05:00
Michael Vogel
d23c1c0da7
Merge pull request #4194 from MrPetovan/task/fix-scrutinizer-issues
Replace dba::select(limit => 1) by dba::selectFirst()
2018-01-10 22:16:02 +01:00
Michael Vogel
7be65769c5
Merge pull request #4197 from rabuzarus/20180110_-_rename_saved_search_button
the "save" button is now 'follow' when searching for tags
2018-01-10 20:31:44 +01:00
Hypolite Petovan
1fda0ae4ae Replace select(limit => 1) by selectFirst() in Model\Term and include/enotify
- Add new array declaration syntax
- Add braces
2018-01-10 13:04:00 -05:00
Hypolite Petovan
483d1a1bcb Rename selectOne to selectFirst in comment 2018-01-10 12:57:21 -05:00
Hypolite Petovan
ae66bcaff3 Rename selectOne to selectFirst 2018-01-10 12:57:21 -05:00
Hypolite Petovan
c7a7658316 Fix documentation in include/dba 2018-01-10 12:57:21 -05:00
Hypolite Petovan
da60893590 Replace dba::select(limit => 1) by dba::selectOne
- Convert array declarations to new style
2018-01-10 12:57:21 -05:00
Adam Magness
7723309310 Remove requires
Remove left over require_once statements.
2018-01-10 12:11:11 -05:00
Adam Magness
dc175b8e12 Update functions and calls
Change function names, calls and use dba functions.
2018-01-10 12:05:20 -05:00
Adam Magness
55ee9a1c72 Move files to src
Move files.php and create Term class
2018-01-10 11:46:05 -05:00
rabuzarus
a75ececab4 remove @brief from the doc header 2018-01-10 16:39:59 +01:00
rabuzarus
eb031e7ee2 rename the "save" button to 'follow' when searching for tags 2018-01-10 16:08:39 +01:00
Adam Magness
510e0dbb2e Remove requires
remove old require_once
2018-01-09 22:48:15 -05:00
Adam Magness
98c162552b Remove old file
remove contact_selectors
2018-01-09 22:43:14 -05:00
Adam Magness
a3ef9e35ec Update functions and calls
Update function names and calls.
2018-01-09 22:42:04 -05:00
Adam Magness
484eb960d7 Remove follow
remove follow.php
2018-01-09 10:03:31 -05:00
Hypolite Petovan
4a20bcd6f0 Fix allowed_email()
- Reworked allowed_domain
- Added more variable checks to allowed_email() and
OEmbed::isAllowedURL()
2018-01-07 19:10:09 -05:00
Hypolite Petovan
6496a721ea
Merge pull request #4182 from annando/notify-public-post
Sends notifications for public posts with "uid=0"
2018-01-07 15:54:57 -05:00
24d7b2af82 One more query 2018-01-07 18:11:48 +00:00
28d3980fab Changed queries 2018-01-07 18:06:06 +00:00
Michael Vogel
511572533e
Merge pull request #4183 from MrPetovan/bug/4173-fix-oembed-iframe-url
Restore tryoembed callback function
2018-01-07 18:10:00 +01:00
Hypolite Petovan
5605bdd289 Remove debug code 2018-01-07 10:02:21 -05:00
Hypolite Petovan
ca77bff933 Restore tryoembed callback
- Remove irritating extra <br> before shared content
2018-01-07 10:01:41 -05:00
708d034c6d We have to check for the contacts uid not the items uid 2018-01-07 12:10:31 +00:00
f2efd58366 Sends notifications for public posts with "uid=0" 2018-01-07 11:08:36 +00:00
Michael Vogel
1fdde9b140
Merge pull request #4179 from MrPetovan/bug/4173-fix-oembed-iframe-url
Fix OEmbed iframe
2018-01-07 09:28:44 +01:00
Hypolite Petovan
d8a312d286 Move tryoembed to Content\OEmbed
- Add bbcode functions documentation
- Add Exception handling to OEmbed::getHTML
- Fix formatting
2018-01-07 00:44:23 -05:00
Hypolite Petovan
1cd8001833 Fall back to normal twitter share if rich OEmbed is disabled
- Fix typo
2018-01-06 21:57:58 -05:00
Hypolite Petovan
9e54d8d4b4 Fix Twitter quote tweet display
- Transforms twitter share tags into rich OEmbed attachments
2018-01-06 00:39:59 -05:00
Hypolite Petovan
6444f97c98 Fix issues in mod/contacts
- Fix formatting
- Use DBM::is_result()
- Use dba::select
- Simplify sprintf(t[t]()) structures
- Remove commented out code
- Remove unused variables
- Update documentation type hints
2018-01-05 21:05:23 -05:00
2d9163ce30 Posts from contacts weren't displayed correctly 2018-01-05 19:47:55 +00:00
Hypolite Petovan
c544258627 Revert assignment change in datetime 2018-01-04 22:51:38 -05:00
Hypolite Petovan
819592c3bd Fix Scrutinizer issues in mod [_well_know -> contactgroup]
- Remove unused variables and parameter
- Updated function documentation
- Fix formatting
- Add back uninitialized variables
- Simplify nested conditions
2018-01-04 19:42:48 -05:00
Hypolite Petovan
3b4f5f98f8
Merge pull request #4169 from annando/comment-dfrn
Precaution for incomplete threads
2018-01-04 16:31:16 -05:00
05c8cbc1e1 Precaution for incomplete threads 2018-01-04 20:59:19 +00:00
Hypolite Petovan
58d5d91831
Merge pull request #4168 from annando/comment-dfrn
Commenting to (nearly) every Friendica contact is now possible
2018-01-04 15:12:07 -05:00
Michael Vogel
066b776dcc
Merge pull request #4166 from MrPetovan/task/fix-scrutinizer-issues
[Scrutinizer] Fix unused code issues in boot and include
2018-01-04 20:59:07 +01:00
Michael Vogel
c938623a3d
Merge pull request #4167 from MrPetovan/bug/4155-remove-proxy-oembed
Add settings for OEmbed
2018-01-04 20:57:27 +01:00
0c9a9b6f0c Commenting to (nearly) every Friendica contact is now possible 2018-01-04 19:48:56 +00:00
Hypolite Petovan
d1b3b7fbe4 Review changes
- Remove doc for unused config value
- Restore api_get_user($a) calls
2018-01-04 13:26:09 -05:00
Hypolite Petovan
35a18f6825 Fix unused code in include (second pass) 2018-01-04 12:21:13 -05:00
Hypolite Petovan
3b23f89ca2 Fix unused code in include
- Fix local formatting
- Remove unused variable
- Fix unreached breaks
- Remove commented out code
- Add some documentation
2018-01-04 12:21:13 -05:00
Hypolite Petovan
722782d553 Remove unused parameter in can_write_wall() 2018-01-04 12:21:13 -05:00
Hypolite Petovan
659d637b5a Remove unused param in datetimesel() 2018-01-04 12:19:06 -05:00
Hypolite Petovan
3b4625ebdd Fix unused code in include/api 2018-01-04 12:19:06 -05:00
Hypolite Petovan
d9c6417f5d Remove construct_acl_data() 2018-01-04 12:19:06 -05:00
04589ecd38
Merge pull request #4092 from MrPetovan/task/3954-move-auth-to-src
Move auth to src
2018-01-04 18:06:42 +01:00
Hypolite Petovan
1f805da94f Move ParseUrl to Util namespace 2018-01-04 12:03:15 -05:00
Hypolite Petovan
3494663c15 Add allowed_domain generic function 2018-01-04 11:57:41 -05:00
Hypolite Petovan
6e71a84075
Merge pull request #4160 from annando/community
We now are having a global items page
2018-01-04 11:50:45 -05:00
ade987db47 Updates for community pages do work now 2018-01-04 15:46:56 +00:00
b677bdd4ff Ensuring that only local users can comment on community items 2018-01-04 14:39:47 +00:00
505474e118 Community is always available 2018-01-04 14:09:44 +00:00
f66f631079 We now have a single menu item again 2018-01-04 14:02:04 +00:00
e96dbbe7f7 It's now in a single file 2018-01-04 13:04:12 +00:00
174a1bb54b Commenting on community timelines is now possible 2018-01-04 10:02:56 +00:00
Adam Magness
e37640c44c Move Photos to xrc
Move photos from include to Model\Photo class
2018-01-03 21:01:41 -05:00
243848eec1 Remove some currently unused stuff 2018-01-03 13:34:51 +00:00
3ffea2cd2c We now have a global page for all global entries from the network. 2018-01-03 13:27:43 +00:00
6925299e5a Merge remote-tracking branch 'upstream/develop' into community 2018-01-03 01:15:27 +00:00
Hypolite Petovan
9a3e773a9a Merge branch 'develop' into task/3954-move-auth-to-src 2018-01-02 19:30:41 -05:00
Hypolite Petovan
9ea4fad46c Review: Ensure $arr['network'] is populated in item_store 2018-01-02 08:32:53 -05:00
Hypolite Petovan
3dab04e6cc Review: Removed unused code in include/bbcode 2018-01-02 08:30:15 -05:00
Hypolite Petovan
69df67740c Last minute fix to include/items
- Use defaults() to fix undefined indexes
2018-01-02 08:18:19 -05:00
Hypolite Petovan
d0d4e3813b Fix formatting and PHP notices in include/tags
- Change remaining double quotes into single
2018-01-02 08:11:14 -05:00
Hypolite Petovan
9f04017e27 Quick fix PHP notices in various files
- Remove unused variables
- Fix variable name typos
- Use x() and defaults() to fix undefined index
- Add back uninitialized variables
2018-01-02 08:11:14 -05:00
Hypolite Petovan
861c4c7474 Fix formatting and PHP notices in identity
- Change flow of profile_load() function to return early if $profiledata
and !$user
- Replace remaining double quotes by single
- Add back uninitialized variables in profile_sidebar
2018-01-02 08:09:50 -05:00
Hypolite Petovan
a964129085 Fix formatting and PHP notices in events
- Initialized variables in include/event
- Check for argc before retrieving argv in mod/events
2018-01-02 08:09:50 -05:00
Hypolite Petovan
3069f3b59d Fix formatting and PHP notices in include/conversation
- Remove unused $nickname variable
- Remove unused $comment variable
- Use defaults() in get_responses() to check for array key existence
2018-01-02 08:09:50 -05:00
Hypolite Petovan
66dbef93e3 Fix formatting and PHP notices in bb_ShareAttributes
- Use x() to check for existence of key in $matches
- Remove unused $reldate from template shared_content
2018-01-02 08:09:49 -05:00
Hypolite Petovan
eb1b6605b7 Remove include/oembed and mod/oembed 2017-12-31 20:58:32 -05:00
Hypolite Petovan
e7c53af6fa Add Module\Oembed and Content\OEmbed 2017-12-31 20:58:09 -05:00
Adam Magness
9e6bf79380 Crypto to src
move Crypto to src and Friendica\Util namespace
2017-12-30 11:51:49 -05:00
Hypolite Petovan
c238154a6e Move include/auth to Login::sessionAuth
- Remove include/auth
2017-12-29 21:55:13 -05:00
Hypolite Petovan
2dc598ed5b Move login() to Login module
- Move nuke_session to include/security
- Remove mod/login
2017-12-29 21:55:13 -05:00
Hypolite Petovan
1724dd3841 Make validate_url more intuitive
- Remove the parameter passed by reference
- Add modified url in return value
2017-12-29 21:55:13 -05:00
Hypolite Petovan
e16852c2f5 Replace init_groups_visitor with Group::getIdsByContactId 2017-12-29 21:55:12 -05:00
Hypolite Petovan
09467be02a Fix formatting include/security 2017-12-29 21:55:12 -05:00
69d16d9cfa Don't show the connect link in the profile on the "follow" page 2017-12-29 22:53:08 +00:00
0bcbe6034e Like on uid=0 does work now 2017-12-27 22:21:40 +00:00
9acc2ffc24 Make it easier 2017-12-27 21:51:16 +00:00
1c72a71933 Use another uid for likes 2017-12-27 21:44:22 +00:00
d707c5afcd Merge remote-tracking branch 'upstream/develop' into comment-public 2017-12-26 23:59:32 +00:00
Hypolite Petovan
b39e06ed23
Merge pull request #4136 from Rudloff/feature/update_profile_api
Cleaner way to get user URL in api_account_update_profile
2017-12-26 17:13:58 -06:00
Pierre Rudloff
8b10bfe3a8 Cleaner way to get user URL in api_account_update_profile 2017-12-26 21:50:08 +01:00
Hypolite Petovan
06f32aaaa6
Merge pull request #4130 from Rudloff/feature/update_profile_api
Basic support for account/update_profile API (fixes #4094)
2017-12-25 20:06:34 -05:00
Pierre Rudloff
c490a718ac Update profile in directory when calling api_account_update_profile 2017-12-26 01:09:51 +01:00
Pierre Rudloff
94244024ac Improve conditions in api_account_update_profile 2017-12-26 01:05:12 +01:00
Pierre Rudloff
8c17b96749 Missing return types in docblocks 2017-12-25 21:14:02 +01:00
Pierre Rudloff
ee5301018a Fix typo 2017-12-25 21:12:08 +01:00
Pierre Rudloff
de5dae0751 Basic support for account/update_profile API (fixes #4094) 2017-12-25 21:10:26 +01:00
Hypolite Petovan
75ba84efa8
Merge pull request #4129 from annando/issue-4121
API: Better use "about" instead of "pdesc"
2017-12-25 09:23:46 -05:00
0475fc1fce API: Better use "about" instead of "pdesc" 2017-12-25 05:39:11 +00:00
Hypolite Petovan
c6a00f5ac4
Merge pull request #4126 from annando/issue-4121
Fix for issue 4121 - now the description isn't empty
2017-12-24 21:19:21 -05:00
ba4329da61 Fixed typo 2017-12-24 23:07:14 +00:00
Pierre Rudloff
37eecad8cc Add missing doc in api.php 2017-12-24 15:01:43 +01:00
e848e376b8 Fix for issue 4121 - now the description isn't empty 2017-12-24 11:51:38 +00:00
fc0031f4ba First steps to support public likes 2017-12-24 11:36:30 +00:00
Pierre Rudloff
0305aa2d82 Lint api.php 2017-12-24 00:27:45 +01:00
5afedb28d4 You can now comment on the community page 2017-12-23 07:33:51 +00:00
Hypolite Petovan
1fd62ee626
Merge pull request #4122 from Rudloff/feature/cleanup_api
Various fixes in api.php
2017-12-22 20:04:07 -05:00
Pierre Rudloff
ca73ec5cbb Incorrect return type 2017-12-23 01:36:55 +01:00
Pierre Rudloff
f2758d00fb Unused variable 2017-12-23 01:34:12 +01:00
Pierre Rudloff
da6a7b1fce Typo 2017-12-23 01:32:47 +01:00
Pierre Rudloff
70ab9dc9be Undefined variable 2017-12-23 01:31:29 +01:00
Pierre Rudloff
521d4b09b6 Unused argument 2017-12-23 01:27:17 +01:00
Pierre Rudloff
b4cf27e767 api_format_data can also return an array 2017-12-23 01:25:43 +01:00
Pierre Rudloff
37aef32440 Remove unused variable 2017-12-23 01:23:28 +01:00
Pierre Rudloff
0691d83bbc Typo 2017-12-23 01:23:20 +01:00
1fc3993990 Code cleaning 2017-12-22 23:10:32 +00:00
a309d3c733 Bugfix for the api call for remoteauth 2017-12-22 23:00:49 +00:00
2e022733f6 Standards 2017-12-21 22:54:58 +00:00
Hypolite Petovan
98c2cdb49a
Merge pull request #4111 from annando/comment-public
Preparation for being able to comment every public item
2017-12-21 17:18:14 -05:00
Hypolite Petovan
a539810b21
Merge pull request #4113 from annando/split-profile-name
Split the first name and last name for Diaspora
2017-12-21 07:59:04 -05:00
8c2d455b98 Better english 2017-12-21 04:53:57 +00:00
008c97c570 Split the name in the hcard 2017-12-20 21:15:13 +00:00
f7272be4a8 Reshares are now working 2017-12-20 18:18:25 +00:00
343f22e02f Updating after post does now work 2017-12-20 10:16:25 +00:00
b457ed6876 Preparation for being able to comment every public item 2017-12-19 17:15:56 +00:00
Pierre Rudloff
890cda11ed Only use "@throws" in phpdoc if the function explicitely throws an exception 2017-12-19 14:52:46 +01:00
Pierre Rudloff
e44da4a498 Close DB connection in api_saved_searches_list 2017-12-19 14:42:13 +01:00
Pierre Rudloff
30cb37cda5 Implement saved_searches/list API 2017-12-19 14:22:38 +01:00
Hypolite Petovan
256bf2e888
Merge pull request #4104 from Rudloff/feature/incoming_api
Implement friendships/incoming and users/lookup APIs
2017-12-19 05:39:23 -05:00
Pierre Rudloff
a817a1a070 Throw NotFoundException if results are empty in api_users_lookup 2017-12-19 11:37:55 +01:00
Hypolite Petovan
394e94cbc1
Merge pull request #4103 from Rudloff/feature/profile_colors
Add support for profile_*_color in API
2017-12-19 05:35:36 -05:00
Pierre Rudloff
27646cc4ad Code standards in api_get_user 2017-12-19 11:33:59 +01:00
Hypolite Petovan
b6f60c45aa Fix double login issue
- Removed session existence check in killme
- Changed returned value in session_write for empty data
2017-12-18 23:43:15 -05:00
Pierre Rudloff
35c4a7940a Use dba::select() instead of dba::p() in api_get_user 2017-12-19 01:31:32 +01:00
Pierre Rudloff
e11190b4cf Implement friendships/incoming and users/lookup APIs 2017-12-18 23:51:03 +01:00
Pierre Rudloff
3e9bc61bbf Add support for profile_*_color in API 2017-12-18 21:57:30 +01:00
Hypolite Petovan
7a6706b0f7
Merge pull request #4097 from Rudloff/feature/search_api
Implement search API (fixes #929)
2017-12-18 09:28:33 -05:00
Hypolite Petovan
86922c4821
Merge pull request #4101 from Rudloff/feature/block_api
Implement the blocks/list API
2017-12-18 09:27:35 -05:00
Pierre Rudloff
02733c66f3 Use LIKE instead of REGEXP in api_search 2017-12-18 15:23:15 +01:00
Pierre Rudloff
3e4af13772 Implement the blocks/list API 2017-12-18 15:20:42 +01:00
Pierre Rudloff
5899d821ef Remove useless intval() in api_search 2017-12-18 14:36:06 +01:00
Pierre Rudloff
31d63d929d Use dba::inArray() instead of dba::fetch() in api_search 2017-12-18 14:28:04 +01:00
Pierre Rudloff
ee8468affe Improve api_search()
Use dba::p() instead of q()
Move exception to the beginning
Remove useless GROUP BY
Remove useless protect_sprintf()
2017-12-18 14:00:10 +01:00
Pierre Rudloff
4a5d988d8c Implement search API (fixes #929) 2017-12-18 13:05:27 +01:00
Hypolite Petovan
916236ce2f Fix docblocks types 2017-12-17 15:27:50 -05:00
1fbf6c014b Possible API speed ups for public timeline 2017-12-17 17:47:15 +00:00
Hypolite Petovan
691e4561e6
Merge pull request #4088 from annando/api-external-url
API: Path to post added / "external_url" support
2017-12-17 10:57:46 -05:00
Michael Vogel
9ff4d2d838
Merge pull request #4084 from MrPetovan/task/4071-add-networkpublic_timeline-api
Add statuses/networkpublic_timeline api method
2017-12-17 16:52:17 +01:00
26a89aa6ed API: Path to post added / "external_url" support 2017-12-17 15:16:18 +00:00
Hypolite Petovan
cdd5bd5615 Improve networkpublic_timeline SQL performance
- Use thread.iid for max_id and ordering
2017-12-17 10:06:12 -05:00
995f2d719d Merge remote-tracking branch 'upstream/develop' into issue-4069 2017-12-17 12:10:32 +00:00
3c835ccb22 Alternate fix for issue 4069 2017-12-17 11:11:28 +00:00
Michael Vogel
de56a3a824
Merge pull request #4079 from MrPetovan/task/4069-add-pagination-to-statuses-api
Add pagination to API statuses/friends and statuses/followers
2017-12-17 11:31:01 +01:00
Hypolite Petovan
53e3e49324 Add statuses/networkpublic_timeline api method 2017-12-16 15:41:50 -05:00
Hypolite Petovan
78c053c6b9 Add max_id support for statuses/user_timeline API
- Add documentation
- Improve formatting
2017-12-16 11:34:44 -05:00
Hypolite Petovan
ecde6e456d Add pagination to API statuses/friends and statuses/followers
- Add doc blocks for both API calls
- Remove unused parameters
2017-12-16 10:16:25 -05:00
Hypolite Petovan
179b311978 Remove group_member.uid
- Use contact.uid alternatively
- Use JOIN with group table
2017-12-14 22:47:58 -05:00
cf56de1e77 Merge remote-tracking branch 'upstream/develop' into dbstructure-class 2017-12-14 21:42:26 +00:00
15d42de647 Class moved, changes applied 2017-12-14 21:13:02 +00:00
89ad41aca5 Bugfix: Calls to a renamed function had been changed 2017-12-14 18:06:48 +00:00
Hypolite Petovan
369fcb7bae
Merge pull request #4060 from annando/system-unavailable
"system_unavailable.php" is unavailable now
2017-12-13 17:01:47 -05:00
0457bd995f "system_unavailable.php" is unavailable now 2017-12-13 21:55:19 +00:00
ea10a7c002 Map is moved to the new place 2017-12-13 21:37:34 +00:00
58df57df6e msgclean.php and quoteconvert.php is now integrated into Email.php 2017-12-13 20:36:50 +00:00
Michael Vogel
f58167b000
Merge pull request #4054 from MrPetovan/bug/4041-fix-register
Fix registration
2017-12-13 20:01:03 +01:00
84b85e9198 Removed old include 2017-12-13 07:06:36 +00:00
fc55a4b9c0 The feed moved into the new location 2017-12-13 07:02:52 +00:00
Hypolite Petovan
385a36138a Format valid_email function in include/text 2017-12-12 20:52:28 -05:00
Hypolite Petovan
af6ca96e66
Merge pull request #4053 from annando/useless_function_exists
Removed useless "function_exists" checks
2017-12-12 03:47:54 -05:00
e834f905c6 Issue 3911: Now the categories are really fetched 2017-12-12 05:35:41 +00:00
88ef61df95 Removed useless "function_exists" checks 2017-12-12 04:52:33 +00:00
63b4d84ea9 Fix for duplicate removal in the database structure check 2017-12-11 21:53:52 +00:00
Hypolite Petovan
4fe8dab08d Remove include/group.php 2017-12-09 13:45:54 -05:00
Hypolite Petovan
abdecd2b2f Use new Model methods for groups 2017-12-09 13:45:17 -05:00
Hypolite Petovan
fe89e7760e Fix formatting all around 2017-12-09 13:42:02 -05:00
Hypolite Petovan
bc58e8d3be Rename Model\GlobalContact to Model\GContact 2017-12-07 23:57:56 -05:00
Hypolite Petovan
3772cf7544 Move Object\Conversation to Object\Thread
- Move Object\Item to Object\Post
2017-12-07 23:57:37 -05:00
Hypolite Petovan
a42595a30c Move Object\Contact to Model\Contact 2017-12-07 23:56:12 -05:00
Hypolite Petovan
3fc3e67b70 Separate Object\Photo into Model\Photo and Object\Image
- Renamed a bunch of functions to shorter or clearer names
2017-12-07 23:54:51 -05:00
Hypolite Petovan
4b0f83a12b Finish renaming Object\Item to Object\Post 2017-12-07 23:50:38 -05:00
Michael Vogel
5747cfc79c
Revert "Move Objects to Model" 2017-12-08 05:21:51 +01:00
Hypolite Petovan
cd84bf8963 Rename Model\GlobalContact to Model\GContact 2017-12-07 09:09:28 -05:00
Hypolite Petovan
70d047ba8e Move Object\Conversation to Object\Thread
- Move Object\Item to Object\Post
2017-12-07 09:05:23 -05:00
Hypolite Petovan
18d93cddf6 Move Object\Contact to Model\Contact 2017-12-07 09:04:24 -05:00
Hypolite Petovan
52bddd580c Separate Object\Photo into Model\Photo and Object\Image
- Renamed a bunch of functions to shorter or clearer names
2017-12-07 08:56:11 -05:00
Hypolite Petovan
1cdee234f7
Merge pull request #4028 from annando/mood2
We've got no mood anymore
2017-12-07 07:53:46 -05:00
68ac89da58
Update text.php
Corrected typo
2017-12-07 14:45:37 +07:00
0608efc38a We've got no mood anymore 2017-12-07 07:01:55 +00:00
Adam Magness
71911a6989 Use default value
use the default value parameter correctly!
2017-12-06 15:25:36 -05:00
Adam Magness
cadfef63c4 Update false evaluations
=== false and !== false to is_null where appropriate.
2017-12-06 14:57:06 -05:00
45227a12a6 "item_id" and "spam" aren't used 2017-12-05 22:20:49 +00:00
583914a548 Removed some unused tables and functions 2017-12-05 21:54:13 +00:00
Hypolite Petovan
75c7dc0fa0
Merge pull request #4015 from annando/archive-again
Don't archive "self" contacts
2017-12-05 16:38:48 -05:00
9ffde01fc1 DBClean now works with the conversation table as well 2017-12-05 21:30:38 +00:00
e5c2b7a243 Don't archive "self" contacts 2017-12-05 21:29:33 +00:00
c258df0f0a removed x-permission 2017-12-05 07:13:55 +01:00
Adam Magness
0c48b4188b Non Static calls
update calls to non static
2017-12-04 21:10:54 -05:00
Hypolite Petovan
072edc1949
Merge pull request #4008 from zeroadam/Oauth-#3878
OAuth to src
2017-12-04 18:33:01 -05:00
Adam Magness
d3473f9999 Update use
Forgot to update a use statement.
2017-12-04 18:30:18 -05:00
Adam Magness
9c7b6d9d5f Functions and Standards
Standards and convert to dba functions where possible.
2017-12-04 14:52:04 -05:00
dc32553a1d Better usew the author 2017-12-04 19:50:32 +00:00
360e39ca5b unmark for archival 2017-12-04 19:36:08 +00:00
Adam Magness
b991d8ff77 Separate and move classes
OAuth to src
2017-12-04 14:09:23 -05:00
3bb53967f4 Merge remote-tracking branch 'upstream/develop' into archive-contact 2017-12-04 19:05:53 +00:00
ca41e9154d Archive and unarchive contacts 2017-12-04 19:04:50 +00:00
Adam Magness
4a96f7b458 Pidfile to src
Move pidfile to Friendica\Util namespace
2017-12-04 13:12:22 -05:00
Adam Magness
b1d16fbdf7 Update use statements
update use statements for rename to singular.
2017-12-04 09:04:36 -05:00
Adam Magness
6e5471def3 Rename to singular
Rename and update references. Standards and a require_once.
2017-12-04 09:01:27 -05:00
Adam Magness
2f0da29c75 Features to src
Move Features to class in Friendica\Content namespace. Update function calls and references.
2017-12-04 08:33:49 -05:00
Hypolite Petovan
85f6d6b7ed Remove include/user 2017-12-03 22:29:13 -05:00
6f7510550d NETWORK_MAIL2 was never finished, so remove it as well 2017-12-03 09:19:58 +00:00
adf802474b Zot was never really supported, so it is now removed completely 2017-12-02 21:57:39 +00:00
Michael Vogel
2ca03acb45
Merge pull request #3986 from MrPetovan/task/admin-block-list
Admin remote contact block list
2017-12-02 22:09:04 +01:00
Adam Magness
2b121779a6 Salmon move to src
Salmon class, update function name and function calls. Some standards as well.
2017-12-02 09:32:45 -05:00
Adam Magness
9a4e741d1a Review Changes
renamed some functions and adjusted corresponding calls.
2017-12-01 21:05:06 -05:00
Adam Magness
e90b0748aa Code Cleanup
Standards clean up
2017-12-01 18:13:39 -05:00
Adam Magness
f21feb975d Require Cleanup
Remove instances of require_once for email.php
2017-12-01 14:57:13 -05:00
Adam Magness
6008e3df11 Email to src
Create Email class and update/rename functions and function calls.
2017-12-01 14:41:27 -05:00
Hypolite Petovan
ff459441cf
Merge branch 'develop' into task/admin-block-list 2017-12-01 00:48:13 -05:00
Hypolite Petovan
052ba729d7 Improved translation functions
- Add built-in vsprintf to t()
- Add built-in sprintf to tt()
2017-12-01 00:35:40 -05:00
Hypolite Petovan
84418860bd Improve dba
- Add dba::count
- Add support for LIMIT X,X
2017-12-01 00:34:54 -05:00
Hypolite Petovan
0ae6f571da
Merge pull request #3982 from zeroadam/Photo-#3878
Photo to src
2017-11-30 20:33:48 -05:00
Adam Magness
0373056448 Review and Use statements
use statements and review changes.
2017-11-29 17:29:11 -05:00
0982b0413b Bugfix for "Call to undefined function best_link_url()" 2017-11-29 21:27:39 +00:00
Adam Magness
0091d318e5 Function names
Update function names and corresponding function calls
2017-11-29 12:17:12 -05:00
Adam Magness
54827e7fed Photo to src
Move Photo to Friendica\Object namespace and replace require_once statments with use statements.
2017-11-29 07:52:27 -05:00
8bffee43b3 Threads are now always enabled. 2017-11-28 18:54:39 +00:00
7eee227698 missing false for the tagcloud settings 2017-11-27 19:20:43 +01:00
Michael Vogel
3f448d9a42
Merge pull request #3970 from MrPetovan/task/3942-add-user-authenticate
Migrate password hashing Part 1: Add User::authenticate
2017-11-27 15:14:36 +01:00
Hypolite Petovan
ced1063a10 Improved dba calls
- Removed intval calls
- Used boolean values for params when relevant
2017-11-27 08:17:56 -05:00
9612496e9e The function "template_escape" doesn't exist anymore. 2017-11-27 06:44:49 +00:00
Hypolite Petovan
2a60146a43 Revert "Add new legacy password field"
This reverts commit 2236f60cfa.
2017-11-26 15:45:59 -05:00
Hypolite Petovan
2196a0577b Remove unused upubkey and uprvkey from queries
- Switched queries to new dba::* functions
2017-11-26 14:55:47 -05:00
Hypolite Petovan
ec6f5193e2 Switch to User::authenticate
- Removed hash('whirlpool') to check password
2017-11-26 14:46:08 -05:00
Hypolite Petovan
90a8ae2cb8 Fix formatting
- include/auth.php
- include/oauth.php
- include/user.php
- mod/removeme.php
- src/Worker/Queue.php
2017-11-26 14:18:45 -05:00
Hypolite Petovan
3fbf2e3bcf
Merge pull request #3966 from rabuzarus/20171122_-_port_tagcloud
A tag cloud widget for the profile page
2017-11-26 11:16:14 -05:00
rabuzarus
7d8370a178 tag cloud: fix query 2017-11-26 16:24:26 +01:00
rabuzarus
ac6b191976 tag cloud: use dba for db request 2017-11-26 16:14:16 +01:00
Hypolite Petovan
e82bbc75cd
Merge pull request #3963 from annando/default-features
Additional features should now work with the forumlist as well
2017-11-26 08:51:14 -05:00
e4995dbad5 Good looking and better performance 2017-11-26 13:12:54 +00:00
Hypolite Petovan
d5c38b9fc9 Add odd number of character support to random_string() 2017-11-26 07:57:29 -05:00
6cb637e8ab Default features should now work with the forumwidget again 2017-11-26 11:31:07 +00:00
rabuzarus
2844947f5c tag cloud: add doxygen docu 2017-11-26 04:33:21 +01:00
Hypolite Petovan
d38c040d50 Update random_string with random_bytes
- Updated update.php
2017-11-25 21:15:50 -05:00
Hypolite Petovan
2236f60cfa Add new legacy password field 2017-11-25 18:05:32 -05:00
rabuzarus
4224209497 Merge develop into 20171122_-_port_tagcloud
Conflicts:
	include/features.php
2017-11-25 23:41:20 +01:00
ba184f9038 Show the preview picture even if the posting contains the huge image 2017-11-25 16:00:51 +00:00
3cb906c420 Issue 3911: Fetch keywords for feeds 2017-11-25 11:59:20 +00:00
4ddcc77c77 Always show small preview pictures, not the big ones 2017-11-25 10:07:49 +00:00
3046455b1c Some posts weren't shown 2017-11-24 21:39:12 +00:00
5a0f33dca0
Merge pull request #3939 from annando/fix-sql
Fix some SQL problems
2017-11-24 09:53:36 +01:00
4a4be4d664 Fix some SQL problems 2017-11-24 07:44:02 +00:00
Hypolite Petovan
9943393b71 Remove include/HTTPExceptions.php 2017-11-23 23:52:23 -05:00
Hypolite Petovan
1f4fc87fd9 Use new HTTPExceptions in API 2017-11-23 23:48:15 -05:00
Hypolite Petovan
5ec011c7be
Merge pull request #3937 from annando/additional
Additional features still had got problems
2017-11-23 20:43:46 -05:00
da5857529f Additional features still had got problems 2017-11-23 20:41:35 +00:00
Adam Magness
609a4de5d0 src Standards
This basically completes coding standards changes for the entire src directory, with the exception of App.php
2017-11-23 14:01:58 -05:00
rabuzarus
f1b86d31ca tags-cloud: respect remote perms 2017-11-23 03:43:39 +01:00
rabuzarus
19afabd268 tags: possibility to filter posts for tags and profile owner (profile) 2017-11-23 00:59:20 +01:00
ffceb601d5 Some handling for empty parameters 2017-11-22 22:50:45 +00:00
rabuzarus
59ae5633ec tag-cloud: some polishing + remove authors (we don't use it at the moment) 2017-11-22 23:18:01 +01:00
rabuzarus
d7d653aab6 port tag cloud widget from hubzilla 2017-11-22 21:29:07 +01:00
c6c180e8b9 Some more changed calls 2017-11-22 09:11:44 +00:00
7c3fd2adb5 Some more replaced old database functions 2017-11-22 07:21:19 +00:00
Hypolite Petovan
d99a7efd90
Merge pull request #3929 from annando/remove-old-mysql
No obsolete mysql_* anymore
2017-11-21 16:06:22 -05:00
723b40eea4 No obsolete mysql_* anymore 2017-11-21 21:00:11 +00:00
Adam Magness
7cee150868 ForumManager to src
ForumManager moved to Friendica\Content namespace
2017-11-21 07:20:22 -05:00
Adam Magness
1726ededac Emailer to src
Move emailer to src Friendica\Util namespace
2017-11-20 15:37:30 -05:00
Adam Magness
ddacbf2c13 XML class standards
updated the xml class for PSR-2
2017-11-20 12:56:31 -05:00
Michael Vogel
2ee928b081
Merge pull request #3921 from MrPetovan/issue/3878-move-Contact-to-src
Move Contact to src
2017-11-20 16:53:29 +01:00
Hypolite Petovan
b85c94a60d
Merge branch 'develop' into issue/3878-move-Contact-to-src 2017-11-19 18:09:14 -05:00
0c35dff73d One script needed to be moved, one script was obsolete 2017-11-19 22:47:12 +00:00
Hypolite Petovan
81647cefed
Merge pull request #3920 from annando/scripts
The poller is now the worker and we have a "scripts" folder
2017-11-19 17:25:14 -05:00
Hypolite Petovan
898fe2db1e Code cleanup
- Remove extraneous use statements
- Format require_once
2017-11-19 17:06:18 -05:00
Hypolite Petovan
5ee728972e Remove include/Contact.php
- Remove all mentions to include/Contact.php
2017-11-19 17:05:21 -05:00
Hypolite Petovan
ec02af593d Change called method names
- Add GlobalContact::getRandomUrl
- Rename Contact::getIdForURL
- Rename Diaspora::sendUnshare
- Remove unused parameter $self in Contact::terminateFriendship
2017-11-19 17:03:39 -05:00
Hypolite Petovan
b92fc24ff0 Add Contact Object
- Add Profile Object
- Add User Model
- Add use statements
2017-11-19 16:55:28 -05:00
Hypolite Petovan
f43aaf5227 Move Item and Conversation from Core to Object
- Move BaseObject from Core\ to Friendica\
2017-11-19 16:50:49 -05:00
920160cb28 The poller is now the worker 2017-11-19 21:47:21 +00:00
cabfcfc904 We now are having a "scripts" folder 2017-11-19 21:21:54 +00:00
Adam Magness
d9e9cbe753 Coding Standards
A few updates for coding standards
2017-11-19 15:32:54 -05:00
6a1885a46a Additional features can now be changed again 2017-11-19 19:58:11 +00:00
Hypolite Petovan
51a29d381f
Merge pull request #3917 from annando/worker-again
All workers in /include now moved to /src/worker
2017-11-19 14:51:12 -05:00
8cd21269ff The last of the big workers moved ... delivery and notifier 2017-11-19 18:59:55 +00:00
5108115fc1 Now PubSubPublish moved as well 2017-11-19 17:36:20 +00:00
2de457489f "CreateShadowentry" and "ProfileUpdate" now moved as well 2017-11-19 16:59:37 +00:00
98686e9091 Queue.php is now moved as well 2017-11-19 16:35:45 +00:00
501514bd54 expire and gprobe now moved as well 2017-11-19 16:25:13 +00:00
Hypolite Petovan
cfd5e5d475 Add orphan items as children to their top-level post
- Make get_item_children deplete the item list
2017-11-19 10:42:00 -05:00
Hypolite Petovan
104a1d7fd3 Move ITemplateEngine to src
- Fix method name format
2017-11-19 10:22:18 -05:00
Hypolite Petovan
4aa003f43f Use constant instead of hardcoded string for ACTIVITY_POST 2017-11-19 08:41:33 -05:00
Hypolite Petovan
0fe4233569 Improve documentation with brief key 2017-11-19 08:41:16 -05:00
Hypolite Petovan
81c3ddd1fb Add smart_flatten_conversation function
- Fix doc
- Fix formatting
- Update conv_sort with smart threading
2017-11-19 00:57:06 -05:00
1f28cbd2c6 And now DiscoverPoCo.php 2017-11-18 11:02:46 +00:00
01362461cf poller.php is cleaned up, unneeded stuff has been removed 2017-11-18 11:01:01 +00:00
925d2d2383 Directory moved 2017-11-18 07:59:30 +00:00
2515d02e6d SpoolPost moved 2017-11-18 07:44:38 +00:00
13f899542d dbupdate now moved as well 2017-11-18 07:31:33 +00:00
659748d27c include/shadowupdate.php wasn't used at all 2017-11-18 07:14:39 +00:00
04cc9bb4de CronJobs moved as well 2017-11-18 06:22:41 +00:00
f2e792662f DBClean moved as well 2017-11-18 05:45:44 +00:00
3687ef2f8c Another worker process moved 2017-11-17 22:16:34 +00:00
Adam Magness
d127d06388 Item to src
object/Item moved to Friendica\Core namespace.
2017-11-16 16:39:42 -05:00
Adam Magness
7c00401c66 Conversation to src
object/Conversation moved to Friendica\Core namespace.
2017-11-16 16:39:42 -05:00
Adam Magness
86073ddfd1 Removed require statement
There didn't seem to be any ostatus function calls in this file. Running with it commented out produced no errors.
2017-11-16 07:32:31 -05:00
Adam Magness
f3c8af485f Require statement
Not sure if this is needed or not, there are no ostatus:: calls in this file.
2017-11-15 23:11:00 -05:00
Adam Magness
cd12de46f8 OStatus moved to src
OStatus moved to Friendica\Protocol namespace. References and function calls updated.
Related to #3878
2017-11-15 23:09:11 -05:00
0aee6d383a Now there are four more ... 2017-11-15 21:12:33 +00:00
33e98d6264 Moved some workers in their new habitat 2017-11-15 20:59:42 +00:00
Adam Magness
9e90589c21 gsFunctions renamed
gsFetchUsers -> fetchGsUsers
gsDiscover -> discoverGsUsers
2017-11-15 12:02:08 -05:00
Adam Magness
259f91caa9 PortableContact created
Create PortableContact and remove socgraph, update references, and calls
2017-11-15 10:53:16 -05:00
Adam Magness
47db624105 GlobalContact created
Moved DirSearch and GlobalContact related functions to Friendica\Model namespace
2017-11-15 09:47:49 -05:00
9576f6743d Command back ... 2017-11-14 22:13:33 +00:00
405753d1c3 cron.php is reworked, other worker files had been moved temporarily 2017-11-14 21:50:16 +00:00
476facde61 Onepoll moved as well 2017-11-12 18:50:35 +00:00
1aa8f56662 The cronhooks are now changed 2017-11-12 07:24:49 +00:00
Adam Magness
4d146acf90 Smilies to src
Move Smilies to Friendica\Content namespace.

Related to #3878
2017-11-11 07:21:15 -05:00
731ec347b1 Removed old template parser 2017-11-11 09:26:23 +00:00
6ae4396299
Merge pull request #3898 from annando/show-friends
The friend contact block wasn't displayed in the profile
2017-11-11 08:47:47 +01:00
3764dc2bf6 Some more code improvements, removed deprecated functions 2017-11-11 06:42:39 +00:00
cfdbd07628 The friend contact block wasn't displayed in the profile 2017-11-11 05:23:28 +00:00
Adam Magness
bc49fc974c Capitalized XML
Acronym classes should be capitalized
2017-11-10 07:45:33 -05:00
Adam Magness
f245bc8359 Move xml to namespace
Relocate xml from include to src
Related to #3878
2017-11-10 07:18:24 -05:00
rabuzarus
10f385efc4 pure comments shouldn't use doxygen style 2017-11-09 19:37:05 +01:00
Adam Magness
bc65cc2af1 Revert to require_once
Keeping these statements as they were.
2017-11-09 12:26:32 -05:00
Adam Magness
1565061454 Remove old cache file
Now that all references are updated, remove old cache.php
2017-11-09 11:49:27 -05:00
Adam Magness
06c3af9b60 Move Cache to src
relocate the cache class to Friendica\Core namespace
2017-11-09 11:05:18 -05:00
Hypolite Petovan
acd65aade1 Switch to new php-encryption library version
- Remove references to library/ files
- Add namespace to library classes
2017-11-09 02:21:37 -05:00
Adam Magness
aa13302bbc Review updates
Documentation and yet another use statement
2017-11-08 08:37:03 -05:00
Adam Magness
4ca68c7af0 Class file relocations
Issue #3878
2017-11-08 08:37:03 -05:00
Adam Magness
6189f6c8e7 Relocate class files from /include to /src/
dbm, Diaspora, dfrn, and NotificationsManager moved to namespace. Includes and references in files updated.
2017-11-08 08:36:48 -05:00
76f73c7236 And some more places 2017-11-07 22:15:59 +00:00
5a6fa4ae87 Some more 2017-11-07 21:53:11 +00:00
ab73dbf346 Here as well 2017-11-07 21:48:41 +00:00
9860488eec null is not false 2017-11-07 21:41:38 +00:00
Adam Magness
a782ab50f9 Correct deletion
Bring back mod/probe.php and delete include/probe.php as intended.
2017-11-07 12:31:32 -05:00
Adam Magness
8522c47353 Remove Includes
Removed references to include/config.php and include/probe.php and deleted the respective files.
2017-11-07 12:14:03 -05:00
Adam Magness
59d6ae63b1 Spelling correction
delete is not spelled delele!
2017-11-07 11:05:16 -05:00
Adam Magness
b995e858e6 Review changes
Replacements for ::delete() as well as changes to include use statements.
2017-11-07 09:12:01 -05:00
Adam Magness
0dfa57948f Issue-#3873
Replace deprecated functions with new syntax.
2017-11-07 06:24:39 -05:00
Hypolite Petovan
c847a2f9cc
Merge pull request #3874 from tobiasd/20171009-checkversion
check upstream version
2017-11-06 13:59:49 -05:00
3b15b19e62 switches, no ifs 2017-11-06 18:57:40 +01:00
64066592a4 some debug logging 2017-11-06 18:27:29 +01:00
143e7fc6b7 dont use the entire url as option 2017-11-06 18:05:42 +01:00
1f9b52f2bf code corrections 2017-11-06 17:45:33 +01:00
930309d2ec Merge remote-tracking branch 'upstream/develop' into worker-class 2017-11-05 17:23:53 +00:00
70c08dee1d Some more improvements 2017-11-05 15:28:55 +00:00
Hypolite Petovan
cff1de034f Remove reference to languagedetect in library folder 2017-11-05 09:00:34 -05:00
478e363967 proc_run was replaced 2017-11-05 12:15:53 +00:00
da212a28a2 New worker class that does all the work 2017-11-05 10:33:46 +00:00
3c60e6f183 missing value 2017-11-05 07:10:46 +01:00
rabuzarus
3b4f72da93 events: better comment description 2017-11-04 16:41:06 +01:00
rabuzarus
86d3adaa50 events: use best_link_url() and zrl() for the author_link (author link as magic-link) 2017-11-04 16:38:21 +01:00
d2dc61c246 Logging for ejabberd authentication is now done via syslog 2017-11-04 08:36:42 +00:00
22efc4833c call checkversion from cron jobs, LOW prio 2017-11-04 08:14:56 +01:00
d739fe2503 Issue 3860: Enhanced support of "!" for forums 2017-11-03 05:07:19 +00:00
Hypolite Petovan
da42b91096
Merge pull request #3858 from annando/direct-forum-post
Forum posts with "!" are now created directly as forum post
2017-11-02 16:39:20 -04:00
c105a67cd9 Issue 3857: There is the possibility of a bad handling of dislikes 2017-11-02 20:29:18 +00:00
a2f9ea2642 Forum posts with "!" are now created directly as forum post 2017-11-02 20:15:14 +00:00
6949ab25f7 A single mistake 2017-11-02 11:17:10 +00:00
5326b30ad1 Edits are now possible - but unsuccessful on the receiver side 2017-11-02 07:48:41 +00:00
01af4435c8 Now the public entry is created 2017-11-02 05:46:23 +00:00
82321114ab If a post is dedicated to a single forum then it will be rewritten to a forum post 2017-11-01 23:20:43 +00:00
ba6cb7bacf Merge remote-tracking branch 'upstream/develop' into forum-exclamation 2017-10-31 20:02:36 +00:00
Michael Vogel
92a17643c9
Merge pull request #3848 from annando/session-destroy
Bugfix: Avoid dba error message
2017-10-31 21:00:31 +01:00
5222606602 Use the exclamation mark to address forums as well 2017-10-31 19:33:23 +00:00
ba627c740f Bugfix: Avoid dba error message 2017-10-31 19:28:39 +00:00
22aa7f9f07
Merge pull request #3846 from annando/session-destroy
Avoid warning "Failed to write session data"
2017-10-31 18:37:45 +01:00
4b0f8dad49 Some more onepoll bautification 2017-10-31 16:18:48 +00:00
7566464a58 Avoid warning "Failed to write session data" 2017-10-31 16:03:01 +00:00
a492a13aeb onepoll.php is reworked 2017-10-31 13:32:11 +00:00
9804e65d18 Bugfix: not complete a url with parameter or fragment 2017-10-31 06:05:52 +00:00
404ed27fb4
Merge pull request #3830 from annando/dba-pdo-connected
DBA: The "connected" check for PDO didn't work.
2017-10-29 08:11:27 +01:00
83bbbd1fe3 Issue 3828: Better handling if query doesn't return a value 2017-10-29 06:49:43 +00:00
1cbe27de12 DBA: The "connected" check for PDO didn't work. 2017-10-29 06:31:01 +00:00
0b7e8b7fb4 Hubzilla doesn't return the handle in the hcard 2017-10-27 06:17:24 +00:00
b8a8bb21d0 Merge pull request #3825 from annando/index-length
Bugfix for "Index column size too large"
2017-10-25 07:16:45 +02:00
6396f92d9b Bugfix for "Index column size too large" 2017-10-25 04:44:45 +00:00
fabrixxm
a83b051003 Order result of api/statues/friends by nickname 2017-10-24 21:29:43 +02:00
Hypolite Petovan
0c347d1466 Merge pull request #3819 from annando/photo-rework
Better handling for GIF even, if not supported by the graphics library
2017-10-23 13:04:52 -04:00
e40c3a9d7c Static public is public static 2017-10-23 14:49:56 +00:00
Hypolite Petovan
476d7d9533 Merge pull request #3813 from annando/remove-old-stuff
Removed stuff that was never used or isn't used anymore
2017-10-23 10:00:16 -04:00
d39b0584f0 Merge pull request #3818 from annando/structure-temp
DBStructure: Better handling of temp table
2017-10-23 11:47:46 +02:00
rabuzarus
2332d9f62a Merge pull request #3820 from annando/contact-posts
The selection between posts from forums and other users had a problem
2017-10-22 14:09:18 +02:00
596bb36151 Bugfix: The selection between posts from forums and other users had a problem 2017-10-22 09:02:54 +00:00
Michael Vogel
2c55d9f3ce Merge pull request #3817 from rabuzarus/20171019_-_fix_some_html_violations
fix some HTML violations in frio
2017-10-22 07:48:06 +02:00
b513a597c8 Static methods should be called statically 2017-10-21 16:13:25 +00:00
405b6cf4ef DBStructure: Better handling of temp table 2017-10-21 14:29:55 +00:00
rabuzarus
f2d51737eb fix some HTML violations in frio 2017-10-20 15:21:42 +02:00
rabuzarus
184bfc722d fix #3812 - some brocken parts in the display of events (default template) 2017-10-19 14:16:39 +02:00
69afe50345 Removed stuff that was never used or isn't used anymore 2017-10-19 07:41:15 +00:00
0695fa699c Removed "service class" functionality 2017-10-18 21:44:27 +00:00
1cff94d476 Bugfix: Item were stored before the expiration date 2017-10-18 18:01:08 +00:00
Michael Vogel
d60f96f0e1 Merge pull request #3797 from rabuzarus/20171015_-_duplicate_event
add event action: duplicate events
2017-10-18 18:57:58 +02:00
4744d6bf84 we now provide a feed for the conversation 2017-10-18 06:25:22 +00:00
e38da9a3a5 And some further refinements 2017-10-17 11:39:09 +00:00
9c5cd476dd Better rule to replace content 2017-10-17 09:58:29 +00:00
7c658439da Removed unneeded stuff 2017-10-17 09:14:10 +00:00
aa284a2ae6 Enhance feed information 2017-10-17 09:10:19 +00:00
5498f04ffa OStatus: Auto subscribe to forum accounts 2017-10-17 04:45:38 +00:00
3eed3316ea Some more camels 2017-10-16 20:59:16 +00:00
b521215383 Camels aren't studly 2017-10-16 20:57:53 +00:00
f127d65de9 Added spaces 2017-10-16 20:55:37 +00:00
2a28591415 Complete incomplete URL during feed import 2017-10-16 20:31:13 +00:00
cadc8aa6e8 Merge pull request #3787 from rabuzarus/20171013_-_format_event_in_stream
event items are now more themeable in the networkstream
2017-10-16 11:29:43 +02:00
3fd0210681 Merge pull request #3793 from annando/parse-fix
Special treatment for HTTP Code 416
2017-10-16 07:34:41 +02:00
0a1554e08b Special treatment for HTTP Code 416 2017-10-16 03:14:32 +00:00
74af893b87 Merge pull request #3791 from annando/parse-fix
Bugfix: Range checking with ParseUrl made problems
2017-10-16 00:37:05 +02:00
08f461f70c Bugfix: Revive dead contacts 2017-10-15 19:34:15 +00:00
1506886947 Bugfix: Range checking with ParseUrl made problems - we now use the standard 2017-10-15 19:29:58 +00:00
rabuzarus
4584670af4 add event action: duplicate events 2017-10-15 17:30:28 +02:00
rabuzarus
dcbf4d6d11 fix event html construction (fixes #2646) 2017-10-13 20:03:47 +02:00
rabuzarus
553428d1b1 event items are now more themeable in the networkstream.
The event description stays the same - but the theme developer can provide an template how the other event data should be organized and look
2017-10-13 19:42:27 +02:00
e091a610d7 Fixed indention level 2017-10-13 16:24:38 +00:00
b31c6413fe Can be private 2017-10-13 15:51:57 +00:00
9f2196aa1a Parameter should fit ... 2017-10-13 15:48:59 +00:00
0a45f40c9d Diaspora: We now support the receiving of account migration messages 2017-10-13 15:32:10 +00:00
rabuzarus
0882b2df97 Merge pull request #3779 from annando/event-data
export event data for display purposes
2017-10-13 13:06:46 +02:00
b31b29c557 Now it could work 2017-10-13 09:41:01 +00:00
2b80bf4683 Improved documentation 2017-10-13 09:26:07 +00:00
09020192d6 Diaspora: Support account migration 2017-10-13 09:22:05 +00:00
eeec1ea163 We should take the event-id as well 2017-10-11 20:45:03 +00:00
42a76bced9 export event data for display purposes 2017-10-11 19:51:18 +00:00
225eea2ca6 Avoid undefined class variables 2017-10-11 14:52:08 +00:00
a29b7e7153 "dba" is now a static class 2017-10-11 12:56:36 +00:00
dbcd1d1ae3 Additional check if the database object is initialized 2017-10-10 22:25:38 +00:00
63e02eb57f Checks if the database variable is initialized 2017-10-10 22:18:57 +00:00
763838c78d OStatus: Better handling of changed nicknames 2017-10-10 09:13:37 +00:00
4c75c59039 Merge pull request #3772 from annando/relocate-ignore
Process "relocate" messages even if we are ignoring a contact
2017-10-09 05:16:32 +00:00
09af73168c Process "relocate" messages even if we are ignoring a contact 2017-10-09 05:02:50 +00:00
495b639e55 .com -> .ca 2017-10-08 10:22:29 +02:00
5d0e7d24ba When showing posts for a contact we have to tread forums in a special way 2017-10-08 05:20:09 +00:00
67e57a83df Feeds are now trimmed before importing 2017-10-07 18:35:10 +00:00
c6dbbe21b4 Preparation for the possibility to globally block contacts 2017-10-07 09:52:43 +00:00
ceb0dda486 Fixes the not changed "addr" entry when an account is imported 2017-10-07 05:20:46 +00:00
1870f942d3 Fix SQL error when changing the SSL paths 2017-10-06 19:25:04 +00:00
071946fa78 Revert "Update languagedetect library" 2017-10-05 11:58:18 +02:00
c22920edba Merge pull request #3743 from MrPetovan/task/update-languagedetect
Update languagedetect library
2017-10-05 08:49:17 +00:00
a8a7f4a76d Better handling of blocked contacts in OStatus 2017-10-03 20:52:24 +00:00
c33aa2ccee Diaspora: Reshares of reshares sometimes had problems 2017-10-02 19:00:33 +00:00
fffc360c6a Detect the hostname when the URI is in the format data@host.tld 2017-09-30 21:39:32 +00:00
3354f01ed5 Doxygen and bugfix 2017-09-30 17:42:03 +00:00
2971501f63 The direct structure call is now only executed when called via the poller.php 2017-09-30 17:12:27 +00:00
bd88179419 Add additional checks for the worker 2017-09-30 11:19:46 +00:00
42a8f27034 Semaphore lock deactivated for PHP lower 5.6.1 2017-09-30 07:51:09 +00:00
98a3e012f8 Reliably show posts from contact 2017-09-28 06:01:31 +00:00
Hypolite Petovan
ba1975ac3a Remove references to the library/langdet folder 2017-09-27 22:40:58 -04:00
8d95106b9d XML parsing is more tolerant now 2017-09-25 21:34:44 +00:00
03c9e22334 Poller: A limit of 1 seems to be better 2017-09-25 19:33:41 +00:00
1aafb80743 Added log information 2017-09-25 06:04:40 +00:00
66515ed85e Diaspora: Posts from Diaspora relais are transmitted the old way 2017-09-25 04:24:47 +00:00
9d7ab9d941 OStatus: Thread completition hadn't worked for (some) Mastodon systems 2017-09-24 15:31:09 +00:00
bcdccac39c Merge pull request #3729 from annando/plaintext-again
And another plaintext correction :)
2017-09-24 16:00:39 +02:00
2b3bc54049 And another plaintext correction :) 2017-09-24 13:47:31 +00:00
ff6f937f2b Author check works now 2017-09-24 13:27:35 +00:00
80d787d990 Bugfix: Diaspora retractions not always worked 2017-09-24 12:02:32 +00:00
e6f80b3bc1 Merge pull request #3726 from annando/plaintext
Improved type detection
2017-09-24 09:48:36 +02:00
17f2928535 Improved type detection 2017-09-24 06:36:03 +00:00
d6d1ee9112 Merge pull request #3724 from annando/plaintext
Better content detection for posts to Twitter
2017-09-24 07:23:47 +02:00
fc1bfe043b The "else" case was only confusing 2017-09-23 23:15:04 +00:00
d72e6b2c82 Bugfix for better mail import 2017-09-23 22:53:44 +00:00
aeb6e53d02 Better content detection for posts to Twitter 2017-09-23 20:13:09 +00:00
7360945d8a Merge pull request #3722 from annando/diaspora-plink
The plink in Diaspora posts now links to the correct place
2017-09-23 17:41:57 +02:00
8983dcaa77 Improvements for following/unfollowing of Diaspora and OStatus 2017-09-23 14:48:27 +00:00
e8a2c68647 The plink in Diaspora posts now links to the correct place 2017-09-23 08:52:06 +00:00
cb5b155083 Bugfix: The API picture upload created an invalid link 2017-09-20 21:47:12 +00:00
3e8dc38180 Merge pull request #3716 from annando/bugfix-mail
Bugfix: Mails weren't created
2017-09-19 15:10:22 +02:00
fdc010bb1b Bugfix: Mails weren't created 2017-09-19 12:59:24 +00:00
b79c3241c6 Directly serve atom+xml if requested 2017-09-19 11:53:19 +00:00
5ed24954f0 Bugfix: Pleroma was detected as Mastodon 2017-09-18 06:09:18 +00:00
926314a24c gcontact is now updated with the new database functions as well 2017-09-17 08:13:10 +00:00
8d4736c942 OStatus: We can now process delete messages / better account detection 2017-09-17 08:01:22 +00:00
af44e96fc9 Merge pull request #3710 from annando/diaspora-retraction
Diaspora: Sending retractions only worked for posts
2017-09-16 21:24:50 +02:00
ef8ad9f1ed Diaspora: Sending retractions only worked for posts - nor for comments or likes 2017-09-16 18:23:24 +00:00
0982a30c89 Improvement for PR 3705: The detection has to be changed here as well 2017-09-16 17:22:22 +00:00
0eb92bf12a Unused functions removed 2017-09-16 05:09:14 +00:00
dfd48dd6f6 "qu" is no more 2017-09-15 21:00:39 +00:00
6d7ececc42 Bugfix for pictures that weren't stored / reworked database calls 2017-09-15 19:41:30 +00:00
0384e875a2 Merge pull request #3702 from annando/new-dba
The old database function is now replaced with a wrapper
2017-09-15 08:31:25 +02:00
f8d34e35e7 "exists", "select" whre is the difference? 2017-09-15 06:15:25 +00:00
88ada98245 Added documentation 2017-09-15 06:07:34 +00:00
ad3566aeaa Merge pull request #3704 from annando/ostatus-improved
OStatus: Only fetch items that don't exist in the system
2017-09-15 07:18:14 +02:00
cf90e3571f Merge remote-tracking branch 'upstream/develop' into new-dba 2017-09-15 03:17:40 +00:00
cd16155c96 Only warn when there are arguments at all 2017-09-15 03:10:04 +00:00
f29e21eb5c We now avoid prepared statements without an argument 2017-09-15 03:00:38 +00:00
d10eaefaa9 Improved regular expression for the Diaspora link detection 2017-09-14 22:04:37 +00:00
87fffde80e Documented some unknown verbs 2017-09-14 20:40:05 +00:00
9dfb9c1c45 Only fetch items that don't exist in the system 2017-09-14 19:23:14 +00:00
9468b7427d Allow replies as well 2017-09-14 10:00:45 +00:00
641e41067e Merge pull request #3701 from annando/issue-3700
Issue 3700: Security and Privacy related Headers
2017-09-14 10:28:03 +02:00
4b99d122dd Added explanation 2017-09-14 05:48:43 +00:00
7a3bb02f11 Issue 3700: Security and Privacy related Headers 2017-09-14 05:40:23 +00:00
c6ceae5225 The old database function is now replaced with a wrapper 2017-09-14 05:19:05 +00:00
e18a037fb2 API: Improvements for clients with bad HTML support 2017-09-14 05:16:23 +00:00
519a8807f1 Added documentation 2017-09-11 22:15:16 +00:00
ec929d8207 Fetch the own single post if we are processing a feed of multiple entries 2017-09-11 12:44:37 +00:00
8e17be7225 Store conversation data 2017-09-10 21:56:05 +00:00
b847f63e2a Added logging 2017-09-10 08:27:24 +00:00
bdf490e2fa Added missing function 2017-09-10 07:58:14 +00:00
21a630ebae Added documentation 2017-09-10 07:52:07 +00:00
746169eabf Improve comparabilty 2017-09-10 07:29:24 +00:00
c98c157efe Only some tabs 2017-09-10 07:23:14 +00:00
4b403e4fe2 OStatus: Reworked import 2017-09-10 07:21:23 +00:00
52b12fccc9 OStatus: Attached pictures now show up in repeated posts as well. 2017-09-09 07:43:50 +00:00
637eb0bfb4 Bugfix: Mails weren't sent 2017-09-08 15:14:33 +00:00
c44448dd57 We should reset the session variable 2017-09-08 08:50:08 +00:00
a5a4f53287 This is a better place 2017-09-08 07:08:06 +00:00
3c6d83acd9 Remote self should now finally trigger all addons 2017-09-08 07:00:38 +00:00
6e196a6afd Diaspora will introduce "like on comment" so we doing it as well 2017-09-08 05:36:00 +00:00
c3eaf336dc Removed code 2017-09-07 15:48:25 +00:00
6e670df80f OStatus: Better attachment handling for pictures 2017-09-07 15:34:50 +00:00
66968efb9a Logger date format is now ISO8601 compatible 2017-09-06 21:13:06 +00:00
c35a43bcb8 "remote-self" hadn't worked well with addons 2017-09-06 06:02:26 +00:00
cb8581b29a Support for server independant Diaspora style links 2017-09-06 04:55:36 +00:00
65f1bcb780 Merge pull request #3673 from annando/contact-updating
Better updating of contacts
2017-08-30 22:34:01 +02:00
1cc50a80f4 Only update if there is a change 2017-08-30 19:33:16 +00:00
0083c16e87 Better updating of contacts 2017-08-30 18:05:41 +00:00
dbaed91a75 Bugfix: Repeating of posts generated a SQL error 2017-08-30 17:55:23 +00:00
1893c3df16 Pleroma-Servers are now detected and displayed in the statistics 2017-08-29 16:40:08 +00:00
83ce42172b Don't add "redir" links on mentions 2017-08-27 09:56:41 +00:00
12ae59dba3 No linefeeds 2017-08-27 07:12:27 +00:00
d8acb62ba6 Small formatting issue 2017-08-27 07:02:44 +00:00
a36c8a0173 Possibly Issue 3611: Better feed handling when there is no body 2017-08-27 06:59:07 +00:00
a729519de9 And some more static warnings removed 2017-08-26 10:01:50 +00:00
c382f9f3d7 Some more 2017-08-26 07:52:49 +00:00
5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
b0c26921ad Statically used methods should be defined statically as well 2017-08-25 15:56:08 +00:00
959d6ae15e Merge pull request #3654 from annando/externalpubsubhubbub
Removed external pubsubhubbub URL
2017-08-25 09:47:58 +02:00
5c53544118 Removed external pubsubhubbub URL 2017-08-25 02:58:38 +00:00
2ecd5a55b7 Bugfix for "1" instead of "connect" 2017-08-24 19:11:27 +00:00
417ea99ba5 Merge pull request #3650 from annando/feed-probing
Probing sometimes failed / problems with some web servers
2017-08-24 10:16:24 +02:00
c09c806f78 Probing sometimes failed / problems with some web servers 2017-08-24 07:56:46 +00:00
ba52dd9fa7 Merge remote-tracking branch 'upstream/develop' into pleroma2 2017-08-24 06:26:58 +00:00
6998897a34 Limit the number of feed entries (Can solve resub problems) 2017-08-23 23:01:37 +00:00
e533572ca3 Issue 3645: Avoid problems with boolean values 2017-08-23 19:40:42 +00:00
b378f5fb01 The "hub" url now contains the nickname 2017-08-23 05:01:15 +00:00
51dca9b034 Compatibility with pleroma added 2017-08-21 20:21:04 +00:00
85c49060e2 Preparation for Unicode Emojis 2017-08-20 19:47:00 +00:00
17b05c9ad9 Hash tag links now do a redir 2017-08-19 09:22:50 +00:00
f8946c9e0a When "local_search" is activated, then point all hashtags to the local server 2017-08-18 22:12:40 +00:00
e10bb40e1a Added logging 2017-08-16 04:53:15 +00:00
791fc1d8b3 DFRN: Improved delivery status handling 2017-08-16 04:08:57 +00:00
6c9953809a Improved position of "close" 2017-08-15 10:10:09 +00:00
a0567d4081 dbm::is_result now checks whether a dba:... call returns at least one result 2017-08-15 06:08:26 +00:00
d2b7a44299 Merge pull request #3631 from annando/1708-libertree
Shared posts to Libertree now look better.
2017-08-15 07:44:53 +02:00
3290ccc779 Now some more stuff is fixed 2017-08-14 21:46:58 +00:00
4f6f47f714 Now the bugfix really should work 2017-08-14 20:58:02 +00:00
2d99e86b12 Bugfix for PR 3630: "get_contact_details_by_url" not always returned a value 2017-08-14 20:17:17 +00:00
3c59eefa22 Shared posts to Libertree now look better. 2017-08-14 19:16:28 +00:00
796cee6273 Cleaning code 2017-08-14 05:52:36 +00:00
1fa82581b6 Avoid warning 2017-08-14 05:47:25 +00:00
217a8ce6ee Events now work again 2017-08-14 05:05:32 +00:00
0ac725dc47 Some more updated queries 2017-08-12 22:15:16 +00:00
41a81624a2 Now deletions will also work with complicated queries 2017-08-12 18:07:47 +00:00
89017d4e6c DBA: The condition can now be a complex string 2017-08-12 13:54:29 +00:00
1d8c91c478 Restructured "dba::exists" function 2017-08-12 08:55:50 +00:00
b14b44e8a8 Merge remote-tracking branch 'upstream/develop' into dba-2 2017-08-12 07:37:06 +00:00
51f6c46923 Issue 3616: Don't create notifications for forum accounts 2017-08-12 05:08:45 +00:00
4ada71081f No timeout problem anymore in preview. 2017-08-11 20:25:02 +00:00
556cc0cc4c And some more changed lines 2017-08-11 19:26:08 +00:00
99f0c01cdd Some more changed queries 2017-08-11 16:21:55 +00:00
d810b21f87 New dba functions 2017-08-11 08:04:01 +00:00
7b6664f0f7 Improved parameter handling 2017-08-10 12:38:32 +00:00
33b61ab262 Database connections should be closed 2017-08-10 06:33:24 +00:00
eb7cbb9ada Now there are fewer than 300 updates left ... 2017-08-10 05:07:23 +00:00
bd8efb7f92 Several updates are transformed as well 2017-08-10 04:31:46 +00:00
03b86d3766 Now we have less than 100 insert commands, yeah 2017-08-09 23:02:57 +00:00
c6b04aa922 And some more inserts 2017-08-09 22:23:46 +00:00
6180d62ebc Some more inserts 2017-08-09 22:04:00 +00:00
f248f9cc85 Merge remote-tracking branch 'upstream/develop' into new-dba 2017-08-09 21:42:51 +00:00
fce72cbbc8 Modifed "update" and "insert" function / many changed queries 2017-08-09 21:12:41 +00:00
b01ab3e64c DBA: Do a fallback to other db functions on problems 2017-08-09 06:02:48 +00:00
4d77c8a90a Merge pull request #3618 from annando/mysqli-fix
Quickfix for MYSQLi (prepared statement problem)
2017-08-08 09:32:26 +02:00
c3e1f88d4b Quickfix for MYSQLi (prepared statement problem) 2017-08-08 06:07:04 +00:00
Johannes Schwab
37262c24d9 Catch exceptions in PDO constructor 2017-08-04 11:01:29 +02:00
93fb98959a Merge pull request #3613 from annando/some-ostatus
Speed up of OStatus transmission/Ignoring "created" with remote self
2017-08-03 08:01:04 +02:00
1bd85971a4 Avoid some PHP warnings, no functional changes 2017-08-03 05:50:44 +00:00
a80329b416 Speed up of OStatus transmission/Ignoring "created" with remote self 2017-08-03 05:42:44 +00:00
c98ae304c0 Endless scroll now avoids showing the same items 2017-07-31 06:04:37 +00:00
57b4ea4759 Bugfix: The ACL lookup had its problems after the last changes 2017-07-27 14:02:25 +00:00
f3f42ae3a2 Merge pull request #3602 from annando/1707-expiration
Bugfix: the expiration check in item_store now works again
2017-07-23 22:21:30 +02:00
b266d7d6ff Bugfix: the expiration check in item_store now works again 2017-07-23 19:59:29 +00:00
152eec4f2f Merge pull request #3597 from annando/1707-acl-separator
In the acl there is now a separation between groups, forums and contacts
2017-07-23 10:27:40 +02:00
2e704d79eb In the acl there is now a separation between groups, forums and contacts 2017-07-23 06:49:31 +00:00
8d66909ba5 Check general expiration time at item storing as well 2017-07-23 05:51:55 +00:00
Michael Vogel
0f67d82d05 Update socgraph.php
Two little style changes
2017-07-21 19:36:13 +02:00
zotlabs
a583bda5fc reduce the number of network fetches for server detection of hubzilla/red systems from around 10 to maybe 5. Kind of wasteful to get hit on 10 non-existent endpoints every couple of minutes. 2017-07-19 17:56:40 -07:00
4a7ca0d44f Fix crash with expiration, false logger constant, no empty postings 2017-07-19 05:51:39 +00:00
a5baba84af Only show the attachment elements if there are one. 2017-07-17 19:49:58 +00:00
1c8e74edce Attachments now look fine. 2017-07-17 19:38:15 +00:00
f65d6531ca Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach 2017-07-15 10:36:56 +00:00
2bad626be6 Bugfix: Signatures for likes hadn't been stored 2017-07-15 04:03:50 +00:00
b49a36f949 The attached image has now a class 2017-07-15 04:02:12 +00:00
181947f774 Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach
Conflicts:
	include/text.php
2017-07-13 20:38:18 +00:00
86934119b1 Merge pull request #3580 from annando/issue-3571-2
Reworked "get_contact"
2017-07-13 08:34:59 +02:00
3334e0332d Merge pull request #3582 from annando/duplicate-error
Avoid duplicate database errors when storing the conversations
2017-07-13 08:30:20 +02:00
4c7a197f4b Avoid duplicate database errors when storing the conversations 2017-07-13 06:00:53 +00:00
beaa911bac Bugfix: Some special characters weren't converted correctly 2017-07-13 05:57:37 +00:00
568abd537a Fixed error reporting 2017-07-12 08:14:36 +00:00
69f20959ff Update existing contact records with data from probing 2017-07-12 06:07:22 +00:00
a47e1e13d7 Process all data that we can fetch via probing 2017-07-12 05:56:35 +00:00
35b3723c4a database logging now works for database errors 2017-07-11 19:14:49 +00:00
8ec7f1de56 Issue 3571: Reworked "get_contact" function 2017-07-11 18:32:35 +00:00
81dedb3f92 Merge pull request #3577 from annando/2in1
Issue 3571 and Diaspora mail bugfix
2017-07-11 08:31:39 +02:00
363322ba78 Issue 3571 and Diaspora mail bugfix 2017-07-10 22:35:32 +00:00
Michael Vogel
ef3398f09a Merge pull request #3573 from irhen/issue-3529-fix-mega-age
fix big age
2017-07-10 18:43:05 +02:00
irhen
c6137ca0df is empty check 2017-07-10 14:17:06 +03:00
6bbc1ac602 Merge pull request #3575 from annando/dfrn-update-copy
DFRN: Update the public item copy as well
2017-07-09 10:17:22 +02:00
5921fd03e5 Merge pull request #3574 from annando/further-expire-split
Split the delete process into a separate expire process
2017-07-09 10:15:34 +02:00
9f92fddb00 DFRN: Update the public item copy as well 2017-07-09 04:29:35 +00:00
af181941db Split the delete process into a separate expire process 2017-07-09 03:37:20 +00:00
irhen
534f79a5a5 fix big age 2017-07-08 23:30:30 +03:00
Dean Townsley
11d271f3c5 Only delete uid=0 entries when cleaning up extra public entries
This delete can inadvertently remove contacts from normal users under
some conditions.  Since it appears to be intended to only operate on
"public" (uid=0) contacts, this change constrains the delete query to
only uid=0 records.
2017-07-08 09:55:40 -05:00
d88584af69 Merge pull request #3567 from rjm6823/develop
Contacts page directory link
2017-07-08 08:36:54 +02:00
RJ Madsen
d7de2e0750 Fixed minor spaces to tabs conversion 2017-07-06 17:33:30 -04:00
RJ Madsen
c4b40babb0 Switched to proper global directory instead of local directory 2017-07-06 17:31:36 -04:00
RJ Madsen
7593152bcb re-named variable to match scheme 2017-07-06 16:37:55 -04:00
RJ Madsen
b7b8c5477b Converted from space to tab indentation 2017-07-06 15:27:03 -04:00
RJ Madsen
255f38710c Added global directory link to the find people side panel 2017-07-06 14:19:58 -04:00
30b0a035f9 Split expire.php in several processes / small worker changes 2017-07-06 05:48:02 +00:00
c8b1b51809 Improved logging 2017-07-04 05:31:42 +00:00
0ab7915810 Only kill the first stale process 2017-07-04 05:01:06 +00:00
bae4569a0b Avoid the killing of the wrong process 2017-07-02 19:43:36 +00:00
0cd9db9cb7 Degrade priority step by step 2017-07-01 18:55:12 +00:00
7726353601 Prevent soon killings 2017-06-30 23:08:08 +00:00
99b86c9fd9 Just found the handbrake ... 2017-06-29 21:19:31 +00:00
18d6eba8d0 Some more performance stuff 2017-06-29 05:40:02 +00:00
4515c36f69 Semaphore based locking and hopefully the fix for the workerqueue 2017-06-28 04:53:11 +00:00
7097673fa1 Bugfix: Poller entries had been executed multiple times 2017-06-21 03:49:05 +00:00
Hypolite Petovan
ea88e15a8c Merge pull request #3473 from Quix0r/rewrites/coding-convention-split2-6-2
Coding convention applied split 2-6-2 (of 2-14-2)
2017-06-18 18:44:34 -04:00
29ca5b3021
added missing curly brace ... :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-06-18 23:15:50 +02:00
c0a0748831
converted upper-case to lower-case as they are no constants but keywords
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-06-18 23:15:11 +02:00
dc8f758860
Opps, also this!
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-06-18 22:14:31 +02:00
470556764b
Fixed some stuff as requested by @Hypolite
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-06-18 22:10:03 +02:00
b000012bc3 Merge pull request #3537 from annando/1706-diaspora2
We now use the new Diaspora protocol for sending
2017-06-18 21:31:25 +02:00
fda4cd6001 Changed documentation 2017-06-17 19:13:40 +00:00
ec8a945189 Corrected query 2017-06-17 14:15:17 +00:00
cf179188b6 Some more worker fine tuning 2017-06-17 13:58:18 +00:00
e33ac224b0 Now the Salmons flys 2017-06-17 08:58:28 +00:00
2ee8d1694f Added documentation 2017-06-16 21:01:56 +00:00
9c4bf6b0d5 The new envelope could work now 2017-06-16 20:57:35 +00:00
c031482d7d "unsharing" is now done different 2017-06-16 16:39:17 +00:00
5a11ef5b90 Merge remote-tracking branch 'upstream/develop' into 1706-diaspora2 2017-06-16 06:10:35 +00:00