Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 20:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
25215 commits 3 branches 64 tags 237 MiB
Commit graph

3228 commits

Author SHA1 Message Date
Michael
1b0f260255 Convert filebrowser.js to unix format 2019-07-29 20:41:19 +00: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
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
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
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
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
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
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
0c63f8aa42 Add contact block reason form and display in admin page 2019-05-15 19:30:13 -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
c969635bbc Add style to exception page 2019-05-04 21:54:05 -04: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
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
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
d6a5274bb9 [frio] Update theme settings form for use in embed mode 
- Replace jRange with native slider to prevent overflowing on the right in embed mode
- Move color swatch to the left of colorinput fields to prevent overflowing on the right in embed mode
 2019-05-02 09:52:48 -04:00
Hypolite Petovan
a88df9b259 Ensure theme consistency when using filebrowser 
- Send frio filebrowser result to current frame instead of parent one
 2019-05-02 09:52:48 -04:00
Hypolite Petovan
611220cb53 Improve display in minimal mode 2019-05-02 09:52:48 -04:00
Hypolite Petovan
5a01c53781 Move admin/queue to src/Module 
- Add Module\Admin\Queue class
- Add route for admin/queue[/deferred]
- Add queue admin aside menu entry
- Remove obsolete templates/admin/queue.tpl from base and frio
- Move templates/admin/workerqueue.tpl to templates/admin/queue.tpl
- Remove admin_page_workerqueue and admin_page_workerqueue_post from mod/admin.php
- Update admin/summary.tpl with new queue admin paths
 2019-05-02 09:52:48 -04:00
Hypolite Petovan
cf885841c8 Move admin/blocklist/contact to src/Module 
- Add Module\Admin\ContactBlock\Contact class
- Add route for admin/blocklist/contact
- Add contact blocklist admin aside menu entry
- Move templates/admin/contactblock.tpl to templates/admin/blocklist/contact.tpl in base and frio
- Remove admin_page_contactblock and admin_page_contactblock_post from mod/admin.php
 2019-05-02 09:52:46 -04:00
Hypolite Petovan
f3f055758c Move admin/users to src/Module 
- Add Module\Admin\Users class
- Add route for admin/users[/{action}/{uid}]
- Add users admin aside menu entry
- Remove admin_page_users and admin_page_users_post from mod/admin.php
 2019-05-02 09:52:45 -04:00
Hypolite Petovan
9bbb438534 Move admin/addons to src/Module 
- Add Module\Admin\Addons\Index class
- Add route for admin/addons
- Add addons admin aside menu entry
- Remove unused template admin/addons.tpl from base and frio
- Remove addon list from mod/admin
 2019-05-02 09:52:44 -04:00
Hypolite Petovan
6387a77b52 Move admin summary to src/Module 
- Add BaseAdminModule class
- Add Module\Admin\Summary class
- Add Route for Admin\Summary module
- Remove admin_page_summary() in mod/admin
- Remove $showwarning variable from admin/summary.tpl
 2019-05-02 09:52:41 -04:00
Hypolite Petovan
5dd6e6b5fb Reworked /photos module without App->error 
- Moved confirm dialogs to photos_content()
- Removed comments/interactions from photo edit page
 2019-05-01 19:36:14 -04:00
Hypolite Petovan
608c80819c Remove obsolete hack in file browser template 2019-04-13 19:05:14 -04:00
Tobias Diekershoff
686f67fb90 vier mobile: private mail width 2019-04-08 07:27:19 +02:00
Michael
46a99a05a1 Remove the queue from the core 2019-04-05 18:04:39 +00:00
Hypolite Petovan
c713c2bf62
Merge pull request #6955 from tobiasd/20190331-vier 
vier mobile enhancements
 2019-04-04 14:22:34 -04:00
Jeroen De Meerleer
008b66ac2c Changed keyup to oninput 2019-04-02 15:13:44 +02:00
Hypolite Petovan
b529c03a20 Sanitize theme path items 
- Sanitize theme style/color/scheme path items
 2019-03-31 21:52:48 -04:00
Tobias Diekershoff
820e2a89f9 add search to user menu as well 2019-03-31 15:20:23 +02:00
Tobias Diekershoff
843b9f71c1 be consistent with messages and admin links as both are in the nav bar and the user menu 2019-03-31 11:24:17 +02:00
Tobias Diekershoff
174e71cc36 mobile view: show events and admin, but hide pm link 2019-03-31 11:18:41 +02:00
Tobias Diekershoff
afd751ee74 add link to admin panel as well, but keep icon as it is really handy 2019-03-31 11:17:59 +02:00
Hypolite Petovan
3f640169f7 Switch comment box closing event listener from click to mousedown 
- Fix event race condition in Chrome 73 (https://github.com/friendica/friendica/issues/6947)
 2019-03-28 22:32:31 -04:00
Hypolite Petovan
898f7e7e38 Add connector collapsible panel in permission 
- Replace HTML string by structured array in jot_networks hook
- Add collapsed panel when there are more than two connectors
 2019-03-24 22:40:50 -04:00
Adam Clark
ef850a0567 Updated Bootstrap to 3.4.1 2019-03-22 22:28:12 -04:00
Jeroen De Meerleer
bf04bccc77 No schemestring update if focus 2019-03-22 22:28:11 -04:00
Jeroen De Meerleer
a8cc4b3362 I will not share options that are not being used. 2019-03-22 22:28:10 -04:00
Jeroen De Meerleer
1c33c20940 Add a comment 2019-03-22 22:28:10 -04:00
Jeroen De Meerleer
42769c6976 Changed spaces into tabs 2019-03-22 22:28:09 -04:00
Jeroen De Meerleer
3af3887bfa Added background image sharing 
Why did I miss this?
 2019-03-22 22:28:09 -04:00
Jeroen De Meerleer
10a8d6a563 Implemented parsing share string 2019-03-22 22:28:08 -04:00
Jeroen De Meerleer
9a8dc9d9a6 Better way to stringify theme 2019-03-22 22:28:07 -04:00
Jeroen De Meerleer
2a8b4d6e29 I don't like undefined 2019-03-22 22:28:07 -04:00
Jeroen De Meerleer
1e84411e84 Added string creation 2019-03-22 22:28:07 -04:00
Jeroen De Meerleer
ffa7d7659b Added the share_string field 2019-03-22 22:28:07 -04:00
Tobias Diekershoff
6ca525846b this label does not need a filter 2019-03-22 00:42:29 +01:00
Hypolite Petovan
3ab0f90654 [frio] Add slash to punctuation wrapper template 2019-03-19 08:05:25 -04:00
Hypolite Petovan
f97db3add9 [frio] Add punctuation wrap on several profile fields 
- Add sub/punct_wrap.tpl template
 2019-03-18 21:02:58 -04:00
Michael
2cdd5a4940 Fixes errors/notices 2019-03-17 22:13:17 +00:00
Hypolite Petovan
d6a607558b Add frio.scheme pconfig value type check 
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-471118589
 2019-03-08 22:05:14 -05:00
Hypolite Petovan
a1f7c1215d Fix typo to ensure config backward compatibility in frio/php/scheme.php 2019-03-08 22:04:38 -05:00
Philipp Holzer
4d4ad5c042
wrong intend 2019-03-02 17:27:51 +01:00
Philipp Holzer
d7dd9f8bee
Word-wrap for long lines 2019-03-02 16:02:27 +01:00
Michael Vogel
4c6c5786ad
Merge pull request #6752 from MrPetovan/bug/notices 
Fix various notices
 2019-02-24 21:30:07 +01:00
Hypolite Petovan
f95f6eced9 Add scheme input protection in frio/config.php 
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-464912016
 2019-02-24 14:32:51 -05:00
Hypolite Petovan
8adc761da0
Merge pull request #6747 from nupplaphil/issue/6677-frio_admin 
Fixing frio theme customization for admin
 2019-02-24 10:30:37 -05:00
Philipp Holzer
758444a7d2
empty is better than isset 2019-02-24 15:48:30 +01:00
Michael Vogel
fa5525d084
Merge pull request #6726 from MrPetovan/task/6676-fix-implicit-mentions 
Fix last batch of implicit mentions issues
 2019-02-24 15:40:11 +01:00
Philipp Holzer
da4fc0411e
Fixing admin scheme-change in frio 2019-02-24 15:40:05 +01:00
Hypolite Petovan
0a58e4c952 Improve contactgroupChangeMember() javascript function 
- Add usage of new /group/123/add|remove/123 URL
- Add checkbox revert in case of error
 2019-02-23 17:32:41 -05:00
Hypolite Petovan
34bc0b0c97 Add potential debug display of implicit mentions in frio 
- Refactored conversation() by removing extraneous intermediary variables
 2019-02-23 17:32:11 -05:00
Michael
7e93355671 Fix: Following url with html entities now works again 2019-02-23 21:20:56 +00:00
Michael Vogel
e32ef66f68
Merge pull request #6688 from nupplaphil/preload_adapter_fix 
Preload adapter fix
 2019-02-18 15:47:26 +01:00
Philipp Holzer
6c22f70b62
revert style.php changes 2019-02-18 14:48:26 +01:00
Hypolite Petovan
44b556aaa6 [frio] Change comment expand icons to carets 2019-02-18 08:23:05 -05:00
Philipp Holzer
f825fa1d1c
tmp alert 2019-02-18 14:21:13 +01:00
Hypolite Petovan
d6944eb894
Merge pull request #6683 from rabuzarus/20190217_-_fix_magicLinks_mentions 
directory - own function for processing data of directory entries
 2019-02-18 08:01:20 -05:00
rabuzarus
2b7c331afb forumdirectory: some polishing 2019-02-18 13:03:21 +01:00
rabuzarus
85f0508494 own function for processing data of directory entries 2019-02-18 03:00:10 +01:00