jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
24720 commits 10 branches 58 tags 216 MiB
Commit graph

5660 commits

Author SHA1 Message Date
Hypolite Petovan
816eba5164 Unescape stream event title 2019-07-28 21:46:43 -04:00
Hypolite Petovan
c32d635326 Revert heading changes in admin/blocklist/server.tpl 2019-07-26 21:16:15 -04:00
Hypolite Petovan
8e52a38721 Updated master messages.po 2019-07-25 22:54:23 -04:00
Hypolite Petovan
eaf217ef7d Update server block admin page to reflect the addition of shell wildcard syntax 2019-07-25 22:37:30 -04:00
Hypolite Petovan
4821fe1b98 Use template-displayed errors in TwoFactor\Verify 
- Remove the page dependency on jGrowl notices
 2019-07-23 20:02:26 -04:00
Hypolite Petovan
92c1cbeeec
Merge pull request #7424 from TiMESPLiNTER/fix/respect-picdate 
Respect picdate for profile pic in Frio theme
 2019-07-23 13:09:41 -04:00
TiMESPLiNTER
56e8c47db2 fix(): Respect picdate for profile pic in Frio theme 2019-07-23 18:25:06 +02:00
Hypolite Petovan
1a164b0dc5 Add two-factor app-specific password settings page 
- Add two-factor app-specific model
- Add link to new page from 2fa settings index page
 2019-07-22 07:56:00 -04:00
TiMESPLiNTER
8825971687 Fix tag rendering which was displayed as escaped HTML instead of rendered HTML 2019-07-21 12:43:05 +02:00
Michael
a11206dbcd Issue 6675: Improved check for follower, removed global setting 2019-07-21 05:56:57 +00:00
Michael Vogel
2aea286143
Merge pull request #7400 from MrPetovan/bug/7397-frio-settings-fallback 
[frio] Theme settings fallback on node settings
 2019-07-18 23:22:17 +02:00
Hypolite Petovan
8e9a0e0e50 Show frio theme customization settings for new users 2019-07-17 23:08:56 -04:00
Hypolite Petovan
9b927fa333
Merge pull request #7399 from annando/only-sharer 
Added the option to only receive top level posts from people you follow
 2019-07-17 20:53:28 -04:00
Michael
e247a14d2b Added the option to only receive top level posts from people you follow 2019-07-17 21:37:13 +00:00
Hypolite Petovan
6332a50466 [frio] Remove outer post padding 
- Include mobile view changes
- Includes search view changes
 2019-07-17 08:09:46 -04:00
Philipp Holzer
92fb0a82ca
Dynamic config loading 
- Move settings, defaults and dbstructure to directory 'static'
- Dynamic loading of config files (after the static loading)
- Filter out '-sample.config.php' and '-sample.ini.php' files
- Remove unnecessary ConfigFileManager
- Move ConfigFileLoader to Utils
- Add tests for multi-loading for INI, config and sample-filtering
 2019-07-16 20:16:43 +02:00
Hypolite Petovan
b839a291d7 [frio] Use server theme settings for user's empty settings 2019-07-14 16:28:10 -04:00
Hypolite Petovan
2b8a99fabe
Revert "Default theme = login theme" 2019-07-14 15:18:50 -04:00
Hypolite Petovan
1f2047d703
Merge pull request #7374 from JeroenED/task/frio/default-to-login 
Default theme = login theme
 2019-07-14 09:00:02 -04:00
Jeroen De Meerleer
660ed6df22 Updated towards hypolite's first suggestion 2019-07-14 10:57:54 +02:00
Jeroen De Meerleer
5aa3cf1e2d Revert "Updated towards hypolites suggestions" 
This reverts commit aa5b3c20b3.
 2019-07-14 10:54:08 +02:00
Jeroen De Meerleer
b70e3d1c22 Revert "Fixed issues" 
This reverts commit 5e6b23bd4e.
 2019-07-14 10:54:03 +02:00
Jeroen De Meerleer
5e6b23bd4e Fixed issues 2019-07-14 10:48:24 +02:00
Jeroen De Meerleer
aa5b3c20b3 Updated towards hypolites suggestions 2019-07-14 10:34:42 +02:00
Jeroen De Meerleer
43625b437b Default theme = login theme 2019-07-13 23:27:54 +02:00
Jeroen De Meerleer
aff60da1af Nofilter 2019-07-13 22:45:54 +02:00
Jeroen De Meerleer
4ccc8b87b5 Code style 2019-07-10 16:54:31 +02:00
Jeroen De Meerleer
9b7b718b43 Using global $nav_bg if undefined 2019-07-10 16:51:18 +02:00
Hypolite Petovan
a58e90fa12 Display correct total blocked contact count in accordion header 2019-07-05 13:42:22 -04:00
Hypolite Petovan
27c7d233ac [frio] Add expected "none.png" background image 2019-07-05 13:41:48 -04:00
Hypolite Petovan
b9ab613777 Merge branch 'master' into develop 2019-06-23 17:40:52 -04:00
Tobias Diekershoff
72fdbbe790 EN US translation update THX AndyH3 2019-06-22 08:04:46 +02:00
Tobias Diekershoff
4b4f121b72 EN GB translation update THX AndyH3 2019-06-22 07:43:24 +02:00
Tobias Diekershoff
ed1f96bf76 update FR translations THX Valvin A. 2019-06-22 07:40:10 +02:00
Tobias Diekershoff
680e2eb9e5 DE translation update THX Copis 2019-06-22 07:29:52 +02:00
Tobias Diekershoff
b2f5ccc689 PL translation update THX waldis 2019-06-22 07:29:03 +02:00
Tobias Diekershoff
acee9c1c91 CS translation update THX Aditoo 2019-06-22 07:23:39 +02:00
Michael
4ab772ed67 Issue 6477: Automatically repair self contact avatar 2019-06-19 17:05:29 +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
0af10a42b0 Normalize logout link behavior across themes 2019-06-11 19:42:08 -04:00
Hypolite Petovan
b00bcbb1c1 Normalize the contact sidebar with the profile sidebar 
- Remove un/follow text links in contact status window
 2019-06-10 21:56:06 -04: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
Hypolite Petovan
9ac7d20df3 [frio] Add .add-to-modal delegated event on anchors 
- Improve hovercard button accessibility
 2019-06-03 08:31:43 -04:00
Hypolite Petovan
dc2f1d6bd3 Add global Javascript Element.matches polyfill 2019-06-03 08:30:24 -04:00
Hypolite Petovan
ee51534711 Update base translation strings 2019-05-31 00:35:42 -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
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
78a20e5acb
Fix hovercard vanish 2019-05-26 21:42:49 +02:00
Hypolite Petovan
d27d4d8927 Move posted date widget to Content\Widget 2019-05-25 19:08:15 -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
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
Philipp
a758671a1b
Merge pull request #7154 from MrPetovan/task/refactor-widgets 
Refactor widgets
 2019-05-19 20:52:00 +02:00
Philipp Holzer
48bba87abe
Move mod/probe to src/Module/Probe 2019-05-19 04:24:18 +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
Tobias Diekershoff
dd08a6432c CS translation update THX Aditoo 2019-05-17 06:42:29 +02:00
Hypolite Petovan
0c63f8aa42 Add contact block reason form and display in admin page 2019-05-15 19:30:13 -04:00
Hypolite Petovan
7f0036239f Update translation strings 2019-05-15 08:56:24 -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
d7e9b91181 Add two-factor authentication 
- Add 2FA login interception in Session::setAuthenticatedForUser
- Add 2fa session variable holding the last auth code
 2019-05-13 01:52:01 -04:00
Tobias Diekershoff
0a1c34b60c IT translations THX Sylke Vicious 2019-05-12 07:27:15 +02:00
Philipp
2a2b147758
Merge pull request #7127 from tobiasd/20190510-pwdresetescape 
pwdreset templated fixed HTML escaping
 2019-05-10 11:37:12 +02:00
Tobias Diekershoff
782037a611 HTML escaping 2019-05-10 10:52:53 +02:00
Tobias Diekershoff
3812cdf123 make the addon listing in the admin panel aside working again 2019-05-10 10:38:09 +02: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
Philipp Holzer
8ac1cf926c
remove superfluous tpl action 2019-05-06 20:40:53 +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
Philipp
14d8c12130
Merge pull request #7092 from MrPetovan/task/7047-theme-error-page 
Add style to exception page
 2019-05-06 07:33:42 +02:00
Hypolite Petovan
bb8d297ae4
Merge pull request #7097 from nupplaphil/task/mod_after_PR_fixing 
Fixings for Mod-Refactorings
 2019-05-05 20:28:57 -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
Philipp Holzer
e90876cd86
Move mod/smilies to src/Module/Smilies 2019-05-05 19:39:02 +02:00
Philipp Holzer
f6af90fa32
Create XML output for RSD with XML::fromArray() 2019-05-05 18:15:39 +02:00
Philipp Holzer
5d1a12d9b3
add feedback 2019-05-05 17:02:17 +02:00
Philipp Holzer
06ce74c7c9
add feedback 2019-05-05 17:01:51 +02:00
Hypolite Petovan
1e2d9e0bd4 Add EOF EOL to view/global.css 2019-05-05 08:14:55 -04:00
Philipp Holzer
9123361d61
added feedback 2019-05-05 10:00:28 +02:00
Hypolite Petovan
c969635bbc Add style to exception page 2019-05-04 21:54:05 -04:00
Philipp Holzer
a1f332aaa5
Move mod/rsd_xml to src/Module/ReallySimpleDiscovery 2019-05-04 21:37:32 +02:00
Philipp Holzer
708ffaff51
Move mod/home to src/Module/Home 2019-05-04 13:08:31 +02:00
Philipp Holzer
3fca00d1d5
forgot nofilter 2019-05-04 10:17:04 +02:00
Philipp Holzer
6f787f2422
Move mod/friendica to src/Module/Friendica 2019-05-04 10:14:29 +02:00
Hypolite Petovan
70bef12fd2 Fix Proxy module routes 
- Fix EOL in view/templates/exception.tpl
 2019-05-02 21:35:37 -04:00
Philipp
2628da422a
Merge pull request #7068 from MrPetovan/task/7047-theme-error-page 
Themed error page redux
 2019-05-02 21:15:29 +02:00
Philipp
774d04cd2f
Merge pull request #7044 from MrPetovan/task/router 
Move mod/admin to src/Module/Admin
 2019-05-02 18:26:30 +02:00
Hypolite Petovan
358baa9f62 Add themed error pages 
- Module init, post and rawContent-triggered HTTPException generate the classic bare HTTP status page
- Module content-triggered HTTPException generate themed error pages
- Trim System::httpExit to the bare minimum
 2019-05-02 11:26:56 -04:00
Philipp
07cb887885
Merge pull request #7067 from MrPetovan/task/remove-app-error 
Remove App->error
 2019-05-02 17:24:56 +02:00
Hypolite Petovan
9f4fb4906a Move addon admin list generation to Core\Addon 2019-05-02 09:55:49 -04:00
Hypolite Petovan
9774c95b80 Remove duplicate $baseurl template variable 
- Remove unused $overwriteURL parameter in Renderer::replaceMacros
 2019-05-02 09:55:48 -04:00
Hypolite Petovan
d8125eb3db Make the site admin theme setting link go to the currently selected theme 2019-05-02 09:52:55 -04:00
Hypolite Petovan
ad02fd140a Move /itemsource to src/Module/Admin 2019-05-02 09:52:53 -04:00
Hypolite Petovan
bc5d1384e1 Move admin/deleteitem to src/Module/Admin 2019-05-02 09:52:52 -04:00
Hypolite Petovan
a201391d11 Move admin/dbsync to src/Module 2019-05-02 09:52:51 -04:00
Hypolite Petovan
df947ba9db Move admin/logs to src/Module 2019-05-02 09:52:51 -04:00
Hypolite Petovan
740723534f Move admin/site to src/Module 
- Replace default theme settings modal with simple link to admin/themes
 2019-05-02 09:52:50 -04:00
Hypolite Petovan
d0b40cda4c Move admin/themes/{theme} to src/Module 
- Remove now unused templates/admin/addon_detail.tpl
- Remove references to themes admin in mod/admin.php
 2019-05-02 09:52:50 -04:00
Hypolite Petovan
a5da0fd98f Add admin/themes/{theme}/embed module 
- This module allows editing the site settings for a theme with a different user theme
 2019-05-02 09:52:49 -04:00