tobias/friendica
1
0
Fork 0
Code Pull requests Activity
19193 commits 2 branches 61 tags 203 MiB
Commit graph

1149 commits

Author SHA1 Message Date
Hypolite Petovan 9e700ba6ea
Merge pull request #4933 from annando/bugfix-distribute 
Bugfix: The Distribition of public items failed with comments
 2018-04-26 16:02:56 -04:00
Michael da3658c80d Bugfix: The Distribition of public items failed with comments# Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen, 2018-04-26 19:47:12 +00:00
Hypolite Petovan f7f640175a Fix PHP 7.2 warning in Model\Profile 2018-04-26 04:56:42 -04:00
Michael a0c5a84ce8 Better way to fetch items 2018-04-26 07:11:18 +00:00
Michael b70b020490 Unneeded stuff removed, only fetch needed records 2018-04-26 06:23:01 +00:00
Michael 71d4c6e4a0 Cleaned up 2018-04-26 05:45:05 +00:00
Michael c437dac3a0 Delivery to non followers 2018-04-25 21:55:24 +00:00
Michael 3abd0b54cc Reworked delivery 2018-04-25 21:18:21 +00:00
Hypolite Petovan a9f1f47be2
Merge pull request #4931 from annando/no-ignored 
Don't distribute for ignored contacts
 2018-04-25 12:07:00 -04:00
Michael 66547e5107 Don't distribute for ignored contacts 2018-04-25 16:00:21 +00:00
Michael ad45a73bf3 Improvements for the Diaspora protocol 2018-04-24 18:34:35 +00:00
Michael 5019d46071 We only need the uid 2018-04-24 14:58:39 +00:00
Michael 5cf745af44 Item distribution is now done via the public post 2018-04-24 13:21:25 +00:00
Michael 7230cc0bed Merge remote-tracking branch 'upstream/develop' into item-distribution 2018-04-24 04:23:38 +00:00
Philipp Holzer 6973aaefc2 Add Install Mode 
- Added $install_mode in Class App instead
- Extracted the install business logic to a new Class Install
- Replaced all $a->module == 'install' with $a->install_mode
 2018-04-23 22:56:59 +02:00
Tobias Diekershoff e51a017d92
Merge pull request #4917 from annando/show-private-forums 
Show private forums in the sidebar
 2018-04-23 18:47:21 +02:00
Michael c3ee596ff4 Show private forums in the sidebar 2018-04-23 16:41:00 +00:00
Hypolite Petovan a66e9b81ba
Merge pull request #4873 from astifter/develop 
Remove pagination when empty, move new Member Tips and use common widget to find people.
 2018-04-23 10:23:21 -04:00
Michael ba35b19af6 Public federated items now always are having an entry with "uid=0" 2018-04-23 11:14:25 +00:00
Hypolite Petovan a25c07b162
Merge pull request #4912 from annando/archivecontacts 
Added console command to manually archive contacts
 2018-04-23 02:07:53 -04:00
Michael b3d24f0ff2 DFRN: mark for archival at different places 2018-04-23 06:03:55 +00:00
Michael 866fbb4d80 Added console command to manually archive contacts 2018-04-23 05:33:47 +00:00
Hypolite Petovan 00985fe340 Fix self warning in Util\Temporal 2018-04-23 00:03:27 -04:00
Hypolite Petovan 9b052b5ea8 Fix count() warning in Object\Post 2018-04-23 00:02:18 -04:00
Hypolite Petovan b0564ea40d Fix count() warning in Model\Profile 
- Replace x() calls with empty() in Profile::load
- Remove extraneous $a->page['aside'] initialization
 2018-04-23 00:01:46 -04:00
Michael Vogel 37e5272f92
Merge pull request #4881 from MrPetovan/task/4867-guess-language-from-plaintext 
Guess language from plaintext
 2018-04-23 00:26:05 +02:00
Friendica 390983a331 Haromonize Find People Widget. 
In the right_aside on the /contacts page in the left aside there are
almost identical widgets to search for contacts. Drop one and use common
widget in both places.
 2018-04-22 20:44:22 +00:00
Hypolite Petovan d977ff78df Uncomment some code in ItemContent::getPlaintextPost 
- I have no idea what I'm doing
 2018-04-22 11:43:27 -04:00
Michael Vogel 6e9ed3f01b
Merge pull request #4894 from MrPetovan/task/4513-show-events-reminders-attendence 
Only show event reminders of events attendyes or attendmaybe
 2018-04-22 17:38:32 +02:00
Hypolite Petovan 82ed6fff9f Use public_contact() instead of wrong query in Profile::getEventsReminderHTML 2018-04-22 11:29:55 -04:00
Michael 8f2db61538 Receiving of public posts is now working 2018-04-22 10:58:03 +00:00
Michael c59b28a8c4 create public endpoint 2018-04-22 10:04:30 +00:00
Hypolite Petovan e0b33b36a2 Decrease scope of query in Profile::getEventsReminderHTML 
- Use specific SELECT fields
- Use INNER JOIN
 2018-04-22 04:41:53 -04:00
Michael Vogel 25662eb6f4
Merge pull request #4892 from MrPetovan/bug/infinite-loop-in-dba-delete 
Prevent infinite loop when a dbstructure_definition hook is orphan
 2018-04-22 07:55:39 +02:00
Michael Vogel 39edd086e0
Merge pull request #4893 from MrPetovan/bug/4879-remove-backslash-in-birthday-events 
Fix quoting style in DFRN::birthdayEvent()
 2018-04-22 07:54:07 +02:00
Hypolite Petovan 08afec3170 Only show event reminders of events attendyes or attendmaybe 2018-04-21 22:53:13 -04:00
Hypolite Petovan 851c5d841f Fix quoting style in DFRN::birthdayEvent() 2018-04-21 21:03:12 -04:00
Hypolite Petovan 6d88984ee5 Move Model\Item::getPlaintextPost to Model\ItemContent::getPlaintextPost 2018-04-21 20:50:13 -04:00
Hypolite Petovan 18078ce7a4 Prevent infinite loop when a dbstructure_definition hook is orphan 
- Add cascade option to dba::delete
- use cascade = false for orphan hook deletion
 2018-04-21 20:34:07 -04:00
Hypolite Petovan daf94a8f63
Merge pull request #4891 from annando/private-forum-redux 
Better working with private forums
 2018-04-21 18:19:27 -04:00
Michael 16beab4652 Better working with private forums 2018-04-21 21:59:02 +00:00
Tobias Diekershoff f63be91bd5
Revert "Moved .htconfig.php file & extracted Install business logic" 2018-04-21 16:28:22 +02:00
Philipp Holzer 334d392154 Merge remote-tracking branch 'origin/develop' into install_config 2018-04-21 14:23:49 +02:00
Philipp Holzer 346697d771 Moved .htconfig file 
Extracted install business functions to new Class `Install.php`
 2018-04-21 14:10:53 +02:00
Tobias Diekershoff ebe203336f
Merge pull request #4882 from annando/private-forums 
Contact requests from Diaspora for private forums aren't accepted automatically anymore
 2018-04-21 13:54:10 +02:00
Michael fd7658a70a Contact requests from Diaspora for private forums aren't accepted automatically anymore 2018-04-21 10:39:46 +00:00
Hypolite Petovan 1e67c32142 Fix BBCode::getAbstract scope 2018-04-21 04:38:27 -04:00
Hypolite Petovan abc50eb3ae Improve Model\Item::addLanguageInPostopts() 
- Use Content\BBCode::toPlaintext method
- Rename $arr parameter to $item
- Rename $lng variable to $languages
 2018-04-21 04:11:32 -04:00
Hypolite Petovan ec9baef968 Add new Content\BBCode::toPlaintext() 2018-04-21 04:10:25 -04:00
Hypolite Petovan 5476da53aa Move Content\BBCode::toPlaintext() to Model\Item::getPlaintextPost() 2018-04-21 04:09:45 -04:00
Tobias Diekershoff 4d4ed6fb17
Merge pull request #4863 from MrPetovan/task/4860-add-hidden-input-in-console 
Add hidden input in newpassword console
 2018-04-20 09:29:17 +02:00
Hypolite Petovan f043554ab7
Merge pull request #4849 from M-arcus/installation-script 
[FEATURE] Install Script: Add first version
 2018-04-19 07:57:02 -04:00
Hypolite Petovan f65a7b3130 Add hidden password input to Console\NewPassword 
- Add Exception when password is empty
 2018-04-19 07:51:26 -04:00
Hypolite Petovan 0496822ca3 Add Exception when password is empty in User::hashPassword() 2018-04-19 07:51:26 -04:00
Marcus Müller e2a58a791c
[DOCS] Auto Install: Add description 2018-04-19 10:21:41 +02:00
Tobias Diekershoff ab82c6df03
Merge pull request #4865 from annando/dfrn-reshare 
Diaspora: Improved reshared coding
 2018-04-19 08:43:18 +02:00
Michael Vogel 10465110c1
Merge pull request #4851 from MrPetovan/task/4709-add-query-based-content-filter 
Add query based content filter
 2018-04-19 08:21:53 +02:00
Michael c507cdf946 Code simplified 2018-04-19 06:07:23 +00:00
Michael da06416426 Merge remote-tracking branch 'upstream/develop' into dfrn-reshare 2018-04-19 05:44:06 +00:00
Hypolite Petovan 87f638bdc9 Improve CacheSessionhandler 
- Replace !x() by empty()
- Add return values to read() and destroy()
 2018-04-18 23:37:06 -04:00
Hypolite Petovan ca4ca51c6a Add hostname prefix in MemcachedCacheDriver 2018-04-18 23:36:23 -04:00
Marcus Müller 457b86711d
[TASK] Auto install: Rework class 2018-04-18 14:30:42 +02:00
Marcus Müller 24626f5fd2
[TASK] Auto install: Rename script command 2018-04-18 14:21:40 +02:00
Marcus Müller 7b7ca71bf6
[TASK] Auto install: Rename script command 2018-04-18 14:20:21 +02:00
Marcus Müller d53e64a583
[TASK] Install Script: Register installation class 2018-04-18 11:46:27 +02:00
Marcus Müller 1d552b5e66
[TASK] Install script: Add installation class 2018-04-18 11:43:23 +02:00
Tobias Diekershoff fda5ad647d
Merge pull request #4857 from annando/duplicated-tags 
Avoid duplicated multibyte tags
 2018-04-18 07:50:56 +02:00
Michael 8a730b2d85 Issue 4655: Avoid multiplicated contact requests from the same account 2018-04-18 05:02:59 +00:00
Michael ed87e634ed Avoid duplicated multibyte tags 2018-04-18 05:00:28 +00:00
Michael f99af007ae Replaced queries 2018-04-18 04:59:33 +00:00
Michael 88353ce56f Merge remote-tracking branch 'upstream/develop' into dfrn-reshare 2018-04-18 03:12:13 +00:00
Hypolite Petovan 6d2d15a80d
Merge pull request #4782 from Alkarex/fix-update-password 
Fix update password rehash
 2018-04-17 07:25:52 -04:00
Hypolite Petovan 17a0cc4f3d Add Model\Term::populateTagsFromItem method 2018-04-16 22:22:58 -04:00
Hypolite Petovan cc40dcf83c Add dbstructure_definition hook call 2018-04-16 22:22:58 -04:00
Tobias Diekershoff 72a2896d1f profile data is transmitted to other nodes 2018-04-16 09:27:16 +02:00
Michael 6eba2ccd9b Forum posts now show the author when posted to Diaspora 2018-04-15 19:01:19 +00:00
Alexandre Alapetite 360e2e6342 Revert removal of legacy_password column 
https://github.com/friendica/friendica/pull/4782#issuecomment-380978218
 2018-04-15 11:12:32 +02:00
Alexandre Alapetite 991a3d959e Revert "Remove SQL column legacy_password" 
This reverts commit 82f1f2f00e.
 2018-04-15 10:51:22 +02:00
Michael a53f01bacc Update the "photo" and "thumb" field in the "profile" table 2018-04-14 08:03:15 +00:00
Michael ce7f451196 Don't show multiple calls from the "dba" class to show the essential parts of the callstack 2018-04-13 20:09:12 +00:00
Marcus Müller f9c34fee5a
[BUGFIX] Network: Remove URL/domain DNS_PTR checks 2018-04-12 19:28:52 +02:00
Michael 4fd4d277f0 Store in lowercase to avoid duplicates 2018-04-12 08:55:36 +00:00
Michael e83e31a968 Merge remote-tracking branch 'upstream/develop' into issue-4816 2018-04-12 08:53:56 +00:00
Hypolite Petovan 9d928417a1
Merge pull request #4817 from annando/relais-duplicates 
Avoid sending relay posts to servers that already received content
 2018-04-11 19:00:34 -04:00
Michael 88eaef6704 Merge branch 'issue-4816' of github.com:annando/friendica into issue-4816 2018-04-11 19:21:23 +00:00
Michael edcf1466a7 Relay: Avoid sending relay posts to servers that already received content 2018-04-11 19:01:25 +00:00
Michael 75f97db4ec Issue-4816: Avoid SQL errors / Unarchive living relais servers 2018-04-11 18:56:22 +00:00
Tobias Diekershoff 0cab448ba1 make it unreadable... almost 2018-04-11 14:12:53 +02:00
Tobias Diekershoff ef8e984c62 noreply should not be translate-able in email addresses 2018-04-11 08:17:44 +02:00
Tobias Diekershoff 9d5abaca1c
Merge pull request #4807 from annando/archival-days 
We can now define the days after a contact is archived
 2018-04-10 14:34:18 +02:00
Michael 869d8ab12d We can now define the days after a contact is archived 2018-04-10 11:10:02 +00:00
Tobias Diekershoff eaff717696
Merge pull request #4806 from MrPetovan/task/improve-strikethrough-support 
[BBCode] Improve support for strikethrough
 2018-04-10 12:44:40 +02:00
Hypolite Petovan 369518e7b6 [BBCode] Improve support for strikethrough 2018-04-10 06:23:40 -04:00
Michael ea9b4cc523 Ignore function "call_user_func_array" in the callstack 2018-04-10 05:55:36 +00:00
Hypolite Petovan c7ad76f9ab Prevent empty $uid from messing up the PreloadConfigAdapter 2018-04-09 21:24:22 -04:00
Michael 08abf65f7b Old database functions had been replaced in the workers 2018-04-09 21:34:23 +00:00
Michael 105f3ca747 Relay: Avoid empty tags / Always use the "relay account" 2018-04-09 05:53:23 +00:00
Michael 5c2b54009e The magic link is added at more places 2018-04-08 19:17:50 +00:00
Alexandre Alapetite e860cdf6a8 Swap if / elseif 
https://github.com/friendica/friendica/pull/4782#discussion_r179947984
 2018-04-08 16:02:25 +02:00
Alexandre Alapetite 82f1f2f00e Remove SQL column legacy_password 2018-04-08 14:53:12 +02:00