Commit Graph

17126 Commits

Author SHA1 Message Date
Michael Vogel 83861a01cc
Merge pull request #3909 from zeroadam/BaseObject-#3878
Objects moved to src
2017-11-17 22:06:29 +01:00
Adam Magness 0cbc4153b3 More conditions
Removed unneeded conditions.
2017-11-16 19:59:40 -05:00
Adam Magness 72749477ed Remove condition
Remove unneeded condition.
2017-11-16 19:55:28 -05:00
Adam Magness e947199dfe Merge remote-tracking branch 'origin/BaseObject-#3878' into BaseObject-#3878 2017-11-16 16:39:59 -05:00
Adam Magness f96b841799 Update function call
missed function call change
2017-11-16 16:39:42 -05:00
Adam Magness d127d06388 Item to src
object/Item moved to Friendica\Core namespace.
2017-11-16 16:39:42 -05:00
Adam Magness 7c00401c66 Conversation to src
object/Conversation moved to Friendica\Core namespace.
2017-11-16 16:39:42 -05:00
Adam Magness ecd9e3e07e BaseObject moved to src/Core
BaseObject moved to Friendica\Core namespace. References and function calls updated.
2017-11-16 16:39:42 -05:00
Michael Vogel fda48ec431
Merge pull request #3908 from zeroadam/OStatus-#3878
OStatus moved to src
2017-11-16 22:27:29 +01:00
Adam Magness 297aa1a528 Update function call
missed function call change
2017-11-16 15:58:50 -05:00
Adam Magness 681f5d8771 Item to src
object/Item moved to Friendica\Core namespace.
2017-11-16 15:54:03 -05:00
Adam Magness ef56b980cc Conversation to src
object/Conversation moved to Friendica\Core namespace.
2017-11-16 13:24:59 -05:00
Adam Magness 4a1de47513 BaseObject moved to src/Core
BaseObject moved to Friendica\Core namespace. References and function calls updated.
2017-11-16 13:05:41 -05:00
Adam Magness 86073ddfd1 Removed require statement
There didn't seem to be any ostatus function calls in this file. Running with it commented out produced no errors.
2017-11-16 07:32:31 -05:00
Adam Magness f3c8af485f Require statement
Not sure if this is needed or not, there are no ostatus:: calls in this file.
2017-11-15 23:11:00 -05:00
Adam Magness cd12de46f8 OStatus moved to src
OStatus moved to Friendica\Protocol namespace. References and function calls updated.
Related to #3878
2017-11-15 23:09:11 -05:00
Hypolite Petovan 8a0bec00c4
Merge pull request #3907 from annando/worker
For more worker have found a new place
2017-11-15 16:27:49 -05:00
Michael 0aee6d383a Now there are four more ... 2017-11-15 21:12:33 +00:00
Michael 33e98d6264 Moved some workers in their new habitat 2017-11-15 20:59:42 +00:00
Michael Vogel 38847af687
Merge pull request #3906 from zeroadam/Global-Poco-#3878
Global and Portable Contact
2017-11-15 20:51:26 +01:00
Adam Magness 9e90589c21 gsFunctions renamed
gsFetchUsers -> fetchGsUsers
gsDiscover -> discoverGsUsers
2017-11-15 12:02:08 -05:00
Adam Magness 326c4a18c0 Missing Worker
use Friendica\Core\Worker
2017-11-15 11:51:29 -05:00
Adam Magness 790d80c9fb Missed function call update
update_gcontact -> update
2017-11-15 11:49:20 -05:00
Adam Magness 259f91caa9 PortableContact created
Create PortableContact and remove socgraph, update references, and calls
2017-11-15 10:53:16 -05:00
Adam Magness 47db624105 GlobalContact created
Moved DirSearch and GlobalContact related functions to Friendica\Model namespace
2017-11-15 09:47:49 -05:00
Hypolite Petovan 5f25ef55d2
Merge pull request #3904 from annando/worker-space2
cron.php is now moved in the worker space
2017-11-14 17:33:27 -05:00
Michael 9576f6743d Command back ... 2017-11-14 22:13:33 +00:00
Michael 405753d1c3 cron.php is reworked, other worker files had been moved temporarily 2017-11-14 21:50:16 +00:00
Hypolite Petovan 799c67c141
Merge pull request #3902 from annando/worker-space
There is now a namespace for workers
2017-11-13 00:22:34 -05:00
Michael 42a89b101b CronHooks now works again. 2017-11-12 21:32:10 +00:00
Michael 476facde61 Onepoll moved as well 2017-11-12 18:50:35 +00:00
Michael 521e213e7a I will never understand git ... 2017-11-12 07:26:04 +00:00
Michael 1aa8f56662 The cronhooks are now changed 2017-11-12 07:24:49 +00:00
Michael 06ce34eda1 The worker can now call methods in the worker namespace 2017-11-12 07:21:23 +00:00
Michael Vogel be13332807
Merge pull request #3901 from zeroadam/Smilies-#3878
Smilies to src
2017-11-11 13:44:01 +01:00
Adam Magness 4d146acf90 Smilies to src
Move Smilies to Friendica\Content namespace.

Related to #3878
2017-11-11 07:21:15 -05:00
Tobias Diekershoff 2143a4b993
Merge pull request #3900 from annando/old-template
Removed old template parser
2017-11-11 11:49:55 +01:00
AndyHee 96e36b6ca7 Revert "Merge pull request #3899 from rebeka-catalina/rct/t/vier-dark_link_style"
This reverts commit b2c6d34d99, reversing
changes made to 6ae4396299.
2017-11-11 17:13:01 +07:00
Michael 731ec347b1 Removed old template parser 2017-11-11 09:26:23 +00:00
Tobias Diekershoff b2c6d34d99
Merge pull request #3899 from rebeka-catalina/rct/t/vier-dark_link_style
Made hyperlinks visually different from normal text
2017-11-11 08:48:32 +01:00
Tobias Diekershoff 6ae4396299
Merge pull request #3898 from annando/show-friends
The friend contact block wasn't displayed in the profile
2017-11-11 08:47:47 +01:00
rebeka-catalina ef485cd8b7 Made hyperlinks visually different from normal text 2017-11-11 08:40:45 +01:00
Michael 3764dc2bf6 Some more code improvements, removed deprecated functions 2017-11-11 06:42:39 +00:00
Michael cfdbd07628 The friend contact block wasn't displayed in the profile 2017-11-11 05:23:28 +00:00
Hypolite Petovan 6b23548a2b
Merge pull request #3896 from tobiasd/20171110-community
adding a global community disclaimer
2017-11-10 16:17:38 -05:00
Tobias Diekershoff fd2b807292 halfe the double 2017-11-10 22:00:39 +01:00
Hypolite Petovan cb34f06692
Merge pull request #3895 from zeroadam/Xml-#3878
Xml to src
2017-11-10 15:08:40 -05:00
Tobias Diekershoff 4f95b413fa some corrections 2017-11-10 20:57:02 +01:00
Tobias Diekershoff 3e1d0bf7a8 move HTML to template and add an optional hint that a global community page shows all arriving public postings 2017-11-10 20:25:17 +01:00
Tobias Diekershoff 3948539495 add docs for the show_global_community_hint option 2017-11-10 20:24:05 +01:00