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

18375 Commits

Author SHA1 Message Date
Michael 0cc121cf44 Bugfix: Deleting comments via DFRN had only partly worked 2018-03-01 21:52:36 +00:00
Hypolite Petovan e54a7e7834
Merge pull request #4523 from annando/invitation-code 
"Invitation ID" is now "invitation code" to unify the description
 2018-03-01 15:53:10 -05:00
Hypolite Petovan b088ef83c5
Merge pull request #4524 from annando/delete-dfrn 
When deleting, don't send the parent via DFRN
 2018-03-01 15:52:51 -05:00
Michael 2f121aa828 When deleting, don't send the parent via DFRN 2018-03-01 20:44:44 +00:00
Michael 12f3a5ffad "Invitation ID" is now "invitation code" to unify the description 2018-03-01 19:29:01 +00:00
Hypolite Petovan 1693633e05
Merge pull request #4516 from annando/item-ordering 
Items on the network page should now be ordered always like expected
 2018-02-28 15:25:59 -05:00
Michael ccfaf6eef3 Items on the network page should now be ordered always like expected 2018-02-28 20:21:31 +00:00
Michael Vogel 617ace38e4
Merge pull request #4515 from MrPetovan/task/4513-hide-attendno-events 
Add attendance check to event reminder
 2018-02-28 15:29:16 +01:00
Hypolite Petovan 4d3ea08c97 Use NOT EXISTS to improve performance 2018-02-28 08:50:26 -05:00
Hypolite Petovan 90f91dcbd5
Merge pull request #4514 from annando/update-network 
After a post or "like" only the single thread is now updated
 2018-02-28 07:55:32 -05:00
Michael 60d00087f0 Don't do the restriction on thread starters when loading a single thread 2018-02-28 06:36:41 +00:00
Michael efb2b58c47 "update_item" is now 0 when not set 2018-02-28 04:58:53 +00:00
Hypolite Petovan f58d8f4108 Add attendance check to event reminder 2018-02-27 20:47:18 -05:00
Michael 02e969a73b Only update toplevel posts when ordered after posts 2018-02-27 23:25:29 +00:00
Michael 9cf342f02a Improved JS, updating single items now work 2018-02-27 22:37:11 +00:00
Michael 4070ad1815 After a post only the single post is now updated 2018-02-27 21:10:05 +00:00
Hypolite Petovan 99bea7f4c4
Merge pull request #4512 from annando/tag-comment 
Following tags on the network page should now work for comments as well
 2018-02-27 08:46:32 -05:00
Michael 99c6711cfd Following tags on the network page should now work for comments as well 2018-02-27 13:23:25 +00:00
Hypolite Petovan 4fe1d804ab
Merge pull request #4511 from annando/no-activity 
Only show visible activities
 2018-02-27 04:41:12 -05:00
Michael 74ff36eee9 Only show visible activities 2018-02-27 09:29:11 +00:00
Hypolite Petovan 9297f0305f
Merge pull request #4506 from annando/fix-update 
Fix for network update (number of maximum comments set to 0)
 2018-02-27 04:18:13 -05:00
Michael Vogel 1a8d8e4c07
Merge pull request #4510 from tobiasd/20180227-zhcn 
update to the zh-cn THX mytbk
 2018-02-27 08:13:13 +01:00
Tobias Diekershoff 52049d4cb2 update to the zh-cn THX mytbk 2018-02-27 08:00:28 +01:00
Tobias Diekershoff 0e0ba4a2dd
Merge pull request #4509 from annando/fix-network-update 
Bugfix: The network update after a post now works again
 2018-02-27 07:32:18 +01:00
Michael 15cd4792b8 Bugfix: The network update after a post now works again 2018-02-27 06:28:53 +00:00
Hypolite Petovan 16a55a021c
Merge pull request #4505 from annando/update-avatar 
Contact updates should now work more reliable
 2018-02-26 17:40:01 -05:00
Michael 20368cbbf4 Fix for network update (number of maximum comments set to 0) 2018-02-26 22:15:57 +00:00
Michael d4c95e0032 Contact updates should now work more reliable 2018-02-26 21:53:42 +00:00
Hypolite Petovan 01d2f7d5fb
Merge pull request #4504 from tobiasd/20180226-msg 
regen master messages.po with new help text in settings
 2018-02-26 12:01:48 -05:00
Tobias Diekershoff 324a2939c7 regen master messages.po with new help text in settings 2018-02-26 17:52:40 +01:00
Hypolite Petovan ba560ff76c
Merge pull request #4491 from tobiasd/20180224-settinghelp 
added some help texts to the Security and Privacy profile settings
 2018-02-26 11:30:23 -05:00
Tobias Diekershoff 56bd9ec148 not only the others 2018-02-26 17:27:00 +01:00
Tobias Diekershoff 1b7a307423 annon it is 2018-02-26 17:21:47 +01:00
Hypolite Petovan 3dac937f22
Merge pull request #4501 from annando/fix-tag-search 
Fix: Tag searches hadn't been stored as tags
 2018-02-26 11:13:51 -05:00
Hypolite Petovan 04f48e4cf6
Merge pull request #4503 from tobiasd/20180226-ganggo 
added ganggo project to the federation statistics page
 2018-02-26 11:13:34 -05:00
Tobias Diekershoff 3950b2f8c6 added ganggo project to the federation statistics page 2018-02-26 17:10:47 +01:00
Hypolite Petovan 2b9561a774
Merge pull request #4502 from annando/guid-from-mail 
guid creation: Take the hostname from mail addresses for mail posts
 2018-02-26 09:36:56 -05:00
Hypolite Petovan a64e7a988c
Merge pull request #4500 from annando/improve-network 
Loading of the network page should be faster now
 2018-02-26 09:35:23 -05:00
Michael 9e721c0908 guid creation: Take the hostname from mail addresses for mail posts 2018-02-26 11:48:05 +00:00
Michael 84ea6cab32 Fix: Tag searches hadn't been stored as tags 2018-02-26 11:45:53 +00:00
Michael a700b3a729 Fix for fetching too old dates 2018-02-26 10:44:54 +00:00
Michael 9ac9481105 Flexible update timeout value 2018-02-26 07:41:58 +00:00
Michael fe68e99c7c The tag query should be much faster now 2018-02-26 06:59:32 +00:00
Michael d2728cad2e Children for the network page are now fetched correctly in the conversation 2018-02-26 06:38:27 +00:00
Michael 9308b7f2df inner join is better 2018-02-25 21:58:21 +00:00
Michael a1eb5a584f Improve the queries on the network page 2018-02-25 21:33:15 +00:00
Tobias Diekershoff 28fa27ea0e some wording changes 2018-02-25 08:50:50 +01:00
Michael Vogel b8114f4e9d
Merge pull request #4493 from tobiasd/20180223-vagrant 
Some changes to the Vagrant configuration
 2018-02-24 13:31:20 +01:00
Tobias Diekershoff 8a844b1440 added some help texts to the Security and Privacy profile settings 2018-02-24 08:00:11 +01:00
Tobias Diekershoff b0b690ac94 the host name in the VM does not need the xenial anymore 2018-02-23 16:04:20 +01:00