Hypolite Petovan
|
057385a4ec
|
Add $is_quote_share parameter to convert share callback
- Restore former behavior when content is present before [share] block
|
2018-10-17 08:20:56 -04:00 |
|
Jonny Tischbein
|
05be2db725
|
Move include/security tp /src/Core/Authentication and /src/Util/Security
|
2018-10-17 14:19:58 +02:00 |
|
Hypolite Petovan
|
55e4b5943c
|
Merge pull request #5945 from zeroadam/More-5493
Remaining contacts to contact
|
2018-10-17 07:52:47 -04:00 |
|
Adam Magness
|
370ee08fcc
|
Remaining contacts to contact
Update occurrences of contacts/ to contact/
|
2018-10-17 07:49:27 -04:00 |
|
Hypolite Petovan
|
a21c1deb7e
|
Merge pull request #5944 from zeroadam/5943
Fix template urls from contacts/ to contact/
|
2018-10-17 07:40:49 -04:00 |
|
Adam Magness
|
2db8c7d64f
|
Fix template urls from contacts/ to contact/
Update templates to match recent contact/ changes.
|
2018-10-17 07:25:23 -04:00 |
|
Tobias Diekershoff
|
ae85543aec
|
Merge pull request #5941 from MrPetovan/bug/5932-fix-notices
Fix PHP notices S02E02
|
2018-10-17 07:42:51 +02:00 |
|
Hypolite Petovan
|
9239ecc5e0
|
Rework BBCode::convertShare to accept a callback function
- Create default convertShare callback from previous code
- Remove $simplehtml = 8 case (moved to Twitter addon)
|
2018-10-17 01:13:18 -04:00 |
|
Hypolite Petovan
|
45748da8a1
|
Remove network exception in handle_tag
|
2018-10-17 01:11:50 -04:00 |
|
Hypolite Petovan
|
b5fb81f535
|
Add Mastodon/Pleroma protocol guessing
|
2018-10-17 01:10:07 -04:00 |
|
Hypolite Petovan
|
c50be325bd
|
Remove unused parameter $selected in Model\Item::fieldlist
|
2018-10-16 18:30:24 -04:00 |
|
Hypolite Petovan
|
341b83d1df
|
Fix Undefined index: photo in ActivityPub/Receiver
|
2018-10-16 18:29:28 -04:00 |
|
Hypolite Petovan
|
cb854b8b10
|
Fix Undefined index: timezone in Protocol\Diaspora
|
2018-10-16 18:29:08 -04:00 |
|
Hypolite Petovan
|
2b1d15de87
|
Fix undefined index: id in Protocol\Diaspora
|
2018-10-16 18:28:27 -04:00 |
|
Hypolite Petovan
|
c4318fe05e
|
Fix notices in Parse URL feature
|
2018-10-16 18:27:13 -04:00 |
|
Hypolite Petovan
|
e9c9eb9c66
|
Fix notice in Worker\Delivery
|
2018-10-16 18:26:43 -04:00 |
|
Ralf Thees
|
2c0c92111f
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-16 21:01:10 +02:00 |
|
Hypolite Petovan
|
ff643c4b6a
|
Merge pull request #5940 from JonnyTischbein/issue_update_display_network
Fix redirect after edit post to /update_*
|
2018-10-16 13:37:19 -04:00 |
|
Jonny Tischbein
|
be2e6c3929
|
Fix Issue #5896 by setting static return for edit_post to display item page (kind of revert parts of #5774)
|
2018-10-16 19:14:55 +02:00 |
|
Hypolite Petovan
|
93c6dddc0d
|
Merge pull request #5939 from annando/onepoll
Onepoll hadn't polled anymore / small relocation in zrlinit for better logging
|
2018-10-16 11:27:48 -04:00 |
|
Michael
|
35a73b729f
|
Onepoll hadn't polled anymore / small relocation in zrlinit for better logging
|
2018-10-16 13:17:01 +00:00 |
|
Tobias Diekershoff
|
dbd2aa1196
|
Merge pull request #5938 from annando/magic-loop
Avoid endless loop at magic auth
|
2018-10-16 09:17:17 +02:00 |
|
Michael Vogel
|
24a4eb9699
|
Merge pull request #5936 from MrPetovan/bug/5932-fix-notices
Fix PHP notices S02E01
|
2018-10-16 08:42:25 +02:00 |
|
Michael
|
012fe3c11e
|
Avoid endless loop at magic auth
|
2018-10-16 06:32:12 +00:00 |
|
Hypolite Petovan
|
481b0ac138
|
Fix notices in include/enotify
|
2018-10-15 23:13:00 -04:00 |
|
Hypolite Petovan
|
0de1351a09
|
Fix notices in Network\Probe
|
2018-10-15 23:12:29 -04:00 |
|
Hypolite Petovan
|
c4cb396730
|
Merge pull request #5935 from MrPetovan/bug/5934-class-group-not-found
Fix namespace usage in mod/group
|
2018-10-15 18:36:32 -04:00 |
|
Hypolite Petovan
|
d71327e311
|
Fix namespace usage in mod/group
|
2018-10-15 18:35:36 -04:00 |
|
Hypolite Petovan
|
cbd49b641a
|
Merge pull request #5933 from annando/diaspora-signature
Signed Diaspora posts should now be stored more reliable
|
2018-10-15 18:12:45 -04:00 |
|
Michael
|
8d0f4710a4
|
Signed Diaspora posts should now be stored more reliable
|
2018-10-15 21:42:55 +00:00 |
|
Benjamin Lorteau
|
9e1065ff87
|
Improve transition from previous behavior
- Simplify Model\User methods parameter list
- Use DBA methods in mod/regmod
- Replace killme with exit in mod/regmod
- Simplify goaway() calls
|
2018-10-15 11:58:52 -04:00 |
|
Ralf Thees
|
f303f9edf2
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-15 15:16:21 +02:00 |
|
Michael Vogel
|
ab20a83c0a
|
Merge pull request #5930 from tobiasd/20181015-installdocs
added links to alternative ways to install Friendica to the docs
|
2018-10-15 14:10:50 +02:00 |
|
Tobias Diekershoff
|
092125edb6
|
ypot
|
2018-10-15 13:45:21 +02:00 |
|
Tobias Diekershoff
|
4496fdba24
|
use the right bracket
|
2018-10-15 13:44:09 +02:00 |
|
Tobias Diekershoff
|
c2c2f25d92
|
added links to alternative ways to install Friendica to the docs
|
2018-10-15 10:36:27 +02:00 |
|
Tobias Diekershoff
|
664afbcafb
|
Merge pull request #5926 from annando/defer-worker
Poddibility to defer worker execution
|
2018-10-15 08:02:51 +02:00 |
|
Michael
|
e2762e032c
|
Poddibility to defer worker execution
|
2018-10-15 05:19:35 +00:00 |
|
Michael Vogel
|
0080d117ee
|
Merge pull request #5923 from MrPetovan/task/improve-contact-module
Improve Contact module
|
2018-10-15 06:02:55 +02:00 |
|
Hypolite Petovan
|
ea8b159df4
|
Fix wrong use statement in mod/update_contacts
|
2018-10-14 23:09:11 -04:00 |
|
Hypolite Petovan
|
aa8039373a
|
Update formatting of Module\Contact
- Replace double quotes with single
- Align array declarations
- Replace q() call with Model\User::getOwnerDataById()
|
2018-10-14 18:30:02 -04:00 |
|
Hypolite Petovan
|
a883a99fe6
|
Replace string fields by array in Module\Contact
|
2018-10-14 18:27:24 -04:00 |
|
Hypolite Petovan
|
12ddb3bb54
|
Replace unwarranted uses of $a->data['contact']
|
2018-10-14 18:25:44 -04:00 |
|
Hypolite Petovan
|
57e8fb5cb1
|
Normalize uses of defaults() in Module\Contact
- Remove uses without default value
- Add relevant uses
|
2018-10-14 18:24:02 -04:00 |
|
Hypolite Petovan
|
756a4f1111
|
Fix remaining instances of "contacts"
|
2018-10-14 18:02:54 -04:00 |
|
Hypolite Petovan
|
ce8b0d0c45
|
Merge pull request #5922 from JonnyTischbein/issue_delete_since
Admin: Change User deleted since to delete in
|
2018-10-14 17:17:18 -04:00 |
|
Jonny Tischbein
|
3a95644848
|
Add Support for relativeDateTime in future + update Admin user waiting for deleting table header
|
2018-10-14 22:57:44 +02:00 |
|
Hypolite Petovan
|
74c5f1f684
|
Merge pull request #5891 from JonnyTischbein/move_module_contacts
Move module contacts
|
2018-10-14 16:42:50 -04:00 |
|
Ralf Thees
|
a97b540ebb
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-14 21:48:20 +02:00 |
|
Jonny Tischbein
|
e41c59b193
|
Fix batch action choice - All Actions for one contact were taken before
|
2018-10-14 21:38:38 +02:00 |
|