Commit graph

16536 commits

Author SHA1 Message Date
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
Michael
7341c3bad5 Some small changes 2017-11-19 22:52:35 +00:00
Michael
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
Michael
04aa77375c Some more place 2017-11-19 22:02:54 +00:00
Michael
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
Michael
920160cb28 The poller is now the worker 2017-11-19 21:47:21 +00:00
Michael
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
Michael
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
Michael
183999ee08 No german compound wording :-) 2017-11-19 19:47:04 +00:00
Michael
8cd21269ff The last of the big workers moved ... delivery and notifier 2017-11-19 18:59:55 +00:00
Michael
5108115fc1 Now PubSubPublish moved as well 2017-11-19 17:36:20 +00:00
Michael
2de457489f "CreateShadowentry" and "ProfileUpdate" now moved as well 2017-11-19 16:59:37 +00:00
Michael
98686e9091 Queue.php is now moved as well 2017-11-19 16:35:45 +00:00
Michael
501514bd54 expire and gprobe now moved as well 2017-11-19 16:25:13 +00:00
Hypolite Petovan
cfd5e5d475 Add orphan items as children to their top-level post
- Make get_item_children deplete the item list
2017-11-19 10:42:00 -05:00
Michael Vogel
27af65918e
Merge pull request #3914 from MrPetovan/issue/#3878-move-itemplateengine-to-src
Move ITemplateEngine to src
2017-11-19 16:28:18 +01:00
Hypolite Petovan
104a1d7fd3 Move ITemplateEngine to src
- Fix method name format
2017-11-19 10:22:18 -05:00
Michael Vogel
97f063e4be
Merge pull request #3912 from MrPetovan/task/smart_threading
Introducing smart threading
2017-11-19 14:48:58 +01:00
Hypolite Petovan
4aa003f43f Use constant instead of hardcoded string for ACTIVITY_POST 2017-11-19 08:41:33 -05:00
Hypolite Petovan
0fe4233569 Improve documentation with brief key 2017-11-19 08:41:16 -05:00
Hypolite Petovan
56b2f6a19a
Merge pull request #3913 from annando/dislike
Always show dislikes - the setting now just hides the button
2017-11-19 08:11:30 -05:00
Michael
9832ac7dab Always show dislikes - the setting now just hides the button 2017-11-19 09:55:45 +00:00
Hypolite Petovan
2336fa9d74 Add smart_threading user setting 2017-11-19 00:57:31 -05:00
Hypolite Petovan
81c3ddd1fb Add smart_flatten_conversation function
- Fix doc
- Fix formatting
- Update conv_sort with smart threading
2017-11-19 00:57:06 -05:00
Hypolite Petovan
dc06b851f5 Update Composer autoload files 2017-11-19 00:55:37 -05:00
Hypolite Petovan
31768c868b
Merge pull request #3910 from annando/worker
Another worker process moved
2017-11-18 19:42:50 -05:00
Michael
3616ff886e Corrected class name 2017-11-19 00:14:20 +00:00
Michael
02e4cf2a02 Missing variable 2017-11-18 23:46:16 +00:00