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

17403 Commits

Author SHA1 Message Date
Adam Magness 98c162552b Remove old file 
remove contact_selectors
 2018-01-09 22:43:14 -05:00
Adam Magness a3ef9e35ec Update functions and calls 
Update function names and calls.
 2018-01-09 22:42:04 -05:00
Adam Magness 300b1b6af8 Move contact_selectors to src 
Create ContactSelector class
 2018-01-09 21:56:05 -05:00
Michael 8060ad265e Fill the cache fields as well 2018-01-09 22:35:50 +00:00
Michael bbd9d587c7 Return the number of affected rows 2018-01-09 22:16:16 +00:00
Michael 81925e3730 We now are having an item class and a method to change item entries 2018-01-09 21:13:45 +00:00
Michael ec879f3194 Removed unneeded stuff 2018-01-09 20:50:06 +00:00
Michael eac4bc1960 We now are using a single function to store items 2018-01-09 20:03:00 +00:00
Hypolite Petovan b958a0702f
Merge pull request #4192 from zeroadam/Follow-#3878 
Move follow to src
 2018-01-09 11:42:19 -05:00
Adam Magness 5358f5742e Rename create 
rename create function to createFromProbe and update calls.
 2018-01-09 11:40:25 -05:00
Adam Magness c81e83c500 Review changes 
Update update and new functions to updateFromProbe and create. Update calls to renamed functions.
 2018-01-09 11:23:26 -05:00
Adam Magness 484eb960d7 Remove follow 
remove follow.php
 2018-01-09 10:03:31 -05:00
Adam Magness b72cfaf828 update use 
update useings and self
 2018-01-09 10:02:53 -05:00
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 contact`s uid not the item`s 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 H 52aa795c27
Update README.md 2018-01-07 14:38:07 +07:00
Andy H 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