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

274 Commits

Author SHA1 Message Date
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 ba35b19af6 Public federated items now always are having an entry with "uid=0" 2018-04-23 11:14:25 +00: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
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
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