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

26775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael 3c8216e385 Fix notice about an unknown variable 2020-04-05 17:25:36 +00:00
Michael 9878689b1b Merge remote-tracking branch 'upstream/develop' into develop 2020-04-05 12:35:57 +00:00
Hypolite Petovan c3a8d55945
Merge pull request #8496 from annando/issue-8493 
Issue 8493: Avoid fatal error when fetching items via API
 2020-04-05 08:20:56 -04:00
Hypolite Petovan 0eab66253e
Merge pull request #8494 from annando/ap-fix-comments 
AP: Limited comment distribution
 2020-04-05 08:19:44 -04:00
Hypolite Petovan 594db70a72
Merge pull request #8500 from lynn-stephenson/develop 
Fix Password Reset Token Security
 2020-04-05 08:15:31 -04:00
Michael 09cc3bfd0a Some more code standards 2020-04-05 07:11:47 +00:00
Michael afc8783862 Code formatting 2020-04-05 07:08:20 +00:00
Michael 6ea1e18144 Merge remote-tracking branch 'upstream/develop' into develop 2020-04-05 07:02:49 +00:00
Hypolite Petovan d44c858320
Merge pull request #8497 from annando/issue-8495 
Issue 8495: Only use "noreply" when no sender mail is defined
 2020-04-04 19:30:01 -04:00
Michael 860d4654c1 Issue 8495: Only use "noreply" when no sender mail is defined 2020-04-04 20:26:09 +00:00
Michael f280dcaa5e Issue 8493: Avoid fatal error when fetching items via API 2020-04-04 20:00:40 +00:00
Michael bdd6e1913a AP: Limited comment distribution 2020-04-04 17:59:08 +00:00
Michael 320b6b9246 AP: Limited comment distribution 2020-04-04 17:53:48 +00:00
Lynn Stephenson 6cbcea1aac
Update lostpass.php 
reduce info leakage on password reset tokens
 2020-04-04 08:10:39 +00:00
Lynn Stephenson f459a35cf4
Update lostpass.php 
use CSPRNG for password reset token generation
 2020-04-04 08:06:49 +00:00
Tobias Diekershoff ad68aaae3f
Merge pull request #8492 from MrPetovan/task/8400-frio-jot-compose-link 
[frio] Add link to Compose page in jot
 2020-04-04 07:49:30 +02:00
Tobias Diekershoff 9440655a3a
Merge pull request #8491 from MrPetovan/task/translation 
Updated FR translation THX me
 2020-04-04 07:48:09 +02:00
Hypolite Petovan 40a7a43bd2 [frio] Add link to Compose page in jot 2020-04-03 16:33:00 -04:00
Hypolite Petovan c882ab2674 Updated FR translation 2020-04-03 15:45:14 -04:00
Michael Vogel efd549d466 Merge pull request #8486 from MrPetovan/task/8482-normalize-settings-page-display 
Normalize settings page display
 2020-04-02 22:42:03 +02:00
Hypolite Petovan 7d8fc8527e [frio] Remove obsolete CSS 2020-04-01 19:45:41 -04:00
Hypolite Petovan cc15381007 Refactor admin user settings page 
- Fix header hierarchy
- [frio] Fix panel display
 2020-04-01 19:45:31 -04:00
Hypolite Petovan 76feae2203 Refactor connector settings page 
- Fix header hierarchy
- [frio] Fix panel display
 2020-04-01 19:20:18 -04:00
Hypolite Petovan 91fb396ec1 Refactor profile edit page 
- Fix header hierarchy
- [frio] Fix panel display
 2020-04-01 19:14:37 -04:00
Hypolite Petovan b480e4eaa9 Refactor display page 
- Fix header hierarchy
- Fix panel display
 2020-04-01 19:06:11 -04:00
Hypolite Petovan 6bb210ff7a Refactor features pages 
- Create frio template for admin features page
- Fix header hierarchy
 2020-04-01 19:06:10 -04:00
Hypolite Petovan fd89572606 Refactor admin site settings templates 
- Fix header hierarchy in admin/site.tpl
- Fix panel display in frio/templates/admin/site.tpl
 2020-04-01 19:06:10 -04:00
Hypolite Petovan 5ce404f517 Refactor user settings page 
- Fix header hierarchy
- [frio] Fix panel display
- Move checkbox sub-template calls to template
 2020-04-01 19:06:00 -04:00
Hypolite Petovan 193e0d9613
Merge pull request #8484 from annando/barracuda 
Check for Antelope and convert to Barracuda
 2020-04-01 14:20:01 -04:00
Michael 01c6179feb Check for Antelope and convert to Barracuda 2020-04-01 18:11:06 +00:00
Michael Vogel 16ff943ed3
Merge pull request #8480 from MrPetovan/task/8425-remove-default-permission-modal 
Remove default post permission modal window
 2020-04-01 15:50:10 +02:00
Hypolite Petovan 3c50f985a9 Remove modal window for default post permission setting 2020-04-01 09:21:26 -04:00
Hypolite Petovan 0584667d13
Merge pull request #8481 from annando/mimetype 
Improved Mime Type detection
 2020-04-01 07:27:42 -04:00
Michael Vogel 9f25327189
Merge pull request #8471 from MrPetovan/bug/8470-twitter-expand-entities 
Add new Strings::substringReplace method
 2020-04-01 08:10:19 +02:00
Michael d3722c945b Improved Mime Type detection 2020-04-01 05:42:44 +00:00
Hypolite Petovan 0cd4e79cfd
Merge pull request #8479 from guzzisti/patch-1 
Update.md: be more precise about items to copy
 2020-03-31 13:07:57 -04:00
René Wagner 33957dc2a4
be more precise about items to copy 
be more precise about items to copy to the new friendica folder when upgrading
 2020-03-31 18:54:46 +02:00
Hypolite Petovan dcf59e34c1 Add new Strings::substringReplace method 
- Add tests for the method
 2020-03-30 10:49:53 -04:00
Hypolite Petovan 248a7fa48a Welcome 2020.06-dev! 2020-03-30 10:46:54 -04:00
Tobias Diekershoff 0c117424ee 2020.03 Red Hot Poker 2020-03-30 14:35:49 +02:00
Tobias Diekershoff 713552c39f
Merge pull request #8426 from tobiasd/2020.03-changelog 
2020.03 CHANGELOG
 2020-03-30 14:22:55 +02:00
Tobias Diekershoff 352383f7b2
Merge pull request #8472 from annando/prevent-loop 
Discover contacts: Prevent putting much stress on remote systems
 2020-03-30 09:10:20 +02:00
Michael 4aa89368ad Prevent putting much stress on remote systems 2020-03-30 06:22:32 +00:00
Tobias Diekershoff a110f7a7c6 some more problems fixed 2020-03-30 06:52:05 +02:00
Michael Vogel 5734fcbf21
Merge pull request #8469 from MrPetovan/bug/notices 
Add object key existence check in ActivityPub/Transmitter
 2020-03-29 23:29:34 +02:00
Michael Vogel cb482467bc
Merge pull request #8468 from MrPetovan/task/8286-ejabberd-docs 
Update documentation in bin/auth_ejabberd
 2020-03-29 22:23:51 +02:00
Hypolite Petovan f69c591166 Add object key existence check in ActivityPub/Transmitter 
- Addresses https://github.com/friendica/friendica/issues/8000#issuecomment-605614192
 2020-03-29 12:52:05 -04:00
Hypolite Petovan d9c817df1a Update documentation in bin/auth_ejabberd 2020-03-29 12:46:16 -04:00
Tobias Diekershoff 8eaab2cecb
Merge pull request #8465 from AlfredSK/AlfredSK-dont_mention_multiprofiles 
Remove multi profile mention in settings
 2020-03-29 14:35:50 +02:00
Michael Vogel 11f38ee303
Merge pull request #8466 from annando/internal-psid 
Should fix the unknown "internal-psid" field
 2020-03-29 14:31:44 +02:00