friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
24,858 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

5546 Commits

Author SHA1 Message Date
Hypolite Petovan c1f99c70b1 Merge branch '2019.06-rc' 
# Conflicts:
#	CHANGELOG
#	VERSION
#	boot.php
 2019-06-23 15:30:44 -04:00
Michael 289bcfa121 Fix receiving of DFRN posts with public envelope 2019-06-22 04:17:38 +00:00
Philipp fb63274aaf
Merge pull request #7250 from MrPetovan/bug/6410-normalize-message-button 
Normalize message button in profile sidebar
 2019-06-12 17:56:05 +02:00
Hypolite Petovan 3aebb92cf3 Rework Profile::sidebar profile link conditions 
- Now show Follow, Unfollow, Atom Feed and Message in profile sidebar more consistently with the status of the current visitor
- Remove pseudo-field contact.remoteconnect
 2019-06-10 21:56:03 -04:00
Philipp Holzer 7c54edd4b4
Fixing Network::post() caused by wrong argument 2019-06-10 19:34:16 +02:00
Hypolite Petovan d7d44e1af7
Merge pull request #7245 from annando/unify-constants 
Fix delivery counter for poking / unify delivery commands
 2019-06-10 11:59:40 -04:00
Michael 41dc243186 Fix delivery counter for poking / unify delivery commands 2019-06-10 14:19:24 +00:00
Philipp Holzer cc7444d84d
Move internal recursion-counter to the end of all cur/fetchUrl parameters 2019-06-10 14:34:54 +02:00
Michael 44a49a8d7d Ensure that pokes are always send only via DFRN 2019-06-06 04:26:02 +00:00
Hypolite Petovan f0de19dd8a
Merge pull request #7208 from nupplaphil/bug/6916-filetag 
Adding null checks before FileTag method (fix fatal)
 2019-05-31 01:47:52 -04:00
Hypolite Petovan ac294be746
Merge pull request #7207 from nupplaphil/bug/6917-php_warnings 
Add hexadecimal check (fix warnings)
 2019-05-30 09:31:50 -04:00
Philipp Holzer c76258c370
catching nulls for FileTag 2019-05-30 13:54:35 +02:00
Philipp Holzer 03ca26f0c4
Change fallback logic 2019-05-30 13:45:39 +02:00
Philipp Holzer aa33a79e13
normal comparison 2019-05-30 13:38:00 +02:00
Philipp Holzer 4c5dd9f47c
Add more Strings::isHex() checks to photos 2019-05-30 10:30:15 +02:00
Philipp Holzer e4a63bc219
Replace $_SESSION with Session::get() 2019-05-30 10:18:52 +02:00
Philipp Holzer 7334be803d
Bugfix - `item_id` 2019-05-29 21:40:21 +02:00
Philipp Holzer 392137b433
Adding hexadecimal check for parse_rul 
see https://github.com/friendica/friendica/issues/6917#issuecomment-475461338
 2019-05-29 20:32:16 +02:00
Philipp Holzer 3de540d1d1
Adding hexadecimal check for photos 
see https://github.com/friendica/friendica/issues/6917#issuecomment-492798238
 2019-05-29 20:28:25 +02:00
Philipp Holzer e853e256c7
Checking all values for $_SESSION 
See https://github.com/friendica/friendica/issues/6918#issuecomment-491492826
 2019-05-29 20:07:22 +02:00
Philipp Holzer 3015135750
Adding fallback route in case of a non valid route 
see https://github.com/friendica/friendica/issues/6918#issuecomment-491009954
 2019-05-29 20:06:50 +02:00
Philipp 59bbb1ac99
Merge pull request #7203 from MrPetovan/bug/warnings 
Fix condition in dfrn_request_content() when $a->profile isn't set
 2019-05-29 07:06:06 +02:00
Philipp 9245942a0c
Merge pull request #7199 from MrPetovan/bug/7171-filer-network 
Allow commas in saved folder names
 2019-05-29 07:03:44 +02:00
Hypolite Petovan 8f4dbec696 Fix condition in dfrn_request_content() when $a->profile isn't set 
See https://github.com/friendica/friendica/issues/6917#issuecomment-494087890
 2019-05-28 21:14:21 -04:00
Hypolite Petovan ed768c71ee Remove "f=&" nonsense from network module 
- Fixes wrong redirect when using the sidebar filters
 2019-05-27 17:45:27 -04:00
Hypolite Petovan cd05d15b04 Replace build_querystring() by http_build_query() introduced in PHP 5 2019-05-27 17:40:12 -04:00
Hypolite Petovan 0fadc7730c Replace deprecated string-bases Model\FileTag calls with array-based ones 2019-05-27 17:40:08 -04:00
Hypolite Petovan 3c7e4b474b
Merge pull request #7193 from nupplaphil/bug/uimport_datetime 
Fix NULL datetime for uimport/uexport
 2019-05-27 09:13:01 -04:00
Hypolite Petovan 01e71254d9 Replace defaults() calls on $_SESSION by Core\Session calls 
- Replace direct calls to $_SESSION by Core\Session calls in Module\Login
 2019-05-26 21:26:59 -04:00
Philipp Holzer 26d4214c19
added suggestions 2019-05-26 21:53:24 +02:00
Philipp Holzer 220f8f0862
friendica-6950 uimport doesn't support `"pwdreset_time":null` 2019-05-26 15:49:44 +02:00
Philipp Holzer 2652787460
friendica-7130 Edits of images not possible 2019-05-26 15:00:19 +02:00
Hypolite Petovan d27d4d8927 Move posted date widget to Content\Widget 2019-05-25 19:08:15 -04:00
Hypolite Petovan c65faecc8c Add current tab parameter to Model\Profile::getTabs 2019-05-20 15:09:33 -04:00
Hypolite Petovan 709eba6ce3 Move /viewcontacts to /profile/{nickname}/contacts[/{type}] 
- Add contact relationship filter to profile contacts page
- Include feed contacts in contacts page and contact widget
 2019-05-20 14:50:09 -04:00
Hypolite Petovan 862159c712
Merge pull request #7165 from nupplaphil/task/mod_dirfind 
Move mod/dirfind to src/Module/Search/Directory
 2019-05-20 14:45:19 -04:00
Hypolite Petovan 0c9b76a585
Merge pull request #7173 from nupplaphil/task/mod_newmember 
Move mod/newmember to src/Module/Welcome
 2019-05-20 14:14:58 -04:00
Philipp Holzer f97b72eb9f
Move mod/newmember to src/Module/Welcome 2019-05-20 20:12:20 +02:00
Hypolite Petovan 6f0c6e8926
Merge pull request #7160 from nupplaphil/task/mod_probe 
Move mod/probe to src/Module/Probe
 2019-05-19 15:06:13 -04:00
Hypolite Petovan 3ca64185a6
Merge pull request #7169 from annando/send-suggest 
Sending contact suggestions does work again
 2019-05-19 14:59:28 -04:00
Philipp a758671a1b
Merge pull request #7154 from MrPetovan/task/refactor-widgets 
Refactor widgets
 2019-05-19 20:52:00 +02:00
Michael a6cf036db2 Sending contact suggestions does work again 2019-05-19 17:59:37 +00:00
Michael 14d4132ad0 Fixed contact suggestion 2019-05-19 08:54:26 +00:00
Philipp Holzer a7aae9603a
Split Directory Search as a base for further changes 2019-05-19 05:06:02 +02:00
Philipp Holzer 5b44fdc202
Split Directory Search as a base for further changes 2019-05-19 05:01:46 +02:00
Philipp Holzer e00f110ef1
Move mod/dirfind to src/Module/DirFind 2019-05-19 04:28:16 +02:00
Philipp Holzer 48bba87abe
Move mod/probe to src/Module/Probe 2019-05-19 04:24:18 +02:00
Hypolite Petovan 7a13582c67
Merge pull request #7159 from nupplaphil/task/mod_notice 
Move mod/notice to src/Module/Notice
 2019-05-18 22:16:35 -04:00
Hypolite Petovan ec5c123f41
Merge pull request #7163 from nupplaphil/task/mod_starred 
Move mod/starred to src/Module/Starred
 2019-05-18 22:16:21 -04:00
Hypolite Petovan 596e95917e
Merge pull request #7164 from nupplaphil/task/mod_randprof 
Move mod/randprof to src/Module/RandomProfile
 2019-05-18 22:16:06 -04:00
Philipp Holzer 82e271589f
Move mod/starred to src/Module/Starred 2019-05-19 03:07:44 +02:00
Hypolite Petovan d3a4ed0111
Merge pull request #7162 from nupplaphil/task/mod_view 
Move mod/view to src/Module/Theme
 2019-05-18 21:07:27 -04:00
Philipp Holzer 9092cb1beb
Move mod/notice to src/Module/Notice 2019-05-19 02:53:31 +02:00
Hypolite Petovan 33ec3d8051
Merge pull request #7161 from nupplaphil/task/mod_toggle_mobile 
Move mod/toggle_mobile to src/Module/ToggleMobile
 2019-05-18 20:14:27 -04:00
Hypolite Petovan 30945784c3
Merge pull request #7157 from nupplaphil/task/mod_notify 
Move mod/notify to src/Module/Notify
 2019-05-18 17:49:01 -04:00
Philipp Holzer 8bb85b1da7
Move mod/randprof to src/Module/RandomProfile 2019-05-18 22:17:57 +02:00
Philipp Holzer d1d7fa394a
Move mod/view to src/Module/View 2019-05-18 21:23:12 +02:00
Philipp Holzer 295d90d496
Move mod/toggle_mobile to src/Module/ToggleMobile 2019-05-18 21:13:19 +02:00
Philipp Holzer 2906a9031b
Removed mod/notify 2019-05-18 19:04:33 +02:00
Philipp Holzer 9f13ae6e73
Move mod/opensearch to src/Module/OpenSearch 2019-05-18 17:43:58 +02:00
Hypolite Petovan 71ae8d07a6 Refactor widgets 
- Move widget templates to subfolder
- Add new generic filter widget templates to replace category, network and filer filters
- Update styles
 2019-05-18 11:33:35 -04:00
Hypolite Petovan 8e885f5b97 Add two-factor authentication settings 
- Add settings aside menu entry
- Add two-factor authentication documentation
 2019-05-13 01:52:01 -04:00
Hypolite Petovan 6071fe81b4 Move Authentication::setAuthenticatedSessionForUser to Session::setAuthenticatedForUser 2019-05-13 01:51:59 -04:00
Hypolite Petovan 3785c6de05
[hotfix] Fix wrong Exception namespace 2019-05-07 11:56:25 -04:00
Philipp 7c62a4e02b
Merge pull request #7104 from annando/separated-confirm 
The follow confirmation process is now separated
 2019-05-06 21:40:11 +02:00
Hypolite Petovan 20c9d5fe1d
Merge pull request #7103 from nupplaphil/task/mod_smilies 
Move mod/smilies to src/Module/Smilies
 2019-05-06 12:53:45 -04:00
Michael 37f9af2f24 Merge remote-tracking branch 'upstream/develop' into separated-confirm 2019-05-06 05:54:51 +00:00
Michael 5da3e17a12 The follow confirmation process is now separated between DFRN and the rest 2019-05-06 05:46:13 +00:00
Hypolite Petovan bd604d1cfb
Merge pull request #7084 from nupplaphil/task/mod_removetag 
Move mod/filerm to src/Module/Filer/RemoveTag
 2019-05-05 20:36:38 -04:00
Hypolite Petovan fbf36d6e7f
Merge pull request #7086 from nupplaphil/task/mod_maintenance 
Move mod/maintenance to src/Module/Maintenance
 2019-05-05 20:36:12 -04:00
Hypolite Petovan b79201beaf
Merge pull request #7102 from nupplaphil/task/mod_pretheme 
Move mod/pretheme to src/Module/ThemeDetails
 2019-05-05 20:33:21 -04:00
Hypolite Petovan 1e6affada1
Merge pull request #7101 from nupplaphil/task/mod_viewsrc 
Move mod/viewsrc to src/Module/ItemBody
 2019-05-05 20:32:42 -04:00
Hypolite Petovan 12b6ab9943
Merge pull request #7100 from nupplaphil/task/mod_robots_txt 
Move mod/robots_txt to src/Module/RobotsTxt
 2019-05-05 14:23:10 -04:00
Hypolite Petovan 8af0ae171e
Merge pull request #7083 from nupplaphil/task/mod_friendica 
Move mod/friendica to src/Module/Friendica
 2019-05-05 14:19:57 -04:00
Michael Vogel fb563e0495
Merge pull request #7099 from nupplaphil/task/mod_modexp 
Move mod/modexp to src/Module/PublicRSAKey
 2019-05-05 19:49:51 +02:00
Philipp Holzer e90876cd86
Move mod/smilies to src/Module/Smilies 2019-05-05 19:39:02 +02:00
Philipp Holzer 3f71a51d21
Move mod/pretheme to src/Module/ThemeDetails 2019-05-05 19:24:10 +02:00
Philipp Holzer 49a3179578
Move mod/viewsrc to src/Module/ItemBody 2019-05-05 19:15:33 +02:00
Philipp Holzer 510c150156
Move mod/robots_txt to src/Module/RobotsTxt 2019-05-05 19:06:51 +02:00
Philipp Holzer 9f0bbd96be
Move mod/modexp to src/Module/PublicRSAKey 2019-05-05 19:02:19 +02:00
Hypolite Petovan e17db489ee
Merge pull request #7095 from annando/ap-connect 
Switching from legacy DFRN connect to ActivityPub
 2019-05-05 09:37:43 -04:00
Hypolite Petovan c830e4b300
Merge pull request #7091 from nupplaphil/task/mod_rsd 
Move mod/rsd_xml to src/Module/ReallySimpleDiscovery
 2019-05-05 08:30:06 -04:00
Michael bdf1e7ebfd Improved protocol storing 2019-05-05 11:53:17 +00:00
Michael b6000b3395 Storing the protocol while following a contact 2019-05-05 11:19:30 +00:00
Philipp Holzer 62fd5375dc
Move mod/maintenance to src/Module/Maintenance 2019-05-05 10:06:50 +02:00
Philipp Holzer a052b098fc
Move mod/filerm to src/Module/FilerM 2019-05-05 10:02:10 +02:00
Hypolite Petovan 0046e62077
Merge pull request #7090 from nupplaphil/task/mod_like 
Move mod/like to src/Module/Like
 2019-05-04 22:02:48 -04:00
Hypolite Petovan 0a8a614608
Merge pull request #7089 from nupplaphil/task/mod_help 
Move mod/help to src/Module/Help
 2019-05-04 22:02:38 -04:00
Hypolite Petovan 3118453fb9
Merge pull request #7088 from nupplaphil/task/mod_invite 
Move mod/invite to src/Module/Invite
 2019-05-04 19:30:13 -04:00
Philipp Holzer a1f332aaa5
Move mod/rsd_xml to src/Module/ReallySimpleDiscovery 2019-05-04 21:37:32 +02:00
Philipp Holzer aeae65daf8
Move mod/like to src/Module/Like 2019-05-04 21:20:39 +02:00
Philipp Holzer 1d106762da
Move mod/help to src/Module/Help 2019-05-04 21:06:08 +02:00
Philipp Holzer bacf9825ff
Move mod/invite to src/Module/Invite 2019-05-04 20:32:31 +02:00
Hypolite Petovan 74fda8f390
Merge pull request #7085 from nupplaphil/task/mod_home 
Move mod/home to src/Module/Home
 2019-05-04 14:09:54 -04:00
Hypolite Petovan 5e3a55915d
Merge pull request #7078 from nupplaphil/task/mod_fetch 
Move mod/fetch to src/Module/Diaspora/Fetch
 2019-05-04 08:47:23 -04:00
Philipp Holzer 708ffaff51
Move mod/home to src/Module/Home 2019-05-04 13:08:31 +02:00
Philipp Holzer 6f787f2422
Move mod/friendica to src/Module/Friendica 2019-05-04 10:14:29 +02:00
Philipp Holzer 2b4c710e3f
Move mod/fetch to src/Module/Fetch 2019-05-03 10:42:40 +02:00
Philipp Holzer 1ef4b9c7e4
Move mod/nogroup to src/Module/Group 2019-05-03 08:50:17 +02:00
Michael Vogel 6c34196264 Cleaning confirm 2019-05-03 06:17:26 +02:00