1
0
Fork 0
Commit graph

1026 commits

Author SHA1 Message Date
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
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
0c63f8aa42 Add contact block reason form and display in admin page 2019-05-15 19:30:13 -04:00
37f9af2f24 Merge remote-tracking branch 'upstream/develop' into separated-confirm 2019-05-06 05:54:51 +00:00
5da3e17a12 The follow confirmation process is now separated between DFRN and the rest 2019-05-06 05:46:13 +00:00
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
9f4fb4906a Move addon admin list generation to Core\Addon 2019-05-02 09:55:49 -04:00
9774c95b80 Remove duplicate $baseurl template variable
- Remove unused $overwriteURL parameter in Renderer::replaceMacros
2019-05-02 09:55:48 -04:00
d8125eb3db Make the site admin theme setting link go to the currently selected theme 2019-05-02 09:52:55 -04:00
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
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
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
611220cb53 Improve display in minimal mode 2019-05-02 09:52:48 -04:00
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
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
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
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
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
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
608c80819c Remove obsolete hack in file browser template 2019-04-13 19:05:14 -04:00
46a99a05a1 Remove the queue from the core 2019-04-05 18:04:39 +00:00
Jeroen De Meerleer
008b66ac2c Changed keyup to oninput 2019-04-02 15:13:44 +02:00
b529c03a20 Sanitize theme path items
- Sanitize theme style/color/scheme path items
2019-03-31 21:52:48 -04:00
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
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
6ca525846b this label does not need a filter 2019-03-22 00:42:29 +01:00
3ab0f90654 [frio] Add slash to punctuation wrapper template 2019-03-19 08:05:25 -04:00
f97db3add9 [frio] Add punctuation wrap on several profile fields
- Add sub/punct_wrap.tpl template
2019-03-18 21:02:58 -04:00
2cdd5a4940 Fixes errors/notices 2019-03-17 22:13:17 +00:00
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
a1f7c1215d Fix typo to ensure config backward compatibility in frio/php/scheme.php 2019-03-08 22:04:38 -05:00
4d4ad5c042
wrong intend 2019-03-02 17:27:51 +01:00
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
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
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
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
da4fc0411e
Fixing admin scheme-change in frio 2019-02-24 15:40:05 +01:00
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
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
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
6c22f70b62
revert style.php changes 2019-02-18 14:48:26 +01:00
44b556aaa6 [frio] Change comment expand icons to carets 2019-02-18 08:23:05 -05:00
f825fa1d1c
tmp alert 2019-02-18 14:21:13 +01:00
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
fa74adcf36 [frio] Reduce replies right padding 2019-02-17 15:00:24 -05:00
rabuzarus
9ebb2f42a1
Merge pull request #6660 from MrPetovan/task/6552-frio-improve-thread-display
[frio] Improve thread display
2019-02-17 13:33:49 +01:00
3cabddcdec [frio] Hide fake comment form when comment form isn't present 2019-02-16 18:40:05 -05:00
ad30e4824c [frio] Add margin between comment submit buttons and preview 2019-02-16 17:58:00 -05:00
82204b80e8 [frio] Remove .btn-primary from saved search button
- Remove useless comments
- Remove duplicated code
- Add screen reader support
2019-02-15 20:26:02 -05:00
25ba78d0d8 [frio] Prevent unwanted textaera resizing in comment forms 2019-02-15 09:15:39 -05:00
3e1e5fc986 [frio] Use text-align instead of flex display for submit buttons 2019-02-14 22:49:13 -05:00
2dd7a52b17 [frio] Thread display redesign
- Add fake form at end of comment list
- Shuffle comment box buttons around using flex display
- Convert divs into paragraphs
- Remove unused commentInsert() and qCommentInsert() function from textedit.js
2019-02-14 22:28:38 -05:00
d7dbc632f8 Improved comment hiding interaction
- Remove global window.showMore and window.showFewer
- Improve global showHideComments function
- Remove frio-specific showHideComments function
2019-02-14 22:24:34 -05:00
642f9409a7 Switch tag of expanded like list to paragraph 2019-02-14 22:17:08 -05:00
c8a7c95279 Unescape $ispublic variable for jot display 2019-02-14 22:11:00 -05:00
rabuzarus
ecc393e1c3 frio - some small styling fixes for the manage page (badges, center name, paddings) 2019-02-14 03:06:57 +01:00
Michael Vogel
c7308d98fa
Merge pull request #6614 from MrPetovan/task/6552-add-explicit-mentions
Add explicit mentions to ActivityPub/Diaspora comments
2019-02-10 00:52:40 +01:00
7c58944449 Add "delivery done" label 2019-02-08 23:19:26 -05:00
6577b1abb0 Add alias field to mod/crepair
- Replace deprecated q() call by DBA::update
2019-02-08 22:38:23 -05:00
38ac615ba0
Merge pull request #6577 from rabuzarus/20190129_-_jot_atachment_preview
Attachement live preview
2019-02-07 08:43:49 -05:00
rabuzarus
80b60ae4ff Bugfix: remove useless </a> for categories from wall_thread template 2019-02-06 17:08:13 +01:00
cf9a65cded
Merge pull request #6589 from rabuzarus/20190204_-_show_forum_account_in_vcard
frio: add account type to the profile vcard
2019-02-04 19:02:43 -05:00
rabuzarus
56495e03c6 frio: add account type to the profile vcard 2019-02-05 00:18:07 +01:00
rabuzarus
ac22c0593d attachment preview: scroll the content not the mocal (adds scroll bars to the modal conent if it is to large) 2019-02-04 00:44:38 +01:00
8c9ef56a71 Normalize field_*.tpl formatting 2019-02-03 15:33:59 -05:00
ba7ffab3c2 Add nofilter to field_input attribute parameter 2019-02-03 15:32:52 -05:00
rabuzarus
ba03ec857a attachment preview: some small corrections 2019-02-03 16:26:13 +01:00
rabuzarus
3a15c22028 attachment preview: frio- initialize linkPreview on jot modal open (so we can use the linkPreview for new posts and edit post modal) 2019-02-02 03:12:36 +01:00
rabuzarus
132e0b83c4 attachment preview: mv some js functions from frio to the linkPreview to make linkPreview available for other themes 2019-02-01 23:48:14 +01:00
rabuzarus
07d1932efc attachment preview: frontend work (works with frio) 2019-02-01 19:18:08 +01:00
bd03278ee9 Put cursor at end of default mentions in comment box 2019-01-29 09:25:22 -05:00
8d84f33f15
Merge pull request #6541 from annando/mentions
Display mentioned users and in the comment box by default
2019-01-29 07:56:30 -05:00
0c12d8af5f Rename conflicted variable $info in admin settings 2019-01-28 21:45:43 -05:00
d40b2792b6 Display mentioned users and in the comment box by default 2019-01-28 21:22:03 +00:00
c9a6063a2a
Merge pull request #6531 from Ixiter/develop-theme-frio
frio - fix PHP Notices reported in #6338
2019-01-27 08:01:08 -05:00
Peter Liebetrau
eee0e22856 frio - fix PHP Notices reported in #6338 2019-01-27 13:21:18 +01:00
c11145d311
Merge pull request #6528 from MrPetovan/bug/html-bull-bullet
Switch to supported HTML entity for bullet in delivery indicator
2019-01-27 07:28:24 +01:00
Peter Liebetrau
cd19cce92e frio - fix bug in admin users with table sorting #6529 2019-01-27 04:06:51 +01:00
043521fb47 Switch to supported HTML entity for bullet in delivery indicator 2019-01-26 19:42:13 -05:00
Peter Liebetrau
189e179088 frio - fixed bug in user menu for visitors - see after-merge discussion in #6526 2019-01-26 23:02:23 +01:00
Peter Liebetrau
7918e41097 frio - fixed bug in user menu for remote user - see issue #6495 2019-01-26 20:15:56 +01:00
Jeroen De Meerleer
6fb2383116 Added nofilter to geotag
Fixes issue GH-6511
2019-01-24 17:23:25 +01:00
Michael Vogel
48e0b943a3
Merge pull request #6336 from MrPetovan/bug/6334-get-app-namespace
Move mod/register to Module\Register
2019-01-23 07:40:58 +01:00
e2d32caa78 Update delivery count display
- Hide display when item is preceding the feature
- Wrap the display in its own span
- Remove delivery bullet from wall_thread.tpl
- [frio] Make delivery icon fainter
2019-01-23 00:05:53 -05:00
7ff1b19cc0 Restore display of delivery status 2019-01-22 23:39:06 -05:00
0ccb6afdb5 Add Register module in src/
- Update REGISTER_* constants definition
- Update register template variable name
2019-01-22 22:22:04 -05:00
c90314cd6a Replace deprecated Addon::*registerHook by Hook::*register
- Updated documentation
2019-01-21 09:50:57 -05:00
6538a8eaca Add delivery queue display in frio and vier
- Add new $item.owner_self and $item.delivery keys for display
- Add new sub/delivery_count.tpl template
2019-01-21 09:39:13 -05:00
fabrixxm
fdc6608af8 Add storage options form in admin/site page 2019-01-21 09:11:39 -05:00
Michael Vogel
ad7b85e0ec
Merge pull request #6475 from tobiasd/20190120-unescapealbums
HTML unescape existing albums
2019-01-20 18:58:46 +01:00
6e258fc760 HTML unescape existing albums
When uploading a new photo the selection list for chosing existing albums was not shown. With this PR it is now again.xj

Part of #6208
2019-01-20 18:47:20 +01:00
765784aad3 [frio] Remove unused code in frio_init() 2019-01-19 21:54:10 -05:00
c4038e7af1
Merge pull request #6432 from annando/deleted-pending
Don't show deleted contacts, changed "pending" behaviour
2019-01-12 09:08:31 -05:00
28f14c7d60 Don't show deleted contacts, changed "pending" behaviour 2019-01-12 13:28:14 +00:00
abf20368b0 Rework Profile::getThemeUid to ignore query parameter and include $a->profile_uid
- Use new version in frio default.php file
- Use new version in Theme::getStylesheetPath
2019-01-12 02:23:01 -05:00
1bdb3c916a Make style.php require query parameter puid for specific stylesheets 2019-01-12 02:21:12 -05:00
e447375cdd
Merge branch '2019.01-rc' into bug/6334-escape-get-app 2019-01-06 16:38:48 -05:00
4bf2701912
Merge pull request #6400 from annando/issue-6394
Issue 6394: The contact location has to be BBEncoded
2019-01-06 16:37:43 -05:00
7e19506435 Issue 6394: The contact location has to be BBEncoded 2019-01-06 21:04:10 +00:00
Michael Vogel
3f85ee3ef8
Merge pull request #6373 from MrPetovan/bug/6345-vier-fix-messages-notifs
[vier] Fix private messages notification display
2019-01-06 20:42:55 +01:00
Michael Vogel
320ce0eb43
Merge pull request #6393 from MrPetovan/bug/6268-frio-fix-justifyGallery-scales
[frio] Fix justifyGalley scales list
2019-01-06 20:39:54 +01:00
9b8f91f8fe [frio] Fix justifyGalley scales list 2019-01-06 05:33:40 -05:00
f2b784e654 Strip base url from links before determining anchor status for iOS linker 2019-01-04 20:36:36 -05:00
cc23ec19cd [frio] Fix user menu messages notification badge display 2019-01-03 23:18:27 -05:00
935b86749d Unescape invite_desc template variable 2019-01-03 21:29:30 -05:00
5e1ceb57de Escape global namespaced get_app() calls
- Add deprecated status
2019-01-03 21:27:36 -05:00
2f15f1c477 Unescape profiles template variables 2019-01-01 11:45:36 -05:00
0dc06d66a0 Unescape $invite_desc in follow/register templates 2019-01-01 02:50:37 -05:00
e7ee3d7200
Merge pull request #6345 from MrPetovan/bug/6283-clear-message-notifications
Clear private message notifications
2018-12-31 08:21:55 +01:00
e0a763b07f Unescape admin warning text 2018-12-30 10:12:13 -05:00
d838e6d0ec Fix unread message conversation title display 2018-12-30 01:04:52 -05:00
838c0f96de Use minimal mode to change site theme settings
- Use textarea in colorbox instead of inline HTML
- Add mode propagation to site theme setting form
- Set theme for site theme settings form to load JS dependencies
2018-12-29 15:40:05 -05:00
fdcdbe287e [frio] Fix minimal layout 2018-12-29 15:40:04 -05:00
435cfd7de5 Fix screenshots URLs in frio readme 2018-12-29 15:39:50 -05:00
Michael Vogel
94eca77041
Merge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile
Rework mod/match and mod/msearch
2018-12-27 18:04:06 +01:00
620395378e Normalize uses of Strings::formatNetworkName to $network_link
- Unescape HTML template variable $network_link
2018-12-26 11:11:38 -05:00
a3928ec3b6 Restore escaping for textarea field template 2018-12-25 11:37:56 -05:00
e2a0cee8c2 [frio] Fix remaining user profile link icon 2018-12-25 11:37:56 -05:00
787428f68c Remove template escaping for event title 2018-12-24 23:00:35 -05:00
acaee626f5 Remove include/ requires that are now done directly from Composer 2018-12-24 09:56:25 -05:00
b1e85ba605 Fix template escaping in photo gallery view 2018-12-23 10:51:18 -05:00
f19f67add5 Issue 6308 - and again ... 2018-12-22 20:25:23 +00:00
92214b8867
Merge pull request #6302 from annando/issue-6300
Isse 6300: And again templates ...
2018-12-21 19:04:45 -05:00
6d4412ffea
Merge pull request #6298 from annando/issue-6297
Issue 6297 - and again template stuff
2018-12-21 19:01:17 -05:00
3f4cead189 Isse 6300: And again templates ... 2018-12-21 23:02:43 +00:00
4a633527d2 And some more templates 2018-12-21 21:50:18 +00:00
768ad3cfd9 Issue 6297 - and again template stuff 2018-12-21 21:44:54 +00:00
Michael Vogel
1cab44827f
Merge pull request #6280 from MrPetovan/bug/4738-fix-message-list-query
Fix message list query
2018-12-21 22:17:20 +01:00
7c845dafc5 Issue 6294: Fix templates 2018-12-21 21:09:34 +00:00
fd7c47ed55 Fixes issue 6289 2018-12-21 13:43:06 +00:00
f31ca8a818 Some more stuff to unescape 2018-12-21 05:26:29 +00:00
2776b1443b Fix post location escaping 2018-12-21 00:06:37 -05:00
6b481aaac6 Fix advanced profile fields escaping 2018-12-21 00:06:22 -05:00