keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17270 commits 4 branches 0 tags 179 MiB
Commit graph

4176 commits

Author SHA1 Message Date
Hypolite Petovan
bc58e8d3be Rename Model\GlobalContact to Model\GContact 2017-12-07 23:57:56 -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
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
Hypolite Petovan
cf45e8738c
Hotfix regmod missing use statement 2017-12-07 14:12:03 -05:00
Hypolite Petovan
cd84bf8963 Rename Model\GlobalContact to Model\GContact 2017-12-07 09:09:28 -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
Adam Magness
3772a1c24c Remove mod files 
remove mod files based on lack of usage/obseleteness.
 2017-12-06 16:45:41 -05:00
Tobias Diekershoff
c258df0f0a removed x-permission 2017-12-05 07:13:55 +01:00
Adam Magness
b1d16fbdf7 Update use statements 
update use statements for rename to singular.
 2017-12-04 09:04:36 -05:00
Adam Magness
6e5471def3 Rename to singular 
Rename and update references. Standards and a require_once.
 2017-12-04 09:01:27 -05:00
Adam Magness
2f0da29c75 Features to src 
Move Features to class in Friendica\Content namespace. Update function calls and references.
 2017-12-04 08:33:49 -05:00
Hypolite Petovan
27212c7f39 Update function calls to use Model\User and Object\Contact 2017-12-03 22:29:06 -05:00
Hypolite Petovan
4395c20679 Fix formatting and add documentation 
- mod/register
- mod/regmod
- Model/User
- Worker/CronJobs
 2017-12-03 22:15:31 -05:00
Michael Vogel
ae1227c9ca
Merge pull request #4001 from MrPetovan/bug/3999-fix-password-change 
Fix password change
 2017-12-03 14:49:10 +01:00
Hypolite Petovan
1eb8355ac8 Fix wrong condition 
Grmbl
 2017-12-03 08:37:01 -05:00
Hypolite Petovan
3359f3f5c7 Fix formatting in mod/settings 2017-12-03 08:36:39 -05:00
Michael
df89e0384d Added description to networks, renaming some network names 2017-12-03 13:26:52 +00:00
Tobias Diekershoff
ffd04fed85 missing word 2017-12-03 10:26:26 +01:00
Michael
6f7510550d NETWORK_MAIL2 was never finished, so remove it as well 2017-12-03 09:19:58 +00:00
Tobias Diekershoff
2aca406f52 wrong URL in directory 2017-12-03 08:27:15 +01:00
Michael
adf802474b Zot was never really supported, so it is now removed completely 2017-12-02 21:57:39 +00:00
Michael Vogel
2ca03acb45
Merge pull request #3986 from MrPetovan/task/admin-block-list 
Admin remote contact block list
 2017-12-02 22:09:04 +01:00
Adam Magness
2b121779a6 Salmon move to src 
Salmon class, update function name and function calls. Some standards as well.
 2017-12-02 09:32:45 -05:00
Hypolite Petovan
4d10f3b3b7 Remove unused use statement 2017-12-02 08:42:44 -05:00
Hypolite Petovan
75181322ba Improve page contacblock for frio theme 2017-12-01 22:33:04 -05:00
Hypolite Petovan
8826ece55e Use Contact::getIdForURL instead of probing 
- Add change to mod/admin
- Add change to util/global_community_block
 2017-12-01 22:32:24 -05:00
Hypolite Petovan
843ec842c3 Merge branch 'develop' into task/admin-block-list 2017-12-01 21:39:20 -05:00
Adam Magness
9a4e741d1a Review Changes 
renamed some functions and adjusted corresponding calls.
 2017-12-01 21:05:06 -05:00
Adam Magness
e90b0748aa Code Cleanup 
Standards clean up
 2017-12-01 18:13:39 -05:00
Adam Magness
f21feb975d Require Cleanup 
Remove instances of require_once for email.php
 2017-12-01 14:57:13 -05:00
Adam Magness
6008e3df11 Email to src 
Create Email class and update/rename functions and function calls.
 2017-12-01 14:41:27 -05:00
Hypolite Petovan
58ac3532b7 Fix undefined variables messages 2017-12-01 08:32:21 -05:00
Hypolite Petovan
ff459441cf
Merge branch 'develop' into task/admin-block-list 2017-12-01 00:48:13 -05:00
Hypolite Petovan
dc09319695 Add admin/contactblock page 
- Add page template
 2017-12-01 00:43:39 -05:00
Hypolite Petovan
16d0c30328 Move admin templates to dedicated sub-folder 2017-12-01 00:40:55 -05:00
Hypolite Petovan
0ae6f571da
Merge pull request #3982 from zeroadam/Photo-#3878 
Photo to src
 2017-11-30 20:33:48 -05:00
Hypolite Petovan
3cebdee867 Fix mod/admin.php formatting 2017-11-29 20:28:30 -05:00
Adam Magness
0373056448 Review and Use statements 
use statements and review changes.
 2017-11-29 17:29:11 -05:00
Michael
fe348acb49 Small fixes to "nogroup" 2017-11-29 20:59:06 +00:00
Adam Magness
0091d318e5 Function names 
Update function names and corresponding function calls
 2017-11-29 12:17:12 -05:00
Adam Magness
54827e7fed Photo to src 
Move Photo to Friendica\Object namespace and replace require_once statments with use statements.
 2017-11-29 07:52:27 -05:00
Michael
8bffee43b3 Threads are now always enabled. 2017-11-28 18:54:39 +00:00
Michael Vogel
3f448d9a42
Merge pull request #3970 from MrPetovan/task/3942-add-user-authenticate 
Migrate password hashing Part 1: Add User::authenticate
 2017-11-27 15:14:36 +01:00
Michael
9612496e9e The function "template_escape" doesn't exist anymore. 2017-11-27 06:44:49 +00:00
Michael
a6de1a1ae8 Posting images to public forums now really does work. 2017-11-26 22:28:46 +00:00
Hypolite Petovan
2196a0577b Remove unused upubkey and uprvkey from queries 
- Switched queries to new dba::* functions
 2017-11-26 14:55:47 -05:00
Hypolite Petovan
ec6f5193e2 Switch to User::authenticate 
- Removed hash('whirlpool') to check password
 2017-11-26 14:46:08 -05:00
Hypolite Petovan
90a8ae2cb8 Fix formatting 
- include/auth.php
- include/oauth.php
- include/user.php
- mod/removeme.php
- src/Worker/Queue.php
 2017-11-26 14:18:45 -05:00
Michael
661f9af93a Network page: Selecting a forum overrides the group selection 2017-11-26 16:17:32 +00:00
Hypolite Petovan
3fbf2e3bcf
Merge pull request #3966 from rabuzarus/20171122_-_port_tagcloud 
A tag cloud widget for the profile page
 2017-11-26 11:16:14 -05:00
Michael
f059b33390 Avoid empty user export when there are UTF8 problems 2017-11-26 13:58:24 +00:00
Hypolite Petovan
068d3dc746
Merge pull request #3959 from annando/image-forum 
Images that are uploaded to public forums are now public
 2017-11-25 21:40:33 -05:00
Michael
cb7648359c When we are requesting a conneczion, the contactis no longer "blocked" 2017-11-26 02:31:26 +00:00
Michael
a7088f5b67 Images that are uploaded to public forums are now public 2017-11-26 02:03:59 +00:00
rabuzarus
4224209497 Merge develop into 20171122_-_port_tagcloud 
Conflicts:
	include/features.php
 2017-11-25 23:41:20 +01:00
Michael
1adff81a25 Documentation for "fetch further information" 2017-11-25 14:43:28 +00:00
Michael
3cb906c420 Issue 3911: Fetch keywords for feeds 2017-11-25 11:59:20 +00:00
Adam Magness
609a4de5d0 src Standards 
This basically completes coding standards changes for the entire src directory, with the exception of App.php
 2017-11-23 14:01:58 -05:00
rabuzarus
19afabd268 tags: possibility to filter posts for tags and profile owner (profile) 2017-11-23 00:59:20 +01:00
rabuzarus
d7d653aab6 port tag cloud widget from hubzilla 2017-11-22 21:29:07 +01: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
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
Adam Magness
1726ededac Emailer to src 
Move emailer to src Friendica\Util namespace
 2017-11-20 15:37:30 -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
b85c94a60d
Merge branch 'develop' into issue/3878-move-Contact-to-src 2017-11-19 18:09:14 -05: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
Hypolite Petovan
b92fc24ff0 Add Contact Object 
- Add Profile Object
- Add User Model
- Add use statements
 2017-11-19 16:55:28 -05:00
Michael
920160cb28 The poller is now the worker 2017-11-19 21:47:21 +00:00
Adam Magness
a6d501bc4e Overzealous rename 
reverted change to function name.
 2017-11-19 16:14:16 -05:00
Adam Magness
d9e9cbe753 Coding Standards 
A few updates for coding standards
 2017-11-19 15:32:54 -05: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
2de457489f "CreateShadowentry" and "ProfileUpdate" now moved as well 2017-11-19 16:59:37 +00:00
Hypolite Petovan
2336fa9d74 Add smart_threading user setting 2017-11-19 00:57:31 -05:00
Michael
1f28cbd2c6 And now DiscoverPoCo.php 2017-11-18 11:02:46 +00:00
Michael
01362461cf poller.php is cleaned up, unneeded stuff has been removed 2017-11-18 11:01:01 +00:00
Michael
925d2d2383 Directory moved 2017-11-18 07:59:30 +00: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
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
Michael
476facde61 Onepoll moved as well 2017-11-12 18:50:35 +00:00
Adam Magness
4d146acf90 Smilies to src 
Move Smilies to Friendica\Content namespace.

Related to #3878
 2017-11-11 07:21:15 -05: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
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
Adam Magness
bc49fc974c Capitalized XML 
Acronym classes should be capitalized
 2017-11-10 07:45:33 -05:00
Adam Magness
f245bc8359 Move xml to namespace 
Relocate xml from include to src
Related to #3878
 2017-11-10 07:18:24 -05:00
Tobias Diekershoff
b8a76794e0 add info text about email on registration 2017-11-10 08:06:56 +01:00
Adam Magness
06c3af9b60 Move Cache to src 
relocate the cache class to Friendica\Core namespace
 2017-11-09 11:05:18 -05:00
Hypolite Petovan
ee5b9de6ad Reverting RINO crypto code to php-encryption version 1.2 2017-11-09 03:20:18 -05:00
Hypolite Petovan
1262d6bfee Function name typo 2017-11-09 03:01:53 -05:00
Hypolite Petovan
918f2e8593 Fix another php-encryption version migration error 2017-11-09 03:01:02 -05:00
Hypolite Petovan
d5aff9ac31 Fix php-encryption version 2 compatibility issues 2017-11-09 02:35:11 -05:00
Hypolite Petovan
acd65aade1 Switch to new php-encryption library version 
- Remove references to library/ files
- Add namespace to library classes
 2017-11-09 02:21:37 -05:00
Adam Magness
4ca68c7af0 Class file relocations 
Issue #3878
 2017-11-08 08:37:03 -05:00
Adam Magness
6189f6c8e7 Relocate class files from /include to /src/ 
dbm, Diaspora, dfrn, and NotificationsManager moved to namespace. Includes and references in files updated.
 2017-11-08 08:36:48 -05:00
Michael
063358301f One space more 2017-11-08 13:08:26 +00:00
Michael
76caf7a9cf Small corrections 2017-11-08 06:43:20 +00:00
Michael
76f73c7236 And some more places 2017-11-07 22:15:59 +00:00
Michael
5a6fa4ae87 Some more 2017-11-07 21:53:11 +00:00
Adam Magness
a782ab50f9 Correct deletion 
Bring back mod/probe.php and delete include/probe.php as intended.
 2017-11-07 12:31:32 -05:00
Adam Magness
8522c47353 Remove Includes 
Removed references to include/config.php and include/probe.php and deleted the respective files.
 2017-11-07 12:14:03 -05:00
Adam Magness
b995e858e6 Review changes 
Replacements for ::delete() as well as changes to include use statements.
 2017-11-07 09:12:01 -05:00
Adam Magness
0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
Michael Vogel
669dafcf22
Merge pull request #3876 from tobiasd/2017107-followup3874 
add version info to notification text
 2017-11-07 06:44:05 +01:00
Tobias Diekershoff
a49c1be7c9 add version info to notification text 2017-11-07 06:32:10 +01:00
Hypolite Petovan
c847a2f9cc
Merge pull request #3874 from tobiasd/20171009-checkversion 
check upstream version
 2017-11-06 13:59:49 -05:00
Tobias Diekershoff
7881fd7dc9 std foo 2017-11-06 18:20:39 +01:00
Tobias Diekershoff
143e7fc6b7 dont use the entire url as option 2017-11-06 18:05:42 +01:00
Tobias Diekershoff
1f9b52f2bf code corrections 2017-11-06 17:45:33 +01:00
Michael
930309d2ec Merge remote-tracking branch 'upstream/develop' into worker-class 2017-11-05 17:23:53 +00:00
Hypolite Petovan
93fd189198
Merge pull request #3866 from annando/detailled_notif 
There is now a user switch to change between notification styles
 2017-11-05 08:14:10 -05:00
Michael
478e363967 proc_run was replaced 2017-11-05 12:15:53 +00:00
Michael
da212a28a2 New worker class that does all the work 2017-11-05 10:33:46 +00:00
Tobias Diekershoff
0d0751fce3 comparison works now 2017-11-05 07:45:49 +01:00
Michael
9c78938ca9 Improved "if" construct 2017-11-04 21:27:32 +00:00
Michael
4831587250 Some explanation added 2017-11-04 14:00:29 +00:00
Michael
2894214347 Misspelled "detailed" 2017-11-04 12:08:12 +00:00
Michael
7de3eae8d0 There is now a user switch to change between condensed and detailled notifications 2017-11-04 12:01:08 +00:00
Tobias Diekershoff
6ee747dee8 missed something 2017-11-04 09:48:20 +01:00
Michael
4347e479d3 noscrape now contains "last-activity" which tells roughly the last activity 2017-11-04 08:38:22 +00:00
Tobias Diekershoff
53f83dc0a1 typo 2017-11-04 09:31:57 +01:00
Tobias Diekershoff
08977cbc6b this setting is not used anymore 2017-11-04 08:32:34 +01:00
Tobias Diekershoff
87c39cc396 this setting is not used anymore 2017-11-04 08:23:56 +01:00
Tobias Diekershoff
33ad8117ce this setting is not used anymore 2017-11-04 08:22:42 +01:00
Tobias Diekershoff
503ffa98d2 settings for checkversion 2017-11-04 08:15:28 +01:00
Tobias Diekershoff
1928217f83 added config wrapper around new option, opt-in 2017-11-03 15:52:40 +01:00
Tobias Diekershoff
79add903fe wording 2017-11-03 15:52:40 +01:00
Tobias Diekershoff
778c83bf25 show a notification in the admin panel if a newer version is available 2017-11-03 15:52:40 +01:00
Michael
d739fe2503 Issue 3860: Enhanced support of "!" for forums 2017-11-03 05:07:19 +00:00
Michael
937f36f754 @posts to only the forum should be treated like !posts 2017-11-02 21:25:20 +00:00
Michael
a2f9ea2642 Forum posts with "!" are now created directly as forum post 2017-11-02 20:15:14 +00:00
Michael
82321114ab If a post is dedicated to a single forum then it will be rewritten to a forum post 2017-11-01 23:20:43 +00:00
Michael
5222606602 Use the exclamation mark to address forums as well 2017-10-31 19:33:23 +00:00
hoergen
a5d8d1fd77
Update display.php 
adding baseurl to image tags for twitter and open Graph
 2017-10-31 02:45:58 +01:00
Michael
e2224a2ddc Some Webfinger clean up 2017-10-28 11:48:29 +00:00
Michael
0b7e8b7fb4 Hubzilla doesn't return the handle in the hcard 2017-10-27 06:17:24 +00:00
Hypolite Petovan
0c347d1466 Merge pull request #3819 from annando/photo-rework 
Better handling for GIF even, if not supported by the graphics library
 2017-10-23 13:04:52 -04:00
Hypolite Petovan
476d7d9533 Merge pull request #3813 from annando/remove-old-stuff 
Removed stuff that was never used or isn't used anymore
 2017-10-23 10:00:16 -04:00