friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
25,964 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

25964 Commits

Author SHA1 Message Date
Michael ccc7a71e54 Ensure that local contacts always are DFRN contacts 2020-01-16 06:43:21 +00:00
Hypolite Petovan 7db4c7ea02
Merge pull request #8118 from annando/spamcheck 
Improved spam protection
 2020-01-15 13:15:17 -05:00
Michael Vogel 8ebc385772 Improved spam protection 2020-01-15 18:55:32 +01:00
Hypolite Petovan 7bf00984ec
Merge pull request #8079 from ozero/patch-1 
[frio] Stop scrollToItem() animate twice.
 2020-01-15 08:19:25 -05:00
ozero dien 0a5b3a2bc7
Update theme.js 
Reverted the animation change.
 2020-01-15 18:58:00 +09:00
Hypolite Petovan 831fff0f5c
Merge pull request #8117 from annando/inbox 
Use the "inbox" symbol as a symbol for mails
 2020-01-14 23:11:49 -05:00
Hypolite Petovan 4156669c3f
Merge pull request #8116 from annando/archive 
The archive functionality is working again
 2020-01-14 23:10:19 -05:00
Michael b7067ee836 Use the "inbox" symbol as a symbol for mails 2020-01-15 04:09:58 +00:00
Michael 8215c493cf The archive functionality is working again 2020-01-15 04:06:30 +00:00
Hypolite Petovan 4a5a74b674
Merge pull request #8115 from annando/path 
Use only the first part of the path for the local storage
 2020-01-14 08:22:07 -05:00
Michael e7a652851e Use only the first part of the path for the local storage 2020-01-14 07:04:42 +00:00
Hypolite Petovan 326cc53b8b
Merge pull request #8114 from annando/vier-forumlist 
Vier: The forumlist doesn't appear on the left in wide view
 2020-01-13 18:35:17 -05:00
Michael c7beffa5ca Vier: The forumlist doesn't appear on the left in wide view 2020-01-13 22:14:14 +00:00
Hypolite Petovan e64336b4d3
Merge pull request #8113 from annando/build-query 
Remove "f" parameter / network page parameter cleanup
 2020-01-13 15:23:54 -05:00
Michael b83f328983 Remove "f" parameter / network page parameter cleanup 2020-01-13 20:10:13 +00:00
Hypolite Petovan 11a0b3ea87
Merge pull request #8112 from annando/build-query 
Use "http_build_query" to build queries
 2020-01-13 13:02:25 -05:00
Michael ac04ff88b8 Improved code 2020-01-13 17:10:11 +00:00
Michael 1c9fa4451a Improved query 2020-01-13 17:07:05 +00:00
Michael c65a5cc0d5 Use "http_build_query" to build queries 2020-01-13 17:03:04 +00:00
Hypolite Petovan a0bf7a8c94
Merge pull request #8111 from annando/tag-entities 
Tags and mentions should be escaped
 2020-01-13 10:47:37 -05:00
Michael 43e3b14672 Tags and mentions should be escaped 2020-01-13 15:37:46 +00:00
Tobias Diekershoff c84a8ebe78
Merge pull request #8108 from annando/server-detection 
Improved server platform detection
 2020-01-13 08:00:01 +01:00
Michael bc83eb5c4e Improved server platform detection 2020-01-13 05:57:05 +00:00
Hypolite Petovan 7e1cbf8f67
Merge pull request #8107 from annando/lower-platform 
User lowercase for platform data
 2020-01-12 18:42:06 -05:00
Michael fba46111b1 Merge remote-tracking branch 'upstream/develop' into lower-platform 2020-01-12 21:54:58 +00:00
Michael eb011f47bb Publish lowercase 2020-01-12 21:13:16 +00:00
Michael 7b060aa3f5 User lowercase for platform data 2020-01-12 21:07:40 +00:00
Michael Vogel 9b7e099d9b
Merge pull request #8105 from MrPetovan/bug/8098-intros-ignore-ignored 
Fix typo in intro table field name
 2020-01-12 20:30:26 +01:00
Hypolite Petovan f41a219f49
Merge pull request #8092 from annando/inverted 
The widgets are now inflated by default
 2020-01-12 13:47:37 -05:00
Michael 6ccf038053 Merge remote-tracking branch 'upstream/develop' into inverted 2020-01-12 18:18:45 +00:00
Tobias Diekershoff 5fe95d7539
Merge pull request #8106 from MrPetovan/bug/8097-event-share-default 
Initial event share status doesn't depend on the user's default permissions anymore
 2020-01-12 19:06:11 +01:00
Hypolite Petovan b12c646503 Initial event share status doesn't depend on the user's default permissions anymore 2020-01-12 12:16:56 -05:00
Hypolite Petovan 3693b0c5ca Fix typo in intro table field name 2020-01-12 10:55:47 -05:00
Tobias Diekershoff d45575e0fa
Merge pull request #8102 from annando/servertest 
Improved test for invalid systems
 2020-01-12 14:59:48 +01:00
Michael d9f26aed66 Use local storage 2020-01-12 12:56:44 +00:00
Michael 9c4f3763ae Improved test for invalid systems 2020-01-12 12:50:00 +00:00
Hypolite Petovan 4dacd5db44
Merge pull request #8100 from annando/statistics 
Combine matching systems
 2020-01-12 06:55:55 -05:00
Michael a357b0bf37 Combine matching systems 2020-01-12 11:22:36 +00:00
Tobias Diekershoff 3c1f127e3c
Merge pull request #8099 from annando/statistics 
The federation statistics now contain all systems
 2020-01-12 11:44:45 +01:00
Michael 3f8b6cb118 Improved order of systems 2020-01-12 09:40:17 +00:00
Michael 1a2a260e9a Improved documentation 2020-01-12 08:36:11 +00:00
Michael 3d1be9f2d1 The federation statistics now contain all systems 2020-01-12 08:14:32 +00:00
Philipp 33664ebb48
Merge pull request #8095 from annando/local-delivery 
Ensure that local delivery is done via DFRN
 2020-01-11 20:12:11 +01:00
Michael 28c54242a5 The value has to be assigned, not compared :-) 2020-01-11 18:28:04 +00:00
Michael e6a054696d Ensure that local delivery is done via DFRN 2020-01-11 18:25:48 +00:00
Philipp eba46e786a
Merge pull request #8094 from annando/deletecontact 
Ensure that deleted contacts are really removed
 2020-01-11 18:40:46 +01:00
Philipp 4e3849c18b
Merge pull request #8089 from mexon/mat/repair-contact-photo 
updateAvatar automatically repairs avatars when photos are deleted
 2020-01-11 18:30:34 +01:00
Michael 0225e99d0a Ensure that deleted contacts are really removed 2020-01-11 17:22:37 +00:00
Matthew Exon e002365d7f Add type declaration to parameter 2020-01-11 16:27:01 +01:00
Philipp fa39a455a7
Merge pull request #8093 from annando/postcount 
The item count is now done in a single query
 2020-01-11 16:02:47 +01:00