clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
19,453 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

318 Commits

Author SHA1 Message Date
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
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
Hypolite Petovan 08afec3170 Only show event reminders of events attendyes or attendmaybe 2018-04-21 22:53:13 -04:00
Hypolite Petovan 6d88984ee5 Move Model\Item::getPlaintextPost to Model\ItemContent::getPlaintextPost 2018-04-21 20:50:13 -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
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 5476da53aa Move Content\BBCode::toPlaintext() to Model\Item::getPlaintextPost() 2018-04-21 04:09:45 -04:00
Hypolite Petovan 0496822ca3 Add Exception when password is empty in User::hashPassword() 2018-04-19 07:51:26 -04: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 8a730b2d85 Issue 4655: Avoid multiplicated contact requests from the same account 2018-04-18 05:02:59 +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
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 75f97db4ec Issue-4816: Avoid SQL errors / Unarchive living relais servers 2018-04-11 18:56:22 +00:00
Michael 869d8ab12d We can now define the days after a contact is archived 2018-04-10 11:10:02 +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
Alexandre Alapetite cb26cd6d5d Remove legacy_password test 2018-04-08 14:42:18 +02:00
Alexandre Alapetite 129f6806f6 Fix update password rehash 
Fixes https://github.com/friendica/friendica/issues/4743
The logic for updating password was wrong:
b0a764b14c (diff-1466bb1a0a37fe9f7cf52eda8f3b431aR150)
 2018-04-08 12:40:35 +02:00
Pierre Rudloff b3235c2d02 Implement parts of the list API: 
lists/statuses
lists/destroy
lists/update
lists/create
lists/ownerships
 2018-04-07 19:16:47 +02:00
Hypolite Petovan 8b5341b84c Fix event id typo in Model\Event 2018-04-06 20:58:09 -04:00
Michael 1e8dd96938 Fix: The register mail contained variables in a wrong order 2018-04-04 19:56:34 +00:00
Tobias Diekershoff 6cef0fbaeb added link to delete the account to the registration mail text 2018-04-02 18:40:52 +02:00
Michael dece06c571 Bugfix: Prevent "Uncaught TypeError: Argument 1 passed to Friendica\Model\Event::formatListForExport() must be of the type array, object given" 2018-03-25 18:56:35 +00:00
Michael 402c0fc770 Using the default avatar when no avatar was found for the self contact 2018-03-25 17:26:40 +00:00
Hypolite Petovan 30113dd6ef
Merge pull request #4683 from annando/update-self 
The "self" contact is now updated at a central place
 2018-03-25 09:25:10 -04:00
Michael ad3e4b894e Update the public contact 2018-03-25 08:20:13 +00:00
Michael abb49150db Update the avatar 2018-03-25 08:15:22 +00:00
Michael a0451e1c62 Merge remote-tracking branch 'upstream/develop' into update-self 2018-03-24 22:50:14 +00:00
Michael e8e6436f08 Issue 4673: Avoid "Incorrect date value: '0000-00-00' for column 'bd'" 2018-03-24 22:27:04 +00:00
Hypolite Petovan 9665f4ed41
Merge pull request #4675 from annando/group-delete 
Fix: Groups can now be deleted again
 2018-03-24 15:25:26 -04:00
Michael 07a1796e8f Fix: Groups can now be deleted again 2018-03-24 07:26:57 +00:00
Michael bac60164e7 New function to keep the self contact updated 2018-03-24 06:15:18 +00:00
Hypolite Petovan 95792f6b79 Fix typo in mod/events 
- Add todo in Model\Event
 2018-03-23 06:34:21 -04:00
Hypolite Petovan 254974826f Fix wrong contact retrieval condition in Event::store 2018-03-23 06:34:21 -04:00
Hypolite Petovan bc12ba68cd Fix wrong parameter check in Event::store 2018-03-23 06:34:21 -04:00
Hypolite Petovan 089f556327 Initialize $event in Event::store 2018-03-23 06:34:21 -04:00
Hypolite Petovan 89e9cbb0b5 Remove private key from event array in Event::store 2018-03-23 06:34:21 -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 8c956ac0c8 Add new classes 
- Add Model\Event class
- Add Content\Widget\CalendarExport class
 2018-03-23 06:32:08 -04:00
Hypolite Petovan 27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
Michael b171fb1f24 Fix: Items with "uid=0" always had the "parent-uri" as "thr-parent" 2018-03-22 16:18:49 +00:00
Hypolite Petovan 701fd41463 Rename checkPasswordExposed to isPasswordExposed 2018-03-21 02:14:43 -04:00
Hypolite Petovan ca13570251 Add exposed password check to manual password change 2018-03-21 01:33:35 -04:00
Michael 8053172398 Issue 4610: The query is simplified and shouldn't fail again 2018-03-17 07:50:49 +00:00
Michael d616bb7564 Fix: In the contact search you had been able to delete your own contact 2018-03-17 06:17:32 +00:00
Michael 67fa6aa809 We now change relationships not only for OStatus contacts 2018-03-16 06:58:54 +00:00
Michael 59dd353464 DFRN: The relationship between contacts can now be changed afterwards 2018-03-16 06:43:10 +00:00
Michael b7a5e076fc Fix: The ownership of forum items had been wrong 2018-03-11 18:12:38 +00:00
Michael 480fde7ca8 Bugfix: missing "use" 2018-03-08 20:48:00 +00:00
Hypolite Petovan 789561c7a2 Remove/Update references to include/html2*.php 2018-03-07 16:34:17 -05:00
Michael cd79ce3a57 Fix: Multiple accounts per mail address are allowed when not explicit forbidden 2018-03-04 22:23:52 +00:00
Hypolite Petovan ab544e1e9f Add missing dba::close() call in Contact::pruneUnavailable 2018-03-03 07:41:49 -05:00
Hypolite Petovan 09c717d751 Remove references to include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan ce9e0f3649 Move prune_deadguys to Contact 2018-03-02 18:40:08 -05:00
Hypolite Petovan eeafb59c31 Add new class/functions 
- Create class Core\Acl
- Add Contact::pruneUnavailable
- Add mod_content
 2018-03-02 18:40:08 -05:00
Tobias Diekershoff b5f8d73833
Merge pull request #4527 from annando/fix-no-constant-update 
Bugfix: No constant update in "getIdForUrl"
 2018-03-02 10:58:17 +01:00
Michael 361af7bc78 Bugfix: No constant update in "getIdForUrl" 2018-03-02 03:55:24 +00:00
Hypolite Petovan 41678ec3cd Add no_update flag to speed up Contact::getIdForURL instances 2018-03-01 19:54:45 -05:00
Hypolite Petovan 9f21e7f34f Use default value for uid parameter in Contact::getIdForURL 2018-03-01 19:54:12 -05:00
Hypolite Petovan 4d3ea08c97 Use NOT EXISTS to improve performance 2018-02-28 08:50:26 -05:00
Hypolite Petovan f58d8f4108 Add attendance check to event reminder 2018-02-27 20:47:18 -05:00
Michael d4c95e0032 Contact updates should now work more reliable 2018-02-26 21:53:42 +00:00
Michael 9e721c0908 guid creation: Take the hostname from mail addresses for mail posts 2018-02-26 11:48:05 +00:00
Michael 2f2e7b9d5a fetch_first is now used / additional logging 2018-02-22 09:51:59 +00:00
Michael 046352606e Bugfix: $uid wasn't available in that context 2018-02-22 07:05:56 +00:00
Michael 2897333c28 Most queries are now done with the dba functions 2018-02-22 06:52:58 +00:00
Michael 8ad2ebbf47 $u is now $user 2018-02-21 23:10:29 +00:00
Michael 8e0496c040 Better naming of variables 2018-02-21 22:55:23 +00:00
Michael 5a91c746e9 $arr is now $item 2018-02-21 21:39:07 +00:00
Michael 82bd26edb9 The item class had been improved (e.g. database calls) 2018-02-21 21:08:37 +00:00
Michael a59796d1d4 No gcontact-id anymore (It wasn't really used) 2018-02-21 05:15:55 +00:00
Hypolite Petovan eed35c3e69
Merge pull request #4484 from annando/item-guid 
The guid creation for posts is now done in a separate function
 2018-02-20 23:22:11 -05:00
Michael 475969a1d3 The guid creation for posts is now done in a separate function 2018-02-21 04:13:13 +00:00
Michael 3e46382459 Standard stuff 2018-02-20 11:20:28 +00:00
Michael a3af6807ac Improved resource id creation 2018-02-20 10:02:07 +00:00
Hypolite Petovan 9e3bae5caa Remove references to include/bbcode.php 2018-02-14 22:01:14 -05:00
Hypolite Petovan 0c52866693 Refactor bbcode() into BBCode::convert() 2018-02-14 21:33:55 -05:00
Hypolite Petovan 41cd5af54f
Merge pull request #4459 from annando/unmark-contact 
Bugfix and improvements for unmarking potentially archived contacts
 2018-02-14 17:01:17 -05:00
Michael 43b1eccbcd Bugfix and improvements for unmarking potentially archived contacts 2018-02-14 21:18:16 +00:00
Hypolite Petovan d419d07f73 [Scrutinizer] Fix undeclared variables in src/ (except Protocol/) 
- Use dba::selectFirst to remove intermediate variables `$r`
- Remove unused variable `$url_recipients` in Worker\Dellivery
 2018-02-14 00:05:00 -05:00
rabuzarus af3a57376a Item::tagDeliver(): remove contact as array key for hooks because it was never declared 2018-02-12 17:05:01 +01:00
rabuzarus 58b4169097 fix undeclared $uid variables in Item::insert() 2018-02-12 16:56:52 +01:00
rabuzarus 342b9af734 fix undeclared variables or wrong variable names (/src) 2018-02-12 16:08:28 +01:00
Hypolite Petovan 8b557c3157
Merge pull request #4433 from annando/direct-block 
Suppress content from hidden or blocked contacts
 2018-02-10 07:49:34 -05:00
Michael ee7c587693 Suppress content from hidden or blocked contacts 2018-02-10 12:34:10 +00:00
rabuzarus 9a4d19e284 move membersince addon to core 2018-02-09 20:44:45 +01:00
Hypolite Petovan 8a9917857e Handle authentication exceptions in Login module 
- Break down large methods into smaller ones
- Add more authentication exception
- Add a legacy User::authenticate method
 2018-02-09 00:08:01 -05:00
Michael 1424559bee Forgotten "+" 2018-02-08 19:47:47 +00:00
Michael 70c31a6149 Improved date time formula thing. 2018-02-08 19:33:40 +00:00
Michael d70a20a466 We now incrementally calculate the queue delivery time 2018-02-08 18:39:48 +00:00
Michael 0093f863fd Don't add already queued items from Diaspora to the queue again 2018-02-08 11:26:24 +00:00
Michael 3890dfee4a Wrong function order in Item::update 2018-02-07 20:09:37 +00:00
Tobias Diekershoff 85c8bf0228
Merge pull request #4399 from MrPetovan/task/3878-move-include-bbcode-to-src 
Move include/bbcode to src/ part 1 : Everything but bbcode()
 2018-02-07 07:18:39 +01:00