Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-29 01:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
21880 commits 3 branches 64 tags 241 MiB
Commit graph

21880 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jonny Tischbein
d54e56c659 Fix batch action query + Fix Namespace import 2018-10-14 21:14:32 +02:00
Hypolite Petovan
ce74a4d9a1
Merge pull request #5921 from annando/ap-video 
ActivityPub: Rudimentary support for videos
 2018-10-14 14:05:51 -04:00
Jonny Tischbein
5fd4402074 code standards + fixing navigation links to /contact/... 2018-10-14 20:03:22 +02:00
Michael Vogel
68af56a10e
Merge pull request #5912 from MrPetovan/bug/fix-code-tag-nonsense 
Fix [code] tag whitespace nonsense
 2018-10-14 20:00:19 +02:00
Michael
37ad4a7d22 ActivityPub: Rudimentary support for videos 2018-10-14 17:57:44 +00:00
Hypolite Petovan
540adaf829 Use Model\Register methods in modules 
- Update registration emails to avoid storing the plaintext password in
the register table
- Remove redundant sprintf() when used with L10n::t()
- Remove redundant Systen::baseUrl() with goaway()
 2018-10-14 12:26:18 -04:00
Hypolite Petovan
59d6dd809d
Merge pull request #5906 from annando/ap-switch 
OStatus contacts are now automatically converted to AP
 2018-10-14 12:04:52 -04:00
Hypolite Petovan
123992384b Create Model\Register 
- Add Model\User::exists method
 2018-10-14 11:34:34 -04:00
Hypolite Petovan
7f143c3159 Fix various spelling mistakes 2018-10-14 11:32:54 -04:00
Hypolite Petovan
f2bde919e5 Fix ignored show_in_notification_page parameter in notification() 2018-10-14 11:30:39 -04:00
Hypolite Petovan
0563a28438 Replace System::baseUrl() by App->getBaseURL() in mod/register 
- Remove redundant System::baseUrl() in goaway() calls
- Add more generic Friendica\Model use statement
- Allow empty path in goaway()
 2018-10-14 11:19:59 -04:00
Hypolite Petovan
f7c020af04 Add HTML result boxes to mod/babel 2018-10-14 07:44:07 -04:00
Hypolite Petovan
a769efae38 Remove whitespace clearing around code tags 
- Normalize inline code blocks to <code>
 2018-10-14 07:43:44 -04:00