Commit graph

318 commits

Author SHA1 Message Date
785fcd5916 Missing "use" added 2017-12-13 07:09:20 +00:00
84b85e9198 Removed old include 2017-12-13 07:06:36 +00:00
74ba0c896a The feed is now a class 2017-12-13 07:03:42 +00:00
fc55a4b9c0 The feed moved into the new location 2017-12-13 07:02:52 +00:00
48b49dbc4b Bugfix to PR 4046: Repaired query 2017-12-10 20:12:23 +00:00
Michael Vogel
57f8496c53
Merge pull request #4046 from MrPetovan/bug/4041-fix-register
Move Group to src
2017-12-10 13:32:59 +01:00
Hypolite Petovan
b0fb398844 Fix order parameter for dba::select 2017-12-10 05:37:23 -05:00
Hypolite Petovan
c714ee519f Improve additional condition 2017-12-10 01:07:48 -05:00
Hypolite Petovan
3ea9060259 Fix wrong uses of dba::select
- Improve negative conditions
2017-12-10 01:06:12 -05: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
669c7dea59 Add new method from include/group in relevant Model classes 2017-12-09 13:31:00 -05:00
38d5932156 Reworked the pidfile class 2017-12-09 17:49:11 +00:00
0f149a691e Faster credentials check 2017-12-09 12:23:15 +00:00
8db5b121ff Prevent the running of multiple xmpp auth daemons at a time 2017-12-09 09:46:21 +00:00
14d4ffbe7a And now for the third bugfix to PR 4036 2017-12-08 06:32:14 +00:00
0a946587b5 Second bugfix to PR 4036 2017-12-08 06:15:06 +00:00
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
a7b004a727 Commented out the functionality 2017-12-07 20:10:09 +00:00
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
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
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
7099a54b3d Cut and paste is always fun 2017-12-06 16:50:52 +00:00
4bf425de5d Merge remote-tracking branch 'upstream/develop' into dbclean 2017-12-06 16:49:55 +00:00
f1f222c633 Removed unused code 2017-12-06 14:30:07 +00:00
ad5c263dbf Reduced "dbclean" calls 2017-12-06 14:23:38 +00:00
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
9ffde01fc1 DBClean now works with the conversation table as well 2017-12-05 21:30:38 +00:00