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

19697 Commits

Author SHA1 Message Date
Hypolite Petovan cfeace3e40
Merge pull request #5097 from tobiasd/20180520-credits 
regen credits
 2018-05-20 09:16:27 -04:00
Tobias Diekershoff b6e02e2f0f cleanup 2018-05-20 15:02:44 +02:00
Tobias Diekershoff 48aafe4662 fixing the base path detection 2018-05-20 14:56:33 +02:00
Tobias Diekershoff 5419ae93a1 regen credits 2018-05-20 14:56:03 +02:00
Tobias Diekershoff 0eac8d195e 7th addin newly fixed issue 2018-05-20 14:42:12 +02:00
Tobias Diekershoff 76c805a315 6th draft adding the work till May 2018-05-20 14:37:21 +02:00
Hypolite Petovan 0ba6c5ec07
Merge pull request #5094 from tobiasd/2018.05-rc 
regen master messages.po
 2018-05-20 08:27:49 -04:00
Tobias Diekershoff 5f2951cdda regen master messages.po 2018-05-20 14:25:07 +02:00
Hypolite Petovan c41332364f
Merge pull request #5089 from tobiasd/20180519-tos 
privacy statement
 2018-05-20 08:20:16 -04:00
Tobias Diekershoff d78b1f5191
Merge pull request #5091 from annando/issue-4956 
Don't fail during installation because of a missing theme configuration
 2018-05-20 08:50:28 +02:00
Tobias Diekershoff f7c24a20ae cite: just some small styling thing 2018-05-20 08:43:43 +02:00
Michael 9d0ed1a2af Issue 4956: Don't fail during installation because of a missing theme configuration 2018-05-20 05:44:20 +00:00
Hypolite Petovan cb1b182f7c
Merge pull request #5090 from annando/issue-3412 
Issue-3412 related: Don't send connection posts anymore
 2018-05-19 16:12:52 -04:00
Michael c70ebadd7d Issue-3412 related: Don't send connection posts anymore 2018-05-19 19:34:51 +00:00
Tobias Diekershoff 2798d4ea4d missing sign 2018-05-19 19:08:50 +02:00
Tobias Diekershoff 4f8530070b removed one line too much 2018-05-19 19:07:13 +02:00
Tobias Diekershoff e02093c7ea text of the priv. statement can now be shown outside of the module 2018-05-19 18:55:29 +02:00
Tobias Diekershoff dd629d5fa4 registration: added display of privacy statement if enabled 2018-05-19 18:53:54 +02:00
Tobias Diekershoff ae62c1d1ea admin panel: added privacy statement preview 2018-05-19 18:52:23 +02:00
Tobias Diekershoff 139f7cdc41
Merge pull request #5088 from annando/display-update 
Follow up: Display update should really be fixed now.
 2018-05-19 18:19:52 +02:00
Michael e28819655c Follow up: Display update should really be fixed now. 2018-05-19 16:04:57 +00:00
Hypolite Petovan d4ebf7ae52
Merge pull request #5086 from annando/issue-2880 
Issue 2880: Editing post doesn't destroy mentions or hashtags anymore
 2018-05-19 12:01:05 -04:00
Tobias Diekershoff 9b55e52184
Merge pull request #5087 from annando/issue-4819 
Issue 4819: The introduction note is now stored
 2018-05-19 17:44:42 +02:00
Michael c214353a5d Issue 4819: The introduction note is now stored displayed on the contact page. 2018-05-19 15:29:34 +00:00
Michael 3fe07cca57 Issue 2880: Editing post doesn't destroy mentions or hashtags anymore 2018-05-19 14:55:27 +00:00
Hypolite Petovan bba5ce14f7
Merge pull request #5085 from annando/display-update 
Fix constant display updates
 2018-05-19 08:15:59 -04:00
Michael b1a9030369 Fix constant display updates 2018-05-19 06:12:55 +00:00
Tobias Diekershoff 81089e1b2e
Merge pull request #5083 from annando/fix-spamming 
Fix: Avoid getting spammed when an admin has got several accounts
 2018-05-19 08:06:33 +02:00
Michael 1cd6976faa Fix missing $ 2018-05-19 05:59:43 +00:00
Tobias Diekershoff 5ae9193aa7
Merge pull request #5084 from annando/dead-subscriber 
End subscription for unreachable subscribers
 2018-05-19 07:07:00 +02:00
Michael e9848d7b8f End subscription for unreachable subscribers 2018-05-19 03:56:29 +00:00
Michael a4d976b70f Fix: Avoid getting spammed when an admin has got several accounts 2018-05-19 03:38:43 +00:00
Hypolite Petovan 931e9182ff
Merge pull request #5082 from annando/federation-warning 
Avoid warning when no valid data could be read
 2018-05-18 12:26:08 -04:00
Michael 5d708fd9a9 Avaoid warning when no valid data could be read 2018-05-18 16:07:55 +00:00
Hypolite Petovan 2460cbc09e
Merge pull request #5081 from annando/ostatus-subscription-fix 
Fix for subscribing to the wrong feed from OStatus
 2018-05-18 09:31:07 -04:00
Michael be469f6bca Fix for subscribing to the wrong feed from OStatus 2018-05-18 13:23:27 +00:00
Hypolite Petovan 83ff57777f
Merge pull request #5079 from annando/fix-self 
Fix: Sometimes the contact endpoints seem to be wrong
 2018-05-18 08:54:00 -04:00
Hypolite Petovan 599551ba51
Merge pull request #5080 from annando/changed-structure 
Changed database structure
 2018-05-18 08:53:37 -04:00
Michael 0374b0be6a Changed database structure 2018-05-18 12:50:57 +00:00
Hypolite Petovan 2b0d37b7d0
Merge pull request #5078 from annando/fix-ostatus-subscription 
Fix: Subscriptions from GNU Social partially don't work
 2018-05-18 08:27:31 -04:00
Michael 8983c61023 Fix: Sometimes the contact endpoints seem to be wrong 2018-05-18 12:26:10 +00:00
Michael feb3d76a5b Fix: Subscriptions from GNU Social partially don't work 2018-05-18 12:18:12 +00:00
Hypolite Petovan 13ae3436b6
Merge pull request #5076 from tobiasd/20180517-extract 
dont parse the addons directory for translateable strings
 2018-05-17 19:59:57 -04:00
Hypolite Petovan 1d2b0c0a81
Merge pull request #5077 from annando/fix-blocking-ostatus 
Fix to OStatus delivery to be not so blocking to other tasks
 2018-05-17 19:59:08 -04:00
Michael 4355014492 Now it should work ... 2018-05-17 23:47:15 +00:00
Michael f4a71b76dd Dynamic priority handling 2018-05-17 23:43:44 +00:00
Michael 6a8c85fac4 Changed database structure 2018-05-17 23:35:24 +00:00
Michael 61824119e4 Moved functionality in new model class 2018-05-17 23:30:49 +00:00
Michael 5a1e1c1ec9 Fix to OStatus delivery to be not so blocking to other tasks 2018-05-17 22:17:03 +00:00
Tobias Diekershoff fb4f9eb875 dont parse the addons directory for translateable strings 2018-05-17 22:41:06 +02:00