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

303 Commits

Author SHA1 Message Date
Hypolite Petovan 669c7dea59 Add new method from include/group in relevant Model classes 2017-12-09 13:31:00 -05:00
Michael 14d4ffbe7a And now for the third bugfix to PR 4036 2017-12-08 06:32:14 +00:00
Michael 0a946587b5 Second bugfix to PR 4036 2017-12-08 06:15:06 +00:00
Michael 79c841a260 Bugfix to PR 4036 2017-12-08 05:44:43 +00:00
Hypolite Petovan d3182d93ac Move Object\Profile to Model\Profile 2017-12-07 23:58:20 -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 6b60b89385 Move Object\Profile to Model\Profile 2017-12-07 23:55:05 -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 79ed1568b6 Fix class Object\Item not found in Object\Post 2017-12-07 23:50:38 -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
Michael Vogel e437c74d0e
Merge pull request #4031 from MrPetovan/task/3878-move-objects-to-model 
Move Objects to Model
 2017-12-08 05:02:21 +01:00
Michael a7b004a727 Commented out the functionality 2017-12-07 20:10:09 +00:00
Michael 3824ad5590 Possible fix for issue 4013 2017-12-07 19:39:55 +00:00
Hypolite Petovan cd84bf8963 Rename Model\GlobalContact to Model\GContact 2017-12-07 09:09:28 -05:00
Hypolite Petovan 294689bf94 Move Object\Profile to Model\Profile 2017-12-07 09:05:35 -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 d4ca30a6db Move Object\Profile to Model\Profile 2017-12-07 08:57:35 -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
Michael 6510df4b51 Update the public key for public contacts if the key was empty before 2017-12-07 06:51:38 +00:00
Hypolite Petovan 311af3e544
Merge pull request #4022 from annando/instances_social 
Retrieve data about Mastodon servers
 2017-12-06 15:36:22 -05:00
Adam Magness 71911a6989 Use default value 
use the default value parameter correctly!
 2017-12-06 15:25:36 -05:00
Adam Magness 3e5a518591 Undo changes to Feature 
the evaluations were correct before.
 2017-12-06 15:18:45 -05:00
Michael 925c03fda8 Retrieve data about Mastodon servers 2017-12-06 20:09:59 +00:00
Adam Magness cadfef63c4 Update false evaluations 
=== false and !== false to is_null where appropriate.
 2017-12-06 14:57:06 -05:00
Michael 7099a54b3d Cut and paste is always fun 2017-12-06 16:50:52 +00:00
Michael 4bf425de5d Merge remote-tracking branch 'upstream/develop' into dbclean 2017-12-06 16:49:55 +00:00
Michael f1f222c633 Removed unused code 2017-12-06 14:30:07 +00:00
Michael ad5c263dbf Reduced "dbclean" calls 2017-12-06 14:23:38 +00:00
Michael 418365b30e DBClean now runs as long as there are entries to be deleted 2017-12-06 14:22:03 +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
Hypolite Petovan a4451c7c3d
Merge pull request #4011 from annando/archive-cleanup 
Some cleanup for archiving/unarchiving contacts
 2017-12-05 07:47:44 -05:00
Adam Magness 22a3c7ad7d remove index 
remove unneeded index
 2017-12-05 06:58:57 -05:00
Michael 115d71e841 One tab too much 2017-12-05 09:34:43 +00:00
Michael 5f9e87ea5a Some cleanup for archiving/unarchiving contacts 2017-12-05 07:08:20 +00:00
Adam Magness e32b4ed670 More use 
more missing use
 2017-12-04 21:18:48 -05:00
Adam Magness f1a5560804 Use statement 
missing use
 2017-12-04 21:13:58 -05:00
Adam Magness e997128c9f Static 2017-12-04 21:03:39 -05:00
Adam Magness 448598495c Static 
remove static
 2017-12-04 21:00:47 -05:00
Adam Magness 9f4be62d3d Use statement 2017-12-04 20:30:10 -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 547e24b443 Review 
updates based on review.
 2017-12-04 16:33:10 -05:00
Adam Magness 2bbfc0640f Move to Network 
Move to network namespace. Get rid of q() and try to get used to [ ] instead of array()
 2017-12-04 15:59:21 -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 a206f6d832 Only a newline 2017-12-04 19:37:36 +00:00