Commit graph

16705 commits

Author SHA1 Message Date
c6c180e8b9 Some more changed calls 2017-11-22 09:11:44 +00:00
Michael Vogel
29a1c067ee
Merge pull request #3931 from tobiasd/20171122-IT
IT translations THX Mauro Batini
2017-11-22 08:24:38 +01:00
7c3fd2adb5 Some more replaced old database functions 2017-11-22 07:21:19 +00:00
2acc8091ab IT translations THX Mauro Batini 2017-11-22 07:34:37 +01:00
Hypolite Petovan
663c38afed
Merge pull request #3930 from annando/cache-dba
Cache.php is now using dba methods
2017-11-21 18:39:56 -05:00
d982c68d75 Cache.php is now using dba methods 2017-11-21 23:03:33 +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
723b40eea4 No obsolete mysql_* anymore 2017-11-21 21:00:11 +00:00
Hypolite Petovan
4eb8e43daf
Merge pull request #3928 from zeroadam/ForumManager-#3878
ForumManager to src
2017-11-21 11:54:19 -05:00
Adam Magness
7cee150868 ForumManager to src
ForumManager moved to Friendica\Content namespace
2017-11-21 07:20:22 -05:00
Hypolite Petovan
33ad6b6d7e
Merge pull request #3927 from rabuzarus/20171121_-_fix_reg_notifs
Bugfix: show no registrations notifs if there are none
2017-11-20 23:54:11 -05:00
Hypolite Petovan
2d6ee38446
Merge pull request #3925 from zeroadam/Emailer-#3878
Emailer to src
2017-11-20 23:53:21 -05:00
rabuzarus
04a7291303 Bugfix: show no registrations notifs if there are none 2017-11-21 03:45:13 +01:00
Adam Magness
69fd3c60b0 Indentation fix
errant indentation change
2017-11-20 19:03:58 -05:00
Hypolite Petovan
317d51fd53
Merge pull request #3926 from annando/worker-correction
Queue and GProbe should now be executed
2017-11-20 16:35:39 -05:00
0877cf862c Queue and GProbe should now be executed 2017-11-20 21:30:57 +00:00
Adam Magness
1726ededac Emailer to src
Move emailer to src Friendica\Util namespace
2017-11-20 15:37:30 -05:00
Hypolite Petovan
2e46fdcb88
Merge pull request #3924 from zeroadam/Xml-PSR2
XML class standards
2017-11-20 15:18:17 -05:00
Adam Magness
2830be25ea Formatting change
change multi line format.
2017-11-20 15:17:20 -05:00
Adam Magness
ddacbf2c13 XML class standards
updated the xml class for PSR-2
2017-11-20 12:56:31 -05:00
Hypolite Petovan
aac2258bc3
Merge pull request #3923 from zeroadam/MoreStandards
More standards
2017-11-20 12:37:05 -05:00
Adam Magness
28cceda461 Indentation
modified to multi line function call.
2017-11-20 11:29:55 -05:00
Adam Magness
1eb2e541f6 New from rebase
more adjustments after rebase
2017-11-20 11:14:35 -05:00
Adam Magness
9622dedaeb New function
new function from recent develop branch merge
2017-11-20 11:01:32 -05:00
Adam Magness
1115d19f79 More Standards
More coding standards updates.
2017-11-20 11:01:32 -05:00
Michael Vogel
2ee928b081
Merge pull request #3921 from MrPetovan/issue/3878-move-Contact-to-src
Move Contact to src
2017-11-20 16:53:29 +01:00
Hypolite Petovan
158cc9dc45
Merge pull request #3922 from annando/scripts2
One script needed to be moved, one script was obsolete
2017-11-19 18:11:40 -05:00
Hypolite Petovan
1a60401d69
Merge branch 'develop' into issue/3878-move-Contact-to-src 2017-11-19 18:09:59 -05:00
Hypolite Petovan
b85c94a60d
Merge branch 'develop' into issue/3878-move-Contact-to-src 2017-11-19 18:09:14 -05:00
7341c3bad5 Some small changes 2017-11-19 22:52:35 +00:00
0c35dff73d One script needed to be moved, one script was obsolete 2017-11-19 22:47:12 +00:00
Hypolite Petovan
81647cefed
Merge pull request #3920 from annando/scripts
The poller is now the worker and we have a "scripts" folder
2017-11-19 17:25:14 -05:00
Hypolite Petovan
898fe2db1e Code cleanup
- Remove extraneous use statements
- Format require_once
2017-11-19 17:06:18 -05:00
Hypolite Petovan
5ee728972e Remove include/Contact.php
- Remove all mentions to include/Contact.php
2017-11-19 17:05:21 -05:00
Hypolite Petovan
ec02af593d Change called method names
- Add GlobalContact::getRandomUrl
- Rename Contact::getIdForURL
- Rename Diaspora::sendUnshare
- Remove unused parameter $self in Contact::terminateFriendship
2017-11-19 17:03:39 -05:00
04aa77375c Some more place 2017-11-19 22:02:54 +00:00
c1b064c643 Some more poller are noe a worker 2017-11-19 22:00:43 +00:00
Hypolite Petovan
b92fc24ff0 Add Contact Object
- Add Profile Object
- Add User Model
- Add use statements
2017-11-19 16:55:28 -05:00
Hypolite Petovan
f43aaf5227 Move Item and Conversation from Core to Object
- Move BaseObject from Core\ to Friendica\
2017-11-19 16:50:49 -05:00
920160cb28 The poller is now the worker 2017-11-19 21:47:21 +00:00
cabfcfc904 We now are having a "scripts" folder 2017-11-19 21:21:54 +00:00
Hypolite Petovan
1f38deb77b
Merge pull request #3919 from zeroadam/CodingStandards
Coding Standards
2017-11-19 16:21:05 -05:00
Adam Magness
a6d501bc4e Overzealous rename
reverted change to function name.
2017-11-19 16:14:16 -05:00
Adam Magness
8057afb039 Function call
this one must be coming from boot.php
2017-11-19 15:32:54 -05:00
Adam Magness
d9e9cbe753 Coding Standards
A few updates for coding standards
2017-11-19 15:32:54 -05:00
Hypolite Petovan
5888cce08e
Merge pull request #3918 from annando/additional-features
Additional features can now be changed again
2017-11-19 15:11:45 -05:00
6a1885a46a Additional features can now be changed again 2017-11-19 19:58:11 +00:00
Hypolite Petovan
51a29d381f
Merge pull request #3917 from annando/worker-again
All workers in /include now moved to /src/worker
2017-11-19 14:51:12 -05:00
Michael Vogel
67c23ccb83
Merge pull request #3915 from MrPetovan/issue/#2732-conv-orphans
Add orphan items as children to their top-level post
2017-11-19 20:48:38 +01:00
183999ee08 No german compound wording :-) 2017-11-19 19:47:04 +00:00