jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17322 commits 10 branches 58 tags 216 MiB
Commit graph

6085 commits

Author SHA1 Message Date
Michael
1fc3993990 Code cleaning 2017-12-22 23:10:32 +00:00
Michael
a309d3c733 Bugfix for the api call for remoteauth 2017-12-22 23:00:49 +00:00
Michael
2e022733f6 Standards 2017-12-21 22:54:58 +00:00
Hypolite Petovan
98c2cdb49a
Merge pull request #4111 from annando/comment-public 
Preparation for being able to comment every public item
 2017-12-21 17:18:14 -05:00
Hypolite Petovan
a539810b21
Merge pull request #4113 from annando/split-profile-name 
Split the first name and last name for Diaspora
 2017-12-21 07:59:04 -05:00
Michael
8c2d455b98 Better english 2017-12-21 04:53:57 +00:00
Michael
008c97c570 Split the name in the hcard 2017-12-20 21:15:13 +00:00
Michael
f7272be4a8 Reshares are now working 2017-12-20 18:18:25 +00:00
Michael
343f22e02f Updating after post does now work 2017-12-20 10:16:25 +00:00
Michael
b457ed6876 Preparation for being able to comment every public item 2017-12-19 17:15:56 +00:00
Pierre Rudloff
890cda11ed Only use "@throws" in phpdoc if the function explicitely throws an exception 2017-12-19 14:52:46 +01:00
Pierre Rudloff
e44da4a498 Close DB connection in api_saved_searches_list 2017-12-19 14:42:13 +01:00
Pierre Rudloff
30cb37cda5 Implement saved_searches/list API 2017-12-19 14:22:38 +01:00
Hypolite Petovan
256bf2e888
Merge pull request #4104 from Rudloff/feature/incoming_api 
Implement friendships/incoming and users/lookup APIs
 2017-12-19 05:39:23 -05:00
Pierre Rudloff
a817a1a070 Throw NotFoundException if results are empty in api_users_lookup 2017-12-19 11:37:55 +01:00
Hypolite Petovan
394e94cbc1
Merge pull request #4103 from Rudloff/feature/profile_colors 
Add support for profile_*_color in API
 2017-12-19 05:35:36 -05:00
Pierre Rudloff
27646cc4ad Code standards in api_get_user 2017-12-19 11:33:59 +01:00
Hypolite Petovan
b6f60c45aa Fix double login issue 
- Removed session existence check in killme
- Changed returned value in session_write for empty data
 2017-12-18 23:43:15 -05:00
Pierre Rudloff
35c4a7940a Use dba::select() instead of dba::p() in api_get_user 2017-12-19 01:31:32 +01:00
Pierre Rudloff
e11190b4cf Implement friendships/incoming and users/lookup APIs 2017-12-18 23:51:03 +01:00
Pierre Rudloff
3e9bc61bbf Add support for profile_*_color in API 2017-12-18 21:57:30 +01:00
Hypolite Petovan
7a6706b0f7
Merge pull request #4097 from Rudloff/feature/search_api 
Implement search API (fixes #929)
 2017-12-18 09:28:33 -05:00
Hypolite Petovan
86922c4821
Merge pull request #4101 from Rudloff/feature/block_api 
Implement the blocks/list API
 2017-12-18 09:27:35 -05:00
Pierre Rudloff
02733c66f3 Use LIKE instead of REGEXP in api_search 2017-12-18 15:23:15 +01:00
Pierre Rudloff
3e4af13772 Implement the blocks/list API 2017-12-18 15:20:42 +01:00
Pierre Rudloff
5899d821ef Remove useless intval() in api_search 2017-12-18 14:36:06 +01:00
Pierre Rudloff
31d63d929d Use dba::inArray() instead of dba::fetch() in api_search 2017-12-18 14:28:04 +01:00
Pierre Rudloff
ee8468affe Improve api_search() 
Use dba::p() instead of q()
Move exception to the beginning
Remove useless GROUP BY
Remove useless protect_sprintf()
 2017-12-18 14:00:10 +01:00
Pierre Rudloff
4a5d988d8c Implement search API (fixes #929) 2017-12-18 13:05:27 +01:00
Hypolite Petovan
916236ce2f Fix docblocks types 2017-12-17 15:27:50 -05:00
Michael
1fbf6c014b Possible API speed ups for public timeline 2017-12-17 17:47:15 +00:00
Hypolite Petovan
691e4561e6
Merge pull request #4088 from annando/api-external-url 
API: Path to post added / "external_url" support
 2017-12-17 10:57:46 -05:00
Michael Vogel
9ff4d2d838
Merge pull request #4084 from MrPetovan/task/4071-add-networkpublic_timeline-api 
Add statuses/networkpublic_timeline api method
 2017-12-17 16:52:17 +01:00
Michael
26a89aa6ed API: Path to post added / "external_url" support 2017-12-17 15:16:18 +00:00
Hypolite Petovan
cdd5bd5615 Improve networkpublic_timeline SQL performance 
- Use thread.iid for max_id and ordering
 2017-12-17 10:06:12 -05:00
Michael
995f2d719d Merge remote-tracking branch 'upstream/develop' into issue-4069 2017-12-17 12:10:32 +00:00
Michael
3c835ccb22 Alternate fix for issue 4069 2017-12-17 11:11:28 +00:00
Michael Vogel
de56a3a824
Merge pull request #4079 from MrPetovan/task/4069-add-pagination-to-statuses-api 
Add pagination to API statuses/friends and statuses/followers
 2017-12-17 11:31:01 +01:00
Hypolite Petovan
53e3e49324 Add statuses/networkpublic_timeline api method 2017-12-16 15:41:50 -05:00
Hypolite Petovan
78c053c6b9 Add max_id support for statuses/user_timeline API 
- Add documentation
- Improve formatting
 2017-12-16 11:34:44 -05:00
Hypolite Petovan
ecde6e456d Add pagination to API statuses/friends and statuses/followers 
- Add doc blocks for both API calls
- Remove unused parameters
 2017-12-16 10:16:25 -05:00
Hypolite Petovan
179b311978 Remove group_member.uid 
- Use contact.uid alternatively
- Use JOIN with group table
 2017-12-14 22:47:58 -05:00
Michael
cf56de1e77 Merge remote-tracking branch 'upstream/develop' into dbstructure-class 2017-12-14 21:42:26 +00:00
Michael
15d42de647 Class moved, changes applied 2017-12-14 21:13:02 +00:00
Michael
89ad41aca5 Bugfix: Calls to a renamed function had been changed 2017-12-14 18:06:48 +00:00
Hypolite Petovan
369fcb7bae
Merge pull request #4060 from annando/system-unavailable 
"system_unavailable.php" is unavailable now
 2017-12-13 17:01:47 -05:00
Michael
0457bd995f "system_unavailable.php" is unavailable now 2017-12-13 21:55:19 +00:00
Michael
ea10a7c002 Map is moved to the new place 2017-12-13 21:37:34 +00:00
Michael
58df57df6e msgclean.php and quoteconvert.php is now integrated into Email.php 2017-12-13 20:36:50 +00:00
Michael Vogel
f58167b000
Merge pull request #4054 from MrPetovan/bug/4041-fix-register 
Fix registration
 2017-12-13 20:01:03 +01:00
Michael
84b85e9198 Removed old include 2017-12-13 07:06:36 +00:00
Michael
fc55a4b9c0 The feed moved into the new location 2017-12-13 07:02:52 +00:00
Hypolite Petovan
385a36138a Format valid_email function in include/text 2017-12-12 20:52:28 -05:00
Hypolite Petovan
af6ca96e66
Merge pull request #4053 from annando/useless_function_exists 
Removed useless "function_exists" checks
 2017-12-12 03:47:54 -05:00
Michael
e834f905c6 Issue 3911: Now the categories are really fetched 2017-12-12 05:35:41 +00:00
Michael
88ef61df95 Removed useless "function_exists" checks 2017-12-12 04:52:33 +00:00
Michael
63b4d84ea9 Fix for duplicate removal in the database structure check 2017-12-11 21:53:52 +00:00
Hypolite Petovan
4fe8dab08d Remove include/group.php 2017-12-09 13:45:54 -05:00
Hypolite Petovan
abdecd2b2f Use new Model methods for groups 2017-12-09 13:45:17 -05:00
Hypolite Petovan
fe89e7760e Fix formatting all around 2017-12-09 13:42:02 -05:00
Hypolite Petovan
bc58e8d3be Rename Model\GlobalContact to Model\GContact 2017-12-07 23:57:56 -05:00
Hypolite Petovan
3772cf7544 Move Object\Conversation to Object\Thread 
- Move Object\Item to Object\Post
 2017-12-07 23:57:37 -05:00
Hypolite Petovan
a42595a30c Move Object\Contact to Model\Contact 2017-12-07 23:56:12 -05:00
Hypolite Petovan
3fc3e67b70 Separate Object\Photo into Model\Photo and Object\Image 
- Renamed a bunch of functions to shorter or clearer names
 2017-12-07 23:54:51 -05:00
Hypolite Petovan
4b0f83a12b Finish renaming Object\Item to Object\Post 2017-12-07 23:50:38 -05:00
Michael Vogel
5747cfc79c
Revert "Move Objects to Model" 2017-12-08 05:21:51 +01:00
Hypolite Petovan
cd84bf8963 Rename Model\GlobalContact to Model\GContact 2017-12-07 09:09:28 -05:00
Hypolite Petovan
70d047ba8e Move Object\Conversation to Object\Thread 
- Move Object\Item to Object\Post
 2017-12-07 09:05:23 -05:00
Hypolite Petovan
18d93cddf6 Move Object\Contact to Model\Contact 2017-12-07 09:04:24 -05:00
Hypolite Petovan
52bddd580c Separate Object\Photo into Model\Photo and Object\Image 
- Renamed a bunch of functions to shorter or clearer names
 2017-12-07 08:56:11 -05:00
Hypolite Petovan
1cdee234f7
Merge pull request #4028 from annando/mood2 
We've got no mood anymore
 2017-12-07 07:53:46 -05:00
Andy H3
68ac89da58
Update text.php 
Corrected typo
 2017-12-07 14:45:37 +07:00
Michael
0608efc38a We've got no mood anymore 2017-12-07 07:01:55 +00:00
Adam Magness
71911a6989 Use default value 
use the default value parameter correctly!
 2017-12-06 15:25:36 -05:00
Adam Magness
cadfef63c4 Update false evaluations 
=== false and !== false to is_null where appropriate.
 2017-12-06 14:57:06 -05:00
Michael
45227a12a6 "item_id" and "spam" aren't used 2017-12-05 22:20:49 +00:00
Michael
583914a548 Removed some unused tables and functions 2017-12-05 21:54:13 +00:00
Hypolite Petovan
75c7dc0fa0
Merge pull request #4015 from annando/archive-again 
Don't archive "self" contacts
 2017-12-05 16:38:48 -05:00
Michael
9ffde01fc1 DBClean now works with the conversation table as well 2017-12-05 21:30:38 +00:00
Michael
e5c2b7a243 Don't archive "self" contacts 2017-12-05 21:29:33 +00:00
Tobias Diekershoff
c258df0f0a removed x-permission 2017-12-05 07:13:55 +01:00
Adam Magness
0c48b4188b Non Static calls 
update calls to non static
 2017-12-04 21:10:54 -05:00
Hypolite Petovan
072edc1949
Merge pull request #4008 from zeroadam/Oauth-#3878 
OAuth to src
 2017-12-04 18:33:01 -05:00
Adam Magness
d3473f9999 Update use 
Forgot to update a use statement.
 2017-12-04 18:30:18 -05:00
Adam Magness
9c7b6d9d5f Functions and Standards 
Standards and convert to dba functions where possible.
 2017-12-04 14:52:04 -05:00
Michael
dc32553a1d Better usew the author 2017-12-04 19:50:32 +00:00
Michael
360e39ca5b unmark for archival 2017-12-04 19:36:08 +00:00
Adam Magness
b991d8ff77 Separate and move classes 
OAuth to src
 2017-12-04 14:09:23 -05:00
Michael
3bb53967f4 Merge remote-tracking branch 'upstream/develop' into archive-contact 2017-12-04 19:05:53 +00:00
Michael
ca41e9154d Archive and unarchive contacts 2017-12-04 19:04:50 +00:00
Adam Magness
4a96f7b458 Pidfile to src 
Move pidfile to Friendica\Util namespace
 2017-12-04 13:12:22 -05:00
Adam Magness
b1d16fbdf7 Update use statements 
update use statements for rename to singular.
 2017-12-04 09:04:36 -05:00
Adam Magness
6e5471def3 Rename to singular 
Rename and update references. Standards and a require_once.
 2017-12-04 09:01:27 -05:00
Adam Magness
2f0da29c75 Features to src 
Move Features to class in Friendica\Content namespace. Update function calls and references.
 2017-12-04 08:33:49 -05:00
Hypolite Petovan
85f6d6b7ed Remove include/user 2017-12-03 22:29:13 -05:00
Michael
6f7510550d NETWORK_MAIL2 was never finished, so remove it as well 2017-12-03 09:19:58 +00:00
Michael
adf802474b Zot was never really supported, so it is now removed completely 2017-12-02 21:57:39 +00:00
Michael Vogel
2ca03acb45
Merge pull request #3986 from MrPetovan/task/admin-block-list 
Admin remote contact block list
 2017-12-02 22:09:04 +01:00
Adam Magness
2b121779a6 Salmon move to src 
Salmon class, update function name and function calls. Some standards as well.
 2017-12-02 09:32:45 -05:00
Adam Magness
9a4e741d1a Review Changes 
renamed some functions and adjusted corresponding calls.
 2017-12-01 21:05:06 -05:00
Adam Magness
e90b0748aa Code Cleanup 
Standards clean up
 2017-12-01 18:13:39 -05:00
Adam Magness
f21feb975d Require Cleanup 
Remove instances of require_once for email.php
 2017-12-01 14:57:13 -05:00
Adam Magness
6008e3df11 Email to src 
Create Email class and update/rename functions and function calls.
 2017-12-01 14:41:27 -05:00
Hypolite Petovan
ff459441cf
Merge branch 'develop' into task/admin-block-list 2017-12-01 00:48:13 -05:00
Hypolite Petovan
052ba729d7 Improved translation functions 
- Add built-in vsprintf to t()
- Add built-in sprintf to tt()
 2017-12-01 00:35:40 -05:00
Hypolite Petovan
84418860bd Improve dba 
- Add dba::count
- Add support for LIMIT X,X
 2017-12-01 00:34:54 -05:00
Hypolite Petovan
0ae6f571da
Merge pull request #3982 from zeroadam/Photo-#3878 
Photo to src
 2017-11-30 20:33:48 -05:00
Adam Magness
0373056448 Review and Use statements 
use statements and review changes.
 2017-11-29 17:29:11 -05:00
Michael
0982b0413b Bugfix for "Call to undefined function best_link_url()" 2017-11-29 21:27:39 +00:00
Adam Magness
0091d318e5 Function names 
Update function names and corresponding function calls
 2017-11-29 12:17:12 -05:00
Adam Magness
54827e7fed Photo to src 
Move Photo to Friendica\Object namespace and replace require_once statments with use statements.
 2017-11-29 07:52:27 -05:00
Michael
8bffee43b3 Threads are now always enabled. 2017-11-28 18:54:39 +00:00
Tobias Diekershoff
7eee227698 missing false for the tagcloud settings 2017-11-27 19:20:43 +01:00
Michael Vogel
3f448d9a42
Merge pull request #3970 from MrPetovan/task/3942-add-user-authenticate 
Migrate password hashing Part 1: Add User::authenticate
 2017-11-27 15:14:36 +01:00
Hypolite Petovan
ced1063a10 Improved dba calls 
- Removed intval calls
- Used boolean values for params when relevant
 2017-11-27 08:17:56 -05:00
Michael
9612496e9e The function "template_escape" doesn't exist anymore. 2017-11-27 06:44:49 +00:00
Hypolite Petovan
2a60146a43 Revert "Add new legacy password field" 
This reverts commit 2236f60cfa.
 2017-11-26 15:45:59 -05:00
Hypolite Petovan
2196a0577b Remove unused upubkey and uprvkey from queries 
- Switched queries to new dba::* functions
 2017-11-26 14:55:47 -05:00
Hypolite Petovan
ec6f5193e2 Switch to User::authenticate 
- Removed hash('whirlpool') to check password
 2017-11-26 14:46:08 -05:00
Hypolite Petovan
90a8ae2cb8 Fix formatting 
- include/auth.php
- include/oauth.php
- include/user.php
- mod/removeme.php
- src/Worker/Queue.php
 2017-11-26 14:18:45 -05:00
Hypolite Petovan
3fbf2e3bcf
Merge pull request #3966 from rabuzarus/20171122_-_port_tagcloud 
A tag cloud widget for the profile page
 2017-11-26 11:16:14 -05:00
rabuzarus
7d8370a178 tag cloud: fix query 2017-11-26 16:24:26 +01:00
rabuzarus
ac6b191976 tag cloud: use dba for db request 2017-11-26 16:14:16 +01:00
Hypolite Petovan
e82bbc75cd
Merge pull request #3963 from annando/default-features 
Additional features should now work with the forumlist as well
 2017-11-26 08:51:14 -05:00
Michael
e4995dbad5 Good looking and better performance 2017-11-26 13:12:54 +00:00
Hypolite Petovan
d5c38b9fc9 Add odd number of character support to random_string() 2017-11-26 07:57:29 -05:00
Michael
6cb637e8ab Default features should now work with the forumwidget again 2017-11-26 11:31:07 +00:00
rabuzarus
2844947f5c tag cloud: add doxygen docu 2017-11-26 04:33:21 +01:00
Hypolite Petovan
d38c040d50 Update random_string with random_bytes 
- Updated update.php
 2017-11-25 21:15:50 -05:00
Hypolite Petovan
2236f60cfa Add new legacy password field 2017-11-25 18:05:32 -05:00
rabuzarus
4224209497 Merge develop into 20171122_-_port_tagcloud 
Conflicts:
	include/features.php
 2017-11-25 23:41:20 +01:00
Michael
ba184f9038 Show the preview picture even if the posting contains the huge image 2017-11-25 16:00:51 +00:00
Michael
3cb906c420 Issue 3911: Fetch keywords for feeds 2017-11-25 11:59:20 +00:00
Michael
4ddcc77c77 Always show small preview pictures, not the big ones 2017-11-25 10:07:49 +00:00
Michael
3046455b1c Some posts weren't shown 2017-11-24 21:39:12 +00:00
Tobias Diekershoff
5a0f33dca0
Merge pull request #3939 from annando/fix-sql 
Fix some SQL problems
 2017-11-24 09:53:36 +01:00
Michael
4a4be4d664 Fix some SQL problems 2017-11-24 07:44:02 +00:00
Hypolite Petovan
9943393b71 Remove include/HTTPExceptions.php 2017-11-23 23:52:23 -05:00
Hypolite Petovan
1f4fc87fd9 Use new HTTPExceptions in API 2017-11-23 23:48:15 -05:00
Hypolite Petovan
5ec011c7be
Merge pull request #3937 from annando/additional 
Additional features still had got problems
 2017-11-23 20:43:46 -05:00
Michael
da5857529f Additional features still had got problems 2017-11-23 20:41:35 +00:00
Adam Magness
609a4de5d0 src Standards 
This basically completes coding standards changes for the entire src directory, with the exception of App.php
 2017-11-23 14:01:58 -05:00
rabuzarus
f1b86d31ca tags-cloud: respect remote perms 2017-11-23 03:43:39 +01:00
rabuzarus
19afabd268 tags: possibility to filter posts for tags and profile owner (profile) 2017-11-23 00:59:20 +01:00
Michael
ffceb601d5 Some handling for empty parameters 2017-11-22 22:50:45 +00:00
rabuzarus
59ae5633ec tag-cloud: some polishing + remove authors (we don't use it at the moment) 2017-11-22 23:18:01 +01:00
rabuzarus
d7d653aab6 port tag cloud widget from hubzilla 2017-11-22 21:29:07 +01:00
Michael
c6c180e8b9 Some more changed calls 2017-11-22 09:11:44 +00:00
Michael
7c3fd2adb5 Some more replaced old database functions 2017-11-22 07:21:19 +00:00
Hypolite Petovan
d99a7efd90
Merge pull request #3929 from annando/remove-old-mysql 
No obsolete mysql_* anymore
 2017-11-21 16:06:22 -05:00