Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-11 20:22:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
26956 commits 3 branches 64 tags 246 MiB
Commit graph

26956 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
cb593226bf Spaces and newlines 2020-04-15 11:39:00 +00:00
Michael
f52614e249 Merge remote-tracking branch 'upstream/develop' into term2tag 2020-04-15 11:31:52 +00:00
Hypolite Petovan
57cd063da1
Merge pull request #8519 from annando/item-select 
Fix: some selected item fields hadn't been selected
 2020-04-15 07:07:30 -04:00
Michael
a5f84c8991 The old fields are not existing anymore 2020-04-15 05:57:07 +00:00
Michael
fe48b078e4 The old fields don't exist anymore 2020-04-15 05:51:06 +00:00
Michael
54a4b4df3b Whitespace removed 2020-04-15 05:33:11 +00:00
Michael
2b41229a6a Merge branch 'item-select' of github.com:annando/friendica into item-select 2020-04-15 05:31:26 +00:00
Michael
8e3eceaeb0 Merge remote-tracking branch 'upstream/develop' into item-select 2020-04-15 05:30:04 +00:00
Michael
496d882d06 Fix: some selected item fields hadn't been selected 2020-04-15 05:28:54 +00:00
Michael
0d5d0bb65a Fix: some selected item fields hadn't been selected 2020-04-15 05:24:36 +00:00
Michael
e5a0ff9572 Fix for missing fields 2020-04-15 05:11:45 +00:00
Michael
9a0d2c9e0c The new tag table should work for feeds no as well 2020-04-15 05:10:40 +00:00
Michael
010491e0b0 Don't use "sensitive" 2020-04-14 17:18:48 +00:00
Michael
1e702d4145 Corrections for DFRN, added support for OStatus 2020-04-14 17:00:56 +00:00
Michael
3f4c85dead Store the tags with DFRN as well 2020-04-14 16:52:53 +00:00
Michael
df898bd3d3 Improved logging 2020-04-14 09:19:45 +00:00
Michael
6fa43ffa71 Store tags for Diaspora - shorten tags when needed 2020-04-14 07:56:53 +00:00
Michael
67a67200a7 Storing mentions in Diaspora and AP 2020-04-13 23:54:28 +00:00
Michael
661dd43b0d Term constants updated 2020-04-13 19:24:22 +00:00
Hypolite Petovan
0773d26aa8
Merge pull request #8512 from annando/no-sign 
The "sign" table had been removed
 2020-04-13 13:54:52 -04:00
Michael
552fd98657 The "sign" table had been removed 2020-04-13 16:27:40 +00:00
Michael Vogel
b5637b8cfc
Merge pull request #8504 from MrPetovan/task/8489-ap-cache-cors-headers 
Add cache, ETag and CORS headers to AP endpoints
 2020-04-06 06:37:21 +02:00
Tobias Diekershoff
e631c17c26
Merge pull request #8502 from MrPetovan/task/translation 
Improve bin/run_xgettext and regenerate master messages.po
 2020-04-06 06:13:52 +02:00
Hypolite Petovan
af817b2ad5 Add cache and CORS headers to ActivityPub endpoints 2020-04-05 18:02:38 -04:00
Hypolite Petovan
1e32f74b0b Rework Module/Objects 
- Merge two item queries into one
- Add ETag check
- Use Router parameter
 2020-04-05 18:00:46 -04:00
Hypolite Petovan
f96d1fbd0b Add Network::checkEtagModified method 2020-04-05 17:58:09 -04:00
Hypolite Petovan
7899892351
Merge pull request #8503 from annando/xmlhead-notice 
Fix notice about an unknown variable
 2020-04-05 16:46:52 -04:00
Michael
3c8216e385 Fix notice about an unknown variable 2020-04-05 17:25:36 +00:00
Hypolite Petovan
4b8aaeceea Regenerate master messages.po 
- Fix translation text error in include/enotify
 2020-04-05 11:12:41 -04:00
Hypolite Petovan
4621da7ef2 Improve bin/run_xgettext script 
- Exclude more folders from find
- Add progress ratio
- Add computed current year
 2020-04-05 11:12:41 -04:00
Tobias Diekershoff
cc1bf3edf9
Merge pull request #8501 from annando/notice 
Fix weird call to "l10n"
 2020-04-05 15:48:53 +02:00
Michael
e7ce2bfd82 Fix weird call to "l10n" 2020-04-05 13:26:22 +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