|
|
d7039c6862
|
Merge remote-tracking branch 'upstream/develop' into comment-public
|
2017-12-27 15:51:36 +00:00 |
|
|
|
d0a43b8533
|
Missing include
|
2017-12-27 15:26:17 +00:00 |
|
|
|
d707c5afcd
|
Merge remote-tracking branch 'upstream/develop' into comment-public
|
2017-12-26 23:59:32 +00:00 |
|
|
|
3873d4863f
|
add Socialhome to the federation stats
|
2017-12-24 16:08:34 +01:00 |
|
|
|
5afedb28d4
|
You can now comment on the community page
|
2017-12-23 07:33:51 +00:00 |
|
|
|
2e022733f6
|
Standards
|
2017-12-21 22:54:58 +00:00 |
|
|
|
4dcf14f62e
|
Query was simplified
|
2017-12-21 18:49:27 +00:00 |
|
|
|
cfa42552bc
|
Standards
|
2017-12-21 18:46:35 +00:00 |
|
|
|
fba40b8761
|
Removed unneeded code
|
2017-12-21 08:58:36 +00:00 |
|
|
|
f7272be4a8
|
Reshares are now working
|
2017-12-20 18:18:25 +00:00 |
|
|
|
343f22e02f
|
Updating after post does now work
|
2017-12-20 10:16:25 +00:00 |
|
|
|
fa8a09d977
|
Comments to public posts no get through
|
2017-12-19 23:12:37 +00:00 |
|
|
|
b457ed6876
|
Preparation for being able to comment every public item
|
2017-12-19 17:15:56 +00:00 |
|
|
|
2b50f001b9
|
Added statistics
|
2017-12-19 07:39:21 +00:00 |
|
Hypolite Petovan
|
179b311978
|
Remove group_member.uid
- Use contact.uid alternatively
- Use JOIN with group table
|
2017-12-14 22:47:58 -05:00 |
|
|
|
2d7cd2daf4
|
"update" is enough
|
2017-12-14 22:18:53 +00:00 |
|
|
|
cf56de1e77
|
Merge remote-tracking branch 'upstream/develop' into dbstructure-class
|
2017-12-14 21:42:26 +00:00 |
|
|
|
15d42de647
|
Class moved, changes applied
|
2017-12-14 21:13:02 +00:00 |
|
|
|
89ad41aca5
|
Bugfix: Calls to a renamed function had been changed
|
2017-12-14 18:06:48 +00:00 |
|
|
|
ea10a7c002
|
Map is moved to the new place
|
2017-12-13 21:37:34 +00:00 |
|
Hypolite Petovan
|
6362296666
|
Add INNER JOIN to admin pending user list please @annando
|
2017-12-13 10:32:59 -05:00 |
|
Hypolite Petovan
|
4d72a40aa6
|
Add Exception support to User::create usages
|
2017-12-12 21:13:36 -05:00 |
|
Hypolite Petovan
|
9063c830f5
|
Fix admin pending user list SQL
|
2017-12-12 21:07:22 -05:00 |
|
Hypolite Petovan
|
ac3642e76f
|
Add Exceptions to User::create
|
2017-12-12 20:43:21 -05:00 |
|
|
|
88ef61df95
|
Removed useless "function_exists" checks
|
2017-12-12 04:52:33 +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
|
e44abb6c2a
|
Fix formatting of mod/register
|
2017-12-08 19:26:48 -05:00 |
|
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 |
|
|
|
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 |
|
|
|
df89e0384d
|
Added description to networks, renaming some network names
|
2017-12-03 13:26:52 +00:00 |
|
|
|
ffd04fed85
|
missing word
|
2017-12-03 10:26:26 +01:00 |
|
|
|
6f7510550d
|
NETWORK_MAIL2 was never finished, so remove it as well
|
2017-12-03 09:19:58 +00:00 |
|
|
|
2aca406f52
|
wrong URL in directory
|
2017-12-03 08:27:15 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
9612496e9e
|
The function "template_escape" doesn't exist anymore.
|
2017-11-27 06:44:49 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
cb7648359c
|
When we are requesting a conneczion, the contactis no longer "blocked"
|
2017-11-26 02:31:26 +00:00 |
|
|
|
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 |
|
|
|
1adff81a25
|
Documentation for "fetch further information"
|
2017-11-25 14:43:28 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
183999ee08
|
No german compound wording :-)
|
2017-11-19 19:47:04 +00:00 |
|
|
|
8cd21269ff
|
The last of the big workers moved ... delivery and notifier
|
2017-11-19 18:59:55 +00:00 |
|
|
|
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 |
|
|
|
1f28cbd2c6
|
And now DiscoverPoCo.php
|
2017-11-18 11:02:46 +00:00 |
|
|
|
01362461cf
|
poller.php is cleaned up, unneeded stuff has been removed
|
2017-11-18 11:01:01 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
fd2b807292
|
halfe the double
|
2017-11-10 22:00:39 +01:00 |
|
|
|
4f95b413fa
|
some corrections
|
2017-11-10 20:57:02 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
063358301f
|
One space more
|
2017-11-08 13:08:26 +00:00 |
|
|
|
76caf7a9cf
|
Small corrections
|
2017-11-08 06:43:20 +00:00 |
|
|
|
76f73c7236
|
And some more places
|
2017-11-07 22:15:59 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
7881fd7dc9
|
std foo
|
2017-11-06 18:20:39 +01:00 |
|
|
|
143e7fc6b7
|
dont use the entire url as option
|
2017-11-06 18:05:42 +01:00 |
|
|
|
1f9b52f2bf
|
code corrections
|
2017-11-06 17:45:33 +01:00 |
|
