keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
22917 commits 4 branches 0 tags 179 MiB
Commit graph

523 commits

Author SHA1 Message Date
Michael Vogel
05cff59f70
Merge pull request #4722 from MrPetovan/task/add-content_filter-hook 
Add content_filter hook
 2018-04-06 06:42:52 +02:00
Michael
3792012723 Improved accessibility for "Frio" 2018-04-05 21:50:34 +00:00
Hypolite Petovan
34fd442821 Rename social.disable_cw pconfig to system.disable_cw 2018-04-04 23:08:48 -04:00
Hypolite Petovan
41db5f0912 Display content warning as title if collapsing is deactivated 2018-04-04 23:08:48 -04:00
Hypolite Petovan
27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
Michael
5bd519efff There is now a "content-warning" field 2018-03-14 22:28:35 +00:00
Hypolite Petovan
b8fca5efe7 [PHP 7.2] Fix missing Countable warning 2018-03-03 08:48:30 -05:00
Tobias Diekershoff
1510b3d948 tyoi, found by 朱陈锬 thanks for that! 2018-03-03 11:02:40 +01:00
Hypolite Petovan
09c717d751 Remove references to include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan
4fe1d804ab
Merge pull request #4511 from annando/no-activity 
Only show visible activities
 2018-02-27 04:41:12 -05:00
Michael
74ff36eee9 Only show visible activities 2018-02-27 09:29:11 +00:00
Michael
20368cbbf4 Fix for network update (number of maximum comments set to 0) 2018-02-26 22:15:57 +00:00
Michael
d2728cad2e Children for the network page are now fetched correctly in the conversation 2018-02-26 06:38:27 +00:00
Michael
a1eb5a584f Improve the queries on the network page 2018-02-25 21:33:15 +00:00
Michael
a59796d1d4 No gcontact-id anymore (It wasn't really used) 2018-02-21 05:15:55 +00:00
Hypolite Petovan
9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -05:00
Michael
ee7c587693 Suppress content from hidden or blocked contacts 2018-02-10 12:34:10 +00: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
cea80c78e4 Replace remaining functions in include/datetime by Temporal methods 
- Fix uses statements
 2018-02-03 20:47:37 -05:00
Hypolite Petovan
5e7285b9ba Move Temporal::convert() to DateTimeFormat::convert() 2018-02-03 08:56:55 -05:00
Hypolite Petovan
0bee706e51 Add Temporal::local() shorthand for Temporal::convert() 2018-02-03 08:56:53 -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
Michael
03aafa8228 Public commenting is now always enabled 2018-01-31 23:22:41 +00:00
Adam Magness
f04d40a37e Review update 
Rename function, move others
 2018-01-27 11:13:41 -05:00
Adam Magness
ca76e49c23 Move remaining functions 
update remaining function calls
 2018-01-27 08:25:54 -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
Adam Magness
428a22cc76 More sprintf 
eliminate more sprintf( with L10n
 2018-01-24 07:18:21 -05:00
Adam Magness
3b0f69599e Updat tt() calls 
update function calls for tt()
 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
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
034d46196f "last-child" is not used anymore 2018-01-18 06:54:44 +00: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
4fb2547df8 Update function calls 
update function calls to use profile class
 2018-01-14 21:22:39 -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
ae66bcaff3 Rename selectOne to selectFirst 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
a3ef9e35ec Update functions and calls 
Update function names and calls.
 2018-01-09 22:42:04 -05:00
Michael
2d9163ce30 Posts from contacts weren't displayed correctly 2018-01-05 19:47:55 +00:00
Hypolite Petovan
3b4f5f98f8
Merge pull request #4169 from annando/comment-dfrn 
Precaution for incomplete threads
 2018-01-04 16:31:16 -05:00
Michael
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
0c9a9b6f0c Commenting to (nearly) every Friendica contact is now possible 2018-01-04 19:48:56 +00: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
d9c6417f5d Remove construct_acl_data() 2018-01-04 12:19:06 -05:00
Michael
ade987db47 Updates for community pages do work now 2018-01-04 15:46:56 +00:00
Michael
b677bdd4ff Ensuring that only local users can comment on community items 2018-01-04 14:39:47 +00:00
Michael
174a1bb54b Commenting on community timelines is now possible 2018-01-04 10:02:56 +00:00
Michael
243848eec1 Remove some currently unused stuff 2018-01-03 13:34:51 +00:00
Michael
6925299e5a Merge remote-tracking branch 'upstream/develop' into community 2018-01-03 01:15:27 +00: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
Michael
5afedb28d4 You can now comment on the community page 2017-12-23 07:33:51 +00:00
Michael
f7272be4a8 Reshares are now working 2017-12-20 18:18:25 +00:00
Michael
343f22e02f Updating after post does now work 2017-12-20 10:16:25 +00:00
Michael
b457ed6876 Preparation for being able to comment every public item 2017-12-19 17:15:56 +00:00
Michael
88ef61df95 Removed useless "function_exists" checks 2017-12-12 04:52:33 +00: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
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
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
Michael
0608efc38a We've got no mood anymore 2017-12-07 07:01:55 +00: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
Michael
8bffee43b3 Threads are now always enabled. 2017-11-28 18:54:39 +00:00
Michael
9612496e9e The function "template_escape" doesn't exist anymore. 2017-11-27 06:44:49 +00:00
Michael
3046455b1c Some posts weren't shown 2017-11-24 21:39:12 +00: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
Adam Magness
d9e9cbe753 Coding Standards 
A few updates for coding standards
 2017-11-19 15:32:54 -05: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
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
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
4ca68c7af0 Class file relocations 
Issue #3878
 2017-11-08 08:37:03 -05:00
Adam Magness
0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
rabuzarus
f2d51737eb fix some HTML violations in frio 2017-10-20 15:21:42 +02:00
Michael
eeec1ea163 We should take the event-id as well 2017-10-11 20:45:03 +00:00
Michael
42a76bced9 export event data for display purposes 2017-10-11 19:51:18 +00:00
Michael
5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
Michael
3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
Michael
17b05c9ad9 Hash tag links now do a redir 2017-08-19 09:22:50 +00:00
Michael
0ac725dc47 Some more updated queries 2017-08-12 22:15:16 +00:00
Michael
d810b21f87 New dba functions 2017-08-11 08:04:01 +00:00
Michael
fce72cbbc8 Modifed "update" and "insert" function / many changed queries 2017-08-09 21:12:41 +00:00
Michael
c98ae304c0 Endless scroll now avoids showing the same items 2017-07-31 06:04:37 +00:00
Hypolite Petovan
9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
Hypolite Petovan
20043914e6 Move App to src 
- Add `use Friendica\App;` wherever needed
 2017-05-02 22:59:36 -04:00
Hypolite Petovan
56ee734b00 Cleanup /format pre-move 2017-05-02 22:59:24 -04:00
Roland Haeder
f2f20c85d5
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 16:27:06 +02:00
Roland Haeder
be59fe86e5
added space + type-hinted $a (App) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-14 15:29:50 +02:00
Roland Haeder
e325c6ec85
opps, missed this one. 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-09 00:28:48 +02:00
Roland Haeder
d07236deb6
huh? missed again 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:08:22 +02:00
Roland Haeder
cd697e0d7c
more spaces! ;-) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:07:40 +02:00
Roland Haeder
0319517f94
more curly braces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:06:56 +02:00
Roland Haeder
6ff0b15873
more spaces + curly braces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:05:56 +02:00
Roland Haeder
577e93e9fc
added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:04:33 +02:00
Roland Haeder
bc5d1015b3
added curly braces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:03:21 +02:00
Roland Haeder
a66f6fe668
more spaces and curly braces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 20:01:04 +02:00
Roland Haeder
3220234693
more spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:10:50 +02:00
Roland Haeder
a0e5f7a59a
added spaces + curly braces and TODOs for upcoming type-hint rewrite. Please 
note that PHP5 allows 'array' as type-hint already (+ interface/class name).

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-08 19:05:50 +02:00
Roland Haeder
03571f6e74
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-04-04 19:46:56 +02:00
Hypolite Petovan
7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Roland Häder
fbd559a823
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:24 +01:00
Roland Häder
ed0d858f98
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:52:24 +01:00
Roland Häder
951006dd10
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:51:54 +01:00
Roland Häder
41a36606c6
added spaces + some curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:50:19 +01:00
Hypolite Petovan
67ae0fed7f Fix response "self" assigment 
- Switch from unreliable `uid` matching to `author-id` using
public_contact()
 2017-03-06 05:07:17 -05:00
Hypolite Petovan
9d5384f107 - Remove tinyMCE mentions or convert to addeditortext() 
- Remove $editselect template value
 2017-01-26 22:50:27 -05:00
Hypolite Petovan
87eb3d5ef2 Normalize App parameter declaration (doc-include folders, boot) 2017-01-09 23:09:01 +11:00
Roland Haeder
6c0c9d542a
Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:16:49 +01:00
Roland Häder
fc9dbc0899 added spaces + curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:38:28 +01:00
Roland Häder
884f44ce94 *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:27:16 +01:00
Roland Häder
a905522eb5 Cleanup for #3010 - added spaces, thanks to @annando . 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 09:42:36 +01:00
Roland Häder
6a8a36f12d More usage of dbm::is_result($r) instead of count($r): 
- count() returns very different results and never a boolean (not even false on
  error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
  done in PHP because of its lazyness. But it is discouraged if it comes to
  more clean code.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-13 10:44:13 +01:00
Tobias Diekershoff
1fc35d5f44 Merge pull request #2979 from annando/issue-2772 
Issue 2772: Pending contacts should now be displayed
 2016-12-01 08:51:04 +01:00
Michael
63389ba23d Pending or blocked - that's the question ... 2016-11-30 04:30:48 +00:00
Michael
624fabf884 Somehow the changes of pull request 2748 got vanished 2016-11-29 20:25:27 +00:00
Michael
3a76a6766f Issue 2772: Pending contacts should now be displayed 2016-11-28 22:11:13 +00:00
Hypolite Petovan
4937a3b7d8 Add the self property to conversation responses 
- Add a condition to check if the current user is amongst the responses
- Populate the responses array with the self attribute
 2016-11-22 18:35:19 +01:00
Michael
3de862712d Issue 2772: Posts from pending contacts should be displayed as well. 2016-11-20 16:52:57 +00:00
Hypolite Petovan
4b0e76f3b7 Fix Issue #2803 - Hovercard view profile link and public directory link 
- Change "Edit Contact" link to "View Contact" in `include/Contact.php`
and `include/conversation.php`
- Add zrl parameter to public directory on single user instances
- Improved formatting of modified functions
 2016-10-22 22:49:12 -04:00
Tobias Diekershoff
252f1827c1 correction of typos 2016-09-24 08:08:04 +02:00
Michael Vogel
1cb6043aea Attachments are now displayed again. 2016-09-04 18:06:07 +02:00
Michael Vogel
c02b1c3f36 The "tagged with" message now works again. 2016-09-03 12:48:51 +02:00
rabuzarus
c1555b623a best_link_url: don't use redirect for pending contacts 2016-08-26 15:47:45 +02:00
Michael Vogel
0a46a3d10e Bugfix: Avatar pictures of mail contacts weren't displayed correctly 2016-07-11 20:42:18 +02:00
rabuzarus
073f520cee add missing strings for frio 2016-06-25 12:21:13 +02:00
Michael Vogel
0adff6f6b8 Fix for author-thumb/owner-thumb - DFRN: Relocate stuff 2016-06-19 20:01:25 +02:00
Michael Vogel
91db7a549c Optimised the amount of function for the item query 2016-06-19 08:32:38 +02:00
Michael Vogel
e512a83ecc Massively updated avatar handling 2016-06-19 01:07:20 +02:00
Michael Vogel
7f5a2d5c23 Categories were missing 2016-06-14 09:50:17 +02:00
Michael Vogel
2815173a52 Bugfix: Items weren't sorted correctly 2016-06-13 22:20:09 +02:00
Michael Vogel
125d80292b Some cleanup 2016-06-12 23:06:48 +02:00
Michael Vogel
c05898c57d The queries for items are unified (a little bit) 2016-06-12 21:04:55 +02:00
Michael Vogel
3e7e866e13 Baseurl removed 2016-06-05 21:22:14 +02:00
Michael Vogel
ea3a6ec6eb Some more cleanup and code removal. 2016-06-05 20:01:38 +02:00
Michael Vogel
71d3274841 Unified contact data handling 2016-06-05 13:57:11 +02:00
Michael Vogel
4a388e84af Frio: Adopt changes to search_item.tpl as well. 2016-05-28 13:08:43 +02:00
Michael Vogel
7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
Michael Vogel
c5b724828a Just some more removed baseurls ... 2016-02-17 08:08:28 +01:00
Michael Vogel
092c2e5433 Removed some test code 2016-01-15 23:32:13 +01:00
Michael Vogel
90a8d6f0f5 Several performance improvements 2016-01-15 23:27:25 +01:00
Michael Vogel
c4ba035ee3 Add some analysing stuff, rendered value is written now more often 2016-01-14 21:56:37 +01:00
fabrixxm
5758302f21 small doxigen comment fix 2016-01-02 12:53:42 +01:00
Michael Vogel
143e1a4a83 Bugfix: Warning because of undefined constant 2015-12-13 09:43:47 +01:00