nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
17390 commits 2 branches 55 tags 148 MiB
Commit graph

17390 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Magness
a59ab5552e Includes and calls 
Remove includes and update function calls
 2018-01-09 09:59:52 -05:00
Adam Magness
edfb08a779 Update new function 
update function name and statements
 2018-01-09 09:48:31 -05:00
Adam Magness
fd1515eff4 Update function 
Update the update function
 2018-01-09 09:44:22 -05:00
Adam Magness
878ce3b858 Move follow functions 
move follow functions into Contact class
 2018-01-09 09:40:45 -05:00
Tobias Diekershoff
c3cfbbc461
Merge pull request #4190 from MrPetovan/task/2103-improve-phpcs-ruleset 
Improve PHP Code Sniffer ruleset
 2018-01-09 06:42:55 +01:00
Hypolite Petovan
143a0e3bc6 Improve PHP Code Sniffer ruleset 
- Pull Friendica specifics from
vendor/pear/text_languagedetect/phpcs.xml
- Revert changes to vendor/pear/text_languagedetect/phpcs.xml
 2018-01-08 23:37:18 -05:00
Hypolite Petovan
390d5706f4
Merge pull request #4123 from Rudloff/feature/ruleset 
Custom PHPCS ruleset
 2018-01-08 09:14:46 -05:00
Tobias Diekershoff
f68a0471dc
Merge pull request #4188 from rabuzarus/20180108_-_registered_users_docu 
add registered-users to the db docu
 2018-01-08 15:11:44 +01:00
rabuzarus
9db936013c add registered-users to the db docu 2018-01-08 14:57:50 +01:00
Michael Vogel
f9c813cfbd
Merge pull request #4187 from rebeka-catalina/rct/d/directory_htconfig.php 
Removed directory setting from htconfig.md and changed the example
 2018-01-08 11:09:07 +01:00
rebeka-catalina
f4707d03d9 Removed directory setting from htconfig.md and changed the example 2018-01-08 10:46:33 +01:00
Tobias Diekershoff
746876ab44
Merge pull request #4186 from annando/follow-tags 
We can now follow hash tags
 2018-01-08 09:51:12 +01:00
Michael
a5536086dd Merge remote-tracking branch 'upstream/develop' into follow-tags 2018-01-08 07:04:15 +00:00
Michael
b007823bca Only do it when public commenting is enabled 2018-01-08 06:59:49 +00:00
Michael
e2ed1fb426 Only show tagged items when there is no filter active 2018-01-08 06:57:51 +00:00
Tobias Diekershoff
c337bdc280
Merge pull request #4185 from MrPetovan/bug/4184-fix-allowed-email-domains 
Fix allowed_email()
 2018-01-08 07:09:36 +01:00
Hypolite Petovan
4a20bcd6f0 Fix allowed_email() 
- Reworked allowed_domain
- Added more variable checks to allowed_email() and
OEmbed::isAllowedURL()
 2018-01-07 19:10:09 -05:00
Michael
10b237829f We now can follow hash tags 2018-01-07 22:07:16 +00:00
Hypolite Petovan
6496a721ea
Merge pull request #4182 from annando/notify-public-post 
Sends notifications for public posts with "uid=0"
 2018-01-07 15:54:57 -05:00
Michael
24d7b2af82 One more query 2018-01-07 18:11:48 +00:00
Michael
28d3980fab Changed queries 2018-01-07 18:06:06 +00:00
Michael
e12b6e01a2 Best "uid" for sending comments, refresh after commenting might work now 2018-01-07 17:14:43 +00:00
Michael Vogel
511572533e
Merge pull request #4183 from MrPetovan/bug/4173-fix-oembed-iframe-url 
Restore tryoembed callback function
 2018-01-07 18:10:00 +01:00
Hypolite Petovan
96221a58a2 Fix typo in admin settings 2018-01-07 10:15:46 -05:00
Hypolite Petovan
5605bdd289 Remove debug code 2018-01-07 10:02:21 -05:00
Hypolite Petovan
ca77bff933 Restore tryoembed callback 
- Remove irritating extra <br> before shared content
 2018-01-07 10:01:41 -05:00
Michael
708d034c6d We have to check for the contacts uid not the items uid 2018-01-07 12:10:31 +00:00
Michael
592ef50e41 Dropping is now possible as well 2018-01-07 11:59:54 +00:00
Michael
f2efd58366 Sends notifications for public posts with "uid=0" 2018-01-07 11:08:36 +00:00
Michael Vogel
1fdde9b140
Merge pull request #4179 from MrPetovan/bug/4173-fix-oembed-iframe-url 
Fix OEmbed iframe
 2018-01-07 09:28:44 +01:00
Tobias Diekershoff
1ac63964f4
Merge pull request #4181 from AndyHee/More-screenshots 
More screenshots
 2018-01-07 09:00:55 +01:00
Andy H3
52aa795c27
Update README.md 2018-01-07 14:38:07 +07:00
Andy H3
c3f13b182c
Add files via upload 2018-01-07 14:36:46 +07:00
Hypolite Petovan
d8a312d286 Move tryoembed to Content\OEmbed 
- Add bbcode functions documentation
- Add Exception handling to OEmbed::getHTML
- Fix formatting
 2018-01-07 00:44:23 -05:00
Hypolite Petovan
1cd8001833 Fall back to normal twitter share if rich OEmbed is disabled 
- Fix typo
 2018-01-06 21:57:58 -05:00
Hypolite Petovan
380e85e0c5
Merge pull request #4180 from annando/xmpp-auto-auth 
The internal authentication for XMPP does work again
 2018-01-06 19:59:13 -05:00
Michael
f7d3ba26c8 The internal authentication for XMPP does work again 2018-01-07 00:55:20 +00:00
Michael Vogel
76933a106c
Merge pull request #4178 from MrPetovan/task/fix-scrutinizer-issues 
[Scrutinizer] Fix issues in mod/contacts
 2018-01-06 14:51:40 +01:00
Hypolite Petovan
9e54d8d4b4 Fix Twitter quote tweet display 
- Transforms twitter share tags into rich OEmbed attachments
 2018-01-06 00:39:59 -05:00
Hypolite Petovan
9593cac2d1 Replace hacky oembed local iframe with remote iframe html 
- Remove call to OEmbed::iframe
- Replace oembed span by div
- Replace double quotes with single
 2018-01-06 00:35:43 -05:00
Hypolite Petovan
6444f97c98 Fix issues in mod/contacts 
- Fix formatting
- Use DBM::is_result()
- Use dba::select
- Simplify sprintf(t[t]()) structures
- Remove commented out code
- Remove unused variables
- Update documentation type hints
 2018-01-05 21:05:23 -05:00
Hypolite Petovan
6e7abb726c
Merge pull request #4177 from annando/community-singleuser 
Don't show the local community page on single user instances
 2018-01-05 15:15:47 -05:00
Michael
5290b1404b Don't show the local community page on single user instances 2018-01-05 20:11:35 +00:00
Hypolite Petovan
5142528913
Merge pull request #4175 from annando/contact-posts 
Posts from contacts weren't displayed correctly
 2018-01-05 14:52:23 -05:00
Michael
2d9163ce30 Posts from contacts weren't displayed correctly 2018-01-05 19:47:55 +00:00
Michael Vogel
045a0b2a00
Merge pull request #4171 from MrPetovan/task/fix-scrutinizer-issues 
[Scrutinizer] Fix issues in mod/ (_well_known to contactgroup)
 2018-01-05 16:51:50 +01:00
Hypolite Petovan
388386815e Fix variable confusion in admin 2018-01-05 09:21:23 -05:00
Hypolite Petovan
8d07a69bba Merge branch 'develop' into task/fix-scrutinizer-issues 2018-01-05 09:18:14 -05:00
Michael Vogel
3c0c85e211
Merge pull request #4172 from MrPetovan/task/4144-improve-connectors-settings 
Improve connectors settings
 2018-01-05 15:15:24 +01:00
Hypolite Petovan
02b4d2b367
Merge pull request #4174 from annando/reshare-no-edit 
Disable editing of public items / Reshare of community items
 2018-01-05 09:07:53 -05:00