1
1
Fork 0
Commit graph

5944 commits

Author SHA1 Message Date
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 H 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