Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 17:20:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
22074 commits 3 branches 64 tags 237 MiB
Commit graph

22074 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff
06b20425e6
Merge pull request #6392 from annando/issueö6347 
Issue 6347: Removing the old way to fetch Diaspora posts
 2019-01-06 08:48:33 +01:00
Michael
9a4fc0f8bd Issue 6347: Removing the old way to fetch Diaspora posts to avoid Hubzilla problems 2019-01-06 07:43:11 +00:00
Hypolite Petovan
00cc3e779b
Merge pull request #6388 from annando/update-contacts 
Periodically update contacts / update the contact type
 2019-01-05 23:43:38 -05:00
Michael
3022abe74c Reset the "forum" and "prv" field 2019-01-05 23:02:58 +00:00
Hypolite Petovan
93ba6ced32
Merge pull request #6387 from tobiasd/20190105-defaq 
adding lang parameter to DE FAQ
 2019-01-05 17:09:10 -05:00
Michael
e88734e218 Periodically update contacts / update the contact type 2019-01-05 22:04:32 +00:00
Tobias Diekershoff
d16cb9b879 typo 2019-01-05 20:48:32 +01:00
Tobias Diekershoff
4efa513065 adding lang parameter to DE FAQ 2019-01-05 20:45:42 +01:00
Hypolite Petovan
491a404f1f
Merge pull request #6385 from tobiasd/20190105-translationdocs 
clarification for the translation of addons.
 2019-01-05 12:57:16 -05:00
Tobias Diekershoff
ec87d1af08 clarification for the translation of addons. 2019-01-05 18:44:22 +01:00
Hypolite Petovan
35c38c77e2 Update version constant to 2019.01-rc 2019-01-04 21:04:49 -05:00
Hypolite Petovan
fc87c51bb4
Merge pull request #6377 from annando/ostatus-notice 
Prevent a notice ... again
 2019-01-04 11:28:31 -05:00
Michael
d8d5031935 Prevent a notice ... again 2019-01-04 15:34:53 +00:00
Michael Vogel
1f7ffce07a
Merge pull request #6371 from MrPetovan/bug/6370-use-nickname-in-register-emails 
Use nickname instead of email for Login Name
 2019-01-04 05:40:29 +01:00
Hypolite Petovan
e86b8ef782 Use nickname instead of email for Login Name 2019-01-03 20:42:29 -05:00
Michael Vogel
b8030313e5
Merge pull request #6364 from rabuzarus/20190102_-_fix_magic_links_for_remote_users 
Bugfix - the remote user also has magicLinks again
 2019-01-03 18:04:36 +01:00
Hypolite Petovan
d1fb0be556 Updated RC version name 2019-01-03 01:03:18 -05:00
Michael Vogel
0eef382e82
Merge pull request #6365 from MrPetovan/bug/6363-unescape-prev-next-link 
Unescape $prevlink and $nextlink template variables
 2019-01-03 04:54:12 +01:00
Hypolite Petovan
ff50f2bb65 Unescape $prevlink and $nextlink template variables 2019-01-02 19:06:23 -05:00
rabuzarus
67a8f9dbd4 Bugfix - the remote user also has magicLinks again 2019-01-02 17:47:53 +01:00
Michael Vogel
f51918e9e9
Merge pull request #6362 from MrPetovan/bug/6360-6361-unescape-profiles 
Unescape profiles template variables
 2019-01-01 21:39:53 +01:00
Hypolite Petovan
2f15f1c477 Unescape profiles template variables 2019-01-01 11:45:36 -05:00
Michael Vogel
931971ae64
Merge pull request #6359 from MrPetovan/bug/6358-unescape-invite-desc 
Unescape $invite_desc in follow/register templates
 2019-01-01 09:37:40 +01:00
Hypolite Petovan
0dc06d66a0 Unescape $invite_desc in follow/register templates 2019-01-01 02:50:37 -05:00
Tobias Diekershoff
e7ee3d7200
Merge pull request #6345 from MrPetovan/bug/6283-clear-message-notifications 
Clear private message notifications
 2018-12-31 08:21:55 +01:00
Michael Vogel
dc05ada059
Merge pull request #6351 from MrPetovan/bug/6350-unescape-admin-warning-text 
Unescape admin warning text
 2018-12-30 16:41:05 +01:00
Michael Vogel
ecac463d89
Merge pull request #6352 from MrPetovan/bug/6349-normalize-config-line-endings 
Normalize config file line endings to LF
 2018-12-30 16:40:47 +01:00
Michael Vogel
9d70224a9c
Merge pull request #6353 from MrPetovan/bug/6343-unescape-plaintext-email 
Unescape plaintext email body
 2018-12-30 16:40:15 +01:00
Hypolite Petovan
5db5cc904a Unescape plaintext email body 2018-12-30 10:20:38 -05:00
Hypolite Petovan
ac7f7bb74f Normalize config file line endings to LF 2018-12-30 10:15:12 -05:00
Hypolite Petovan
e0a763b07f Unescape admin warning text 2018-12-30 10:12:13 -05:00
Tobias Diekershoff
034d0f650b
Merge pull request #6340 from MrPetovan/bug/1495-fix-admin-theme-settings 
Fix site theme settings modal form
 2018-12-30 10:35:44 +01:00
Hypolite Petovan
e9b05bd13f Remove fake private message notifications from ping output 2018-12-30 01:11:30 -05:00
Hypolite Petovan
36f995ed20 Add notification clear on private message display 2018-12-30 01:11:02 -05:00
Hypolite Petovan
3095d4aa70 Add parent to private message notifications 
- Fix item id for Diaspora private message notification
 2018-12-30 01:10:10 -05:00
Hypolite Petovan
5abc22f6c5 Replace q() with DBA methods, fix code style 
- Remove unused variables
- Fix doc block
- Fix indentation
 2018-12-30 01:08:51 -05:00
Hypolite Petovan
d838e6d0ec Fix unread message conversation title display 2018-12-30 01:04:52 -05:00
Hypolite Petovan
12dfb8e5cf Make NOTIFY_* constant values human-readable 2018-12-30 01:04:20 -05:00
Hypolite Petovan
838c0f96de Use minimal mode to change site theme settings 
- Use textarea in colorbox instead of inline HTML
- Add mode propagation to site theme setting form
- Set theme for site theme settings form to load JS dependencies
 2018-12-29 15:40:05 -05:00
Hypolite Petovan
62f5438bb3 Remove useless trailing slash in admin/addon_details.tpl 2018-12-29 15:40:05 -05:00
Hypolite Petovan
fdcdbe287e [frio] Fix minimal layout 2018-12-29 15:40:04 -05:00
Hypolite Petovan
979230da27 Allow theme setting in module 
- Restore theme name caching
 2018-12-29 15:40:04 -05:00
Hypolite Petovan
435cfd7de5 Fix screenshots URLs in frio readme 2018-12-29 15:39:50 -05:00
Hypolite Petovan
166b8ad440
Merge pull request #6342 from annando/notices 
Warning and notice fixed
 2018-12-29 12:16:37 -05:00
Tobias Diekershoff
7efde8e334
Merge pull request #6209 from MrPetovan/task/move-config-to-php-array 
Remove util/ folder
 2018-12-29 11:43:55 +01:00
Michael Vogel
bf1f164ece
Merge pull request #6341 from MrPetovan/bug/parseurl-charset 
Replace latin-1 by latin1 in charset detection
 2018-12-29 11:00:06 +01:00
Michael
fd6c64f9c1 Warning and notice fixed 2018-12-29 09:53:31 +00:00
Hypolite Petovan
37c7a18d00 Replace latin-1 by latin1 in charset detection 
- Simplify conditional for charset conversion
 2018-12-29 00:43:00 -05:00
Hypolite Petovan
16f58c8982
Merge pull request #6333 from annando/avoid-wsod 
Avoid a WSOD after PR 6315
 2018-12-27 13:14:22 -05:00
Michael
5ddf3898db Avoid a WSOD after PR 6315 2018-12-27 17:17:02 +00:00