clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
25,139 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

5693 Commits

Author SHA1 Message Date
Philipp Holzer d7dd9f8bee
Word-wrap for long lines 2019-03-02 16:02:27 +01:00
Tobias Diekershoff 7a73b63fc8 update FR translations THX hypolite 2019-02-25 07:49:33 +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
Michael Vogel df5ea1fab0
Merge pull request #6732 from MrPetovan/bug/1777-fix-blocked-contact-group 
Allow to remove blocked contact from groups
 2019-02-24 14:30:36 +01:00
Hypolite Petovan cd363291c6 Update base translation strings 2019-02-23 19:40:05 -05: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
Hypolite Petovan cd53585101 Improve /itemsource display 
- Add Item Id
- Add Item Terms
 2019-02-23 17:32:10 -05:00
Michael 7e93355671 Fix: Following url with html entities now works again 2019-02-23 21:20:56 +00:00
Tobias Diekershoff 43ce3cb511 CS translation update THX Aditoo 2019-02-21 06:52:36 +01:00
Tobias Diekershoff 5b18bcc12b update FR translations THX hypolite 2019-02-20 14:45:16 +01:00
Tobias Diekershoff 6fc581b03d DE translation update THX Ulf Rompe 2019-02-19 06:47:52 +01: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
Hypolite Petovan 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
Hypolite Petovan 3cabddcdec [frio] Hide fake comment form when comment form isn't present 2019-02-16 18:40:05 -05:00
Hypolite Petovan ad30e4824c [frio] Add margin between comment submit buttons and preview 2019-02-16 17:58:00 -05:00
Tobias Diekershoff edffb7e24b update FR translations THX hypolite 2019-02-16 09:43:27 +01:00
Tobias Diekershoff 54f3b2300b EN US translation update THX hypolite 2019-02-16 09:42:38 +01:00
Tobias Diekershoff 3a2af5bcd0 DE translation update THX Ulf Rompe 2019-02-16 09:39:31 +01:00
Hypolite Petovan 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
Hypolite Petovan dc9522bd98 Update translation strings 2019-02-15 09:36:25 -05:00
Hypolite Petovan 25ba78d0d8 [frio] Prevent unwanted textaera resizing in comment forms 2019-02-15 09:15:39 -05:00
Hypolite Petovan 3e1e5fc986 [frio] Use text-align instead of flex display for submit buttons 2019-02-14 22:49:13 -05:00
Hypolite Petovan 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
Hypolite Petovan ae3bf47019 Improve global open/close functions in main.js 2019-02-14 22:26:18 -05:00
Hypolite Petovan 281d6fe055 Remove superfluous call to focus() in global commentExpand() function 2019-02-14 22:25:42 -05:00
Hypolite Petovan 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
Hypolite Petovan 642f9409a7 Switch tag of expanded like list to paragraph 2019-02-14 22:17:08 -05:00
Hypolite Petovan c8a7c95279 Unescape $ispublic variable for jot display 2019-02-14 22:11:00 -05:00
Tobias Diekershoff f957ab1869 PL translation update THX waldis 2019-02-14 06:07:29 +01:00
Tobias Diekershoff 71a5568385
Merge pull request #6653 from rabuzarus/20190214_-_frio_manage_css 
frio - some small styling fixes for the manage page (badges, center name, paddings)
 2019-02-14 05:41:23 +01:00
rabuzarus ecc393e1c3 frio - some small styling fixes for the manage page (badges, center name, paddings) 2019-02-14 03:06:57 +01:00
rabuzarus b7573a94ee linkPreview - workaround for mising 's' flag ins js regex 2019-02-13 22:26:56 +01:00
rabuzarus f6691c138a bugfix: linkPreview - remove s flag from regexp because FF don't support it 2019-02-13 15:14:56 +01:00
Tobias Diekershoff df688aba0c forgotten quattro file 2019-02-12 17:27:46 +01:00
Tobias Diekershoff 207fc9c00b JS files of smoothy theme 2019-02-12 17:27:14 +01:00
Tobias Diekershoff 0ada36ecd6 JS files of quattro 2019-02-12 17:26:13 +01:00
Tobias Diekershoff 183560dd62 JS files of quattro theme 2019-02-12 17:25:16 +01:00
Tobias Diekershoff 29fcb2e7ee typo 2019-02-12 13:59:33 +01:00
Tobias Diekershoff d2243a1c35 tagged the inline JS in head.tpl with the license 2019-02-12 11:30:45 +01:00
Tobias Diekershoff 173a17d0e0 tagged the JS files in view/js with their licenses 2019-02-12 11:29:50 +01:00
Hypolite Petovan db607de8cf
Merge pull request #6634 from tobiasd/20190210-crepairwarning 
style the warning in crepair
 2019-02-10 21:17:41 -05:00
Tobias Diekershoff 6b5993591b style the warning in crepair 2019-02-10 20:05:29 +01:00
Tobias Diekershoff a90bc4e941 DE translation update 2019-02-10 19:17:07 +01:00
Michael Vogel 14045932df
Merge pull request #6624 from tobiasd/20190210-lng 
CS and DE translation update
 2019-02-10 12:58:21 +01:00
Tobias Diekershoff 01b0a5b331 DE translation update 2019-02-10 08:33:31 +01:00
Tobias Diekershoff 0599f168e8 CS translation update THX Aditoo 2019-02-10 08:23:13 +01:00
Tobias Diekershoff e6de848622 regen messages.po 2019-02-10 08:15:23 +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
Hypolite Petovan 0637a70b3d Update base translation file 2019-02-08 23:35:23 -05:00
Hypolite Petovan 7c58944449 Add "delivery done" label 2019-02-08 23:19:26 -05:00
Hypolite Petovan 6577b1abb0 Add alias field to mod/crepair 
- Replace deprecated q() call by DBA::update
 2019-02-08 22:38:23 -05:00
Hypolite Petovan 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
Hypolite Petovan 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
Tobias Diekershoff 2357a7b0f5 CS translation update THX Aditoo 2019-02-04 07:18:24 +01:00
rabuzarus b0372e5e93 attachment preview: fix a bug if inserted text did contain a new line between content and url 2019-02-04 01:23:30 +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
Michael Vogel 5e2cbce9b6
Merge pull request #6580 from MrPetovan/bug/6575-escaped-field-input-attributes 
Add nofilter to field_input attribute parameter
 2019-02-03 22:52:30 +01:00
Hypolite Petovan 8c9ef56a71 Normalize field_*.tpl formatting 2019-02-03 15:33:59 -05:00
Hypolite Petovan 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 dcf072e77d attachment preview: handle content with attachment bbcode inside (show preview of this attachment) 2019-02-02 23:06:11 +01:00
Tobias Diekershoff 55de1c66f3 PL translation update THX waldis 2019-02-02 08:25:24 +01:00
Tobias Diekershoff 33304d4b0b DE translation update 2019-02-02 08:24:44 +01:00
Tobias Diekershoff 9342e97bac CS translation update THX Aditoo 2019-02-02 08:24:10 +01:00
Tobias Diekershoff 92b1400506 update to the zh-cn translation THX ZhuChentan 2019-02-02 08:23:23 +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 b065356c28 attachment preview: add destroy method to linkPreview.js 2019-02-02 02:27:41 +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 a6322b1c4e attachment preview: some backend work in the item module: 
- convert attachment to bbcode and
- add the attachment bbcode to the item body
 2019-02-01 23:42:36 +01:00
rabuzarus 07d1932efc attachment preview: frontend work (works with frio) 2019-02-01 19:18:08 +01:00
Michael f226464acc Don't auto mention yourself or forums, don't do it in the firstlevel post 2019-01-30 03:36:24 +00:00
Tobias Diekershoff a0c9a28f4b DE translation update THX copis 2019-01-29 16:29:30 +01:00
Tobias Diekershoff 270cdaf648 PL translation update THX waldis 2019-01-29 16:29:15 +01:00
Tobias Diekershoff 9187799f14 CS translation update THX Aditoo 2019-01-29 16:29:07 +01:00
Hypolite Petovan bd03278ee9 Put cursor at end of default mentions in comment box 2019-01-29 09:25:22 -05:00
Hypolite Petovan 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
Hypolite Petovan 0c12d8af5f Rename conflicted variable $info in admin settings 2019-01-28 21:45:43 -05:00
Michael d40b2792b6 Display mentioned users and in the comment box by default 2019-01-28 21:22:03 +00:00
Hypolite Petovan 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
Tobias Diekershoff 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
Hypolite Petovan 6319d9671c
Merge pull request #6530 from Ixiter/develop-theme-frio 
frio - fixed bug in admin users with table sorting #6529
 2019-01-26 22:55:21 -05:00
Peter Liebetrau cd19cce92e frio - fix bug in admin users with table sorting #6529 2019-01-27 04:06:51 +01:00
Hypolite Petovan 043521fb47 Switch to supported HTML entity for bullet in delivery indicator 2019-01-26 19:42:13 -05:00
Hypolite Petovan 0a284edde7
Merge pull request #6527 from Ixiter/develop-theme-frio 
frio - fixed bug in user menu for visitors
 2019-01-26 19:40:49 -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
Hypolite Petovan 16b8d29d3e
Merge pull request #6526 from Ixiter/develop-theme-frio 
frio - fixed bug in user menu for remote user - see issue #6495
 2019-01-26 15:03:20 -05:00
Peter Liebetrau 7918e41097 frio - fixed bug in user menu for remote user - see issue #6495 2019-01-26 20:15:56 +01:00
Tobias Diekershoff 8b8187ee9c added nofilter to banner in smoothy and quaddro 2019-01-25 19:37:37 +01:00
Jeroen De Meerleer 6fb2383116 Added nofilter to geotag 
Fixes issue GH-6511
 2019-01-24 17:23:25 +01:00
Tobias Diekershoff 1073b2190e update for ES thx Abraham Pérez Hernández 2019-01-23 09:51:34 +01:00
Tobias Diekershoff 23f94fadf3 CS translation update THX Aditoo 2019-01-23 09:50:28 +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
Hypolite Petovan 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
Hypolite Petovan 7ff1b19cc0 Restore display of delivery status 2019-01-22 23:39:06 -05:00
Hypolite Petovan cef6757c92 Replace REGISTER_* constants by Module\Register::* ones 2019-01-22 22:24:15 -05:00
Hypolite Petovan 0ccb6afdb5 Add Register module in src/ 
- Update REGISTER_* constants definition
- Update register template variable name
 2019-01-22 22:22:04 -05:00
Tobias Diekershoff 66284a17a7 unescaping the HTML in the hint 2019-01-22 14:02:56 +01:00
Hypolite Petovan 5c30f1b177 Update translation strings 2019-01-21 10:24:43 -05:00
Hypolite Petovan c90314cd6a Replace deprecated Addon::*registerHook by Hook::*register 
- Updated documentation
 2019-01-21 09:50:57 -05:00
Hypolite Petovan 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
Tobias Diekershoff 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
Hypolite Petovan 765784aad3 [frio] Remove unused code in frio_init() 2019-01-19 21:54:10 -05:00
Michael 2a0e18c7dd Bugfix: Theme functions hadn't been executed anymore 2019-01-18 20:08:35 +00:00
Andy 98b362f581 Update translation en-gb 2019-01-13 00:38:54 +07:00
Hypolite Petovan 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
Michael 28f14c7d60 Don't show deleted contacts, changed "pending" behaviour 2019-01-12 13:28:14 +00:00
Hypolite Petovan 33e096434a
Merge pull request #6430 from tobiasd/20190112-lng 
Translation Updates
 2019-01-12 04:59:28 -05:00
Tobias Diekershoff 80fcc25897 NB-NO translation update THX friendOFica 2019-01-12 10:53:13 +01:00
Tobias Diekershoff e95b2b6494 PL translation update THX waldis 2019-01-12 10:52:10 +01:00
Tobias Diekershoff dfc2e4f505 NL translation update THX Jeroen 2019-01-12 10:52:02 +01:00
Tobias Diekershoff e21ed2284c CS translation update THX Aditoo 2019-01-12 10:51:46 +01:00
Tobias Diekershoff 3a0effa265 DE translation update 2019-01-12 10:51:41 +01:00
Tobias Diekershoff 2f48eefc24 update to the en gb and us translations THX Andy H3 2019-01-12 10:51:36 +01:00
Tobias Diekershoff 2fd65f18f3 update FR translations THX lapoubelle111 2019-01-12 10:51:29 +01:00
Hypolite Petovan 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
Hypolite Petovan 1bdb3c916a Make style.php require query parameter puid for specific stylesheets 2019-01-12 02:21:12 -05:00
Tobias Diekershoff 6bc865ff4d
Merge pull request #6356 from MrPetovan/task/6355-add-password-rules 
Add password rules
 2019-01-10 10:37:32 +01:00
Hypolite Petovan 3b80f335fa
Merge pull request #6412 from annando/issue-6149 
Issue 6149: Making OWA (hopefully) compatible with Hubzilla
 2019-01-08 09:17:05 -05:00
Michael 8c6df8f156 Issue 6149: Making OWA (hopefully) compatible with Hubzilla 2019-01-08 11:17:05 +00:00
Hypolite Petovan 95834216f5 Update master messages.po translation file 2019-01-06 17:23:24 -05:00
Hypolite Petovan e447375cdd
Merge branch '2019.01-rc' into bug/6334-escape-get-app 2019-01-06 16:38:48 -05:00
Hypolite Petovan 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
Michael 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
Hypolite Petovan 9b8f91f8fe [frio] Fix justifyGalley scales list 2019-01-06 05:33:40 -05:00
Hypolite Petovan f2b784e654 Strip base url from links before determining anchor status for iOS linker 2019-01-04 20:36:36 -05:00
Hypolite Petovan cc23ec19cd [frio] Fix user menu messages notification badge display 2019-01-03 23:18:27 -05:00
Hypolite Petovan 73882ff58f [vier] Add message icon link in header nav 2019-01-03 23:07:03 -05:00
Hypolite Petovan b3f8a24819 Unescape infinite scroll URL 2019-01-03 21:30:10 -05:00
Hypolite Petovan 935b86749d Unescape invite_desc template variable 2019-01-03 21:29:30 -05:00
Hypolite Petovan 5e1ceb57de Escape global namespaced get_app() calls 
- Add deprecated status
 2019-01-03 21:27:36 -05:00
Michael Vogel 0eef382e82
Merge pull request #6365 from MrPetovan/bug/6363-unescape-prev-next-link 
Unescape $prevlink and $nextlink template variables
 2019-01-03 04:54:12 +01:00
Hypolite Petovan ff50f2bb65 Unescape $prevlink and $nextlink template variables 2019-01-02 19:06:23 -05:00
Hypolite Petovan 2f15f1c477 Unescape profiles template variables 2019-01-01 11:45:36 -05:00
Hypolite Petovan 0dc06d66a0 Unescape $invite_desc in follow/register templates 2019-01-01 02:50:37 -05:00
Tobias Diekershoff e7ee3d7200
Merge pull request #6345 from MrPetovan/bug/6283-clear-message-notifications 
Clear private message notifications
 2018-12-31 08:21:55 +01:00
Michael Vogel dc05ada059
Merge pull request #6351 from MrPetovan/bug/6350-unescape-admin-warning-text 
Unescape admin warning text
 2018-12-30 16:41:05 +01:00
Hypolite Petovan 5db5cc904a Unescape plaintext email body 2018-12-30 10:20:38 -05:00
Hypolite Petovan e0a763b07f Unescape admin warning text 2018-12-30 10:12:13 -05:00
Tobias Diekershoff 034d0f650b
Merge pull request #6340 from MrPetovan/bug/1495-fix-admin-theme-settings 
Fix site theme settings modal form
 2018-12-30 10:35:44 +01:00
Hypolite Petovan d838e6d0ec Fix unread message conversation title display 2018-12-30 01:04:52 -05:00
Hypolite Petovan 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
Hypolite Petovan 62f5438bb3 Remove useless trailing slash in admin/addon_details.tpl 2018-12-29 15:40:05 -05:00
Hypolite Petovan fdcdbe287e [frio] Fix minimal layout 2018-12-29 15:40:04 -05:00
Hypolite Petovan 435cfd7de5 Fix screenshots URLs in frio readme 2018-12-29 15:39:50 -05:00
Tobias Diekershoff 7efde8e334
Merge pull request #6209 from MrPetovan/task/move-config-to-php-array 
Remove util/ folder
 2018-12-29 11:43:55 +01: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
Hypolite Petovan fabc90e9dd
Merge branch '2018.12-rc' into task/move-config-to-php-array 2018-12-27 01:47:53 -05:00
Hypolite Petovan 620395378e Normalize uses of Strings::formatNetworkName to $network_link 
- Unescape HTML template variable $network_link
 2018-12-26 11:11:38 -05:00
Hypolite Petovan 52ca6f34cd Unescape babel result panel content 2018-12-25 11:37:57 -05:00
Hypolite Petovan a3928ec3b6 Restore escaping for textarea field template 2018-12-25 11:37:56 -05:00
Hypolite Petovan b56aec9a29 Add page wrapper to wallmessage.tpl 2018-12-25 11:37:56 -05:00
Hypolite Petovan e2a0cee8c2 [frio] Fix remaining user profile link icon 2018-12-25 11:37:56 -05:00
Tobias Diekershoff 6488738790
Merge pull request #6321 from MrPetovan/bug/6316-escape-event-output 
Escape event output
 2018-12-25 08:33:43 +01:00
Hypolite Petovan c5a3cdcf82 Unescape aes_allow in dfrn_req_confirm.tpl 2018-12-24 23:14:30 -05:00
Hypolite Petovan 4285f2f8bb Remove unused template variable in dfrn_req_confirm 
- Replace killme() by exit() in mod/dfrn_request
 2018-12-24 23:14:09 -05:00
Hypolite Petovan 787428f68c Remove template escaping for event title 2018-12-24 23:00:35 -05:00
Hypolite Petovan acaee626f5 Remove include/ requires that are now done directly from Composer 2018-12-24 09:56:25 -05:00
Hypolite Petovan b1e85ba605 Fix template escaping in photo gallery view 2018-12-23 10:51:18 -05:00
Hypolite Petovan 3fc5c1ad84 Fix escaping in email notification template 2018-12-23 10:51:00 -05:00
Michael f19f67add5 Issue 6308 - and again ... 2018-12-22 20:25:23 +00:00
Hypolite Petovan 92214b8867
Merge pull request #6302 from annando/issue-6300 
Isse 6300: And again templates ...
 2018-12-21 19:04:45 -05:00
Hypolite Petovan 97d278109d
Merge pull request #6299 from annando/issue-6296 
Issue 6296 - and again templates
 2018-12-21 19:02:06 -05:00
Hypolite Petovan 6d4412ffea
Merge pull request #6298 from annando/issue-6297 
Issue 6297 - and again template stuff
 2018-12-21 19:01:17 -05:00
Michael 3f4cead189 Isse 6300: And again templates ... 2018-12-21 23:02:43 +00:00
Michael 68f3ae5020 Issue 6296 - and again templates 2018-12-21 22:01:28 +00:00
Michael 4a633527d2 And some more templates 2018-12-21 21:50:18 +00:00
Michael 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
Michael 7c845dafc5 Issue 6294: Fix templates 2018-12-21 21:09:34 +00:00
Michael 80ea1ea51f This template change had been missing 2018-12-21 13:48:48 +00:00
Michael fd7c47ed55 Fixes issue 6289 2018-12-21 13:43:06 +00:00
Michael bd356a4149 Unescape tags 2018-12-21 06:15:22 +00:00
Michael f31ca8a818 Some more stuff to unescape 2018-12-21 05:26:29 +00:00
Hypolite Petovan 2776b1443b Fix post location escaping 2018-12-21 00:06:37 -05:00
Hypolite Petovan 6b481aaac6 Fix advanced profile fields escaping 2018-12-21 00:06:22 -05:00
Hypolite Petovan c8b6778cde Fix home escaping 2018-12-21 00:05:55 -05:00
Hypolite Petovan 989bfb53b1 Fix install escaping 2018-12-21 00:05:31 -05:00
Hypolite Petovan 1c58363696 Remove unused/empty template variables in register 2018-12-20 23:59:15 -05:00
Michael c7a636fe18 Fixing templates - unescaping it again 2018-12-20 21:57:53 +00:00
Hypolite Petovan c7abb1d82b Remove unused template variable $tabcontent in mail_head.tpl 2018-12-19 06:39:36 -05:00
Hypolite Petovan a01bdbbe2d Fix wrong merge + nofilter in contact_edit 2018-12-18 08:39:26 -05:00
Hypolite Petovan 21a055f670
Merge branch '2018.12-rc' into task/6208-escape-html-true 2018-12-18 08:36:36 -05:00
Hypolite Petovan 091193ad64
Merge pull request #6278 from annando/fix-contact-edit 
Fix: Contacts can now be edited again
 2018-12-18 08:02:49 -05:00
Michael 99e69e30a3 Fix: Contacts can now be edited again 2018-12-18 06:52:09 +00:00
Jonny Tischbein dc7e6edca9 Add page-wrapper to oauth/edit in frio 2018-12-17 23:09:08 +01:00
Jonny Tischbein 443210b4f0 move templates to frio theme 2018-12-17 23:09:08 +01:00
Jonny Tischbein 58067cdfbf Add generic content wrapper + frio btn primary buttons class to newmemeber, unfollow, follow (auto + dfrn) 2018-12-17 23:09:08 +01:00
Hypolite Petovan fe3470d7c1 Remove erroring template comment 2018-12-16 22:38:33 -05:00
Hypolite Petovan e1b3bcc77d Unescape yet more values with a focus on the vier theme 2018-12-16 22:38:32 -05:00
Hypolite Petovan d0fa7f74c5 Unescape value of generic input field 2018-12-16 22:38:32 -05:00
Hypolite Petovan 698d12af79 Unescape variables in events and descriptions 2018-12-16 22:38:32 -05:00
Hypolite Petovan c407fb7963 Avoid escaping relevant template variables 2018-12-16 22:38:32 -05:00
Hypolite Petovan 38109665c7 Various improvements/fixes 
- Fix potential missing variable
- Improve replaceMacros doc
- Fix CSS value in smoothly
 2018-12-16 22:38:30 -05:00
Hypolite Petovan 2241ba4540 Remove uses of HTML escaping in Smarty templates 2018-12-16 22:38:30 -05:00
Michael b53a6c5154 The "about" field shouldn't be escaped 2018-12-11 19:24:24 +00:00
Michael 6682114069 Fix: The event name mustn't be escaped, since it can contain converted BBCode 2018-12-02 22:35:39 +00:00
Hypolite Petovan 924869ab5b
Merge branch 'develop' into bug/6211-fix-contact-nets-all 2018-12-02 10:24:50 -05:00
Hypolite Petovan 458981f75c Replace x() by isset(), !empty() or defaults() 
- Remove extraneous parentheses around empty() calls
- Remove duplicate calls to intval(), count() or strlen() after empty()
- Replace ternary operators outputting binary value with empty() return value
- Rewrite defaults() without x()
 2018-11-30 09:06:22 -05:00
Hypolite Petovan 663ba65f17 Remove "all" value for nets parameter 2018-11-30 05:43:07 -05:00
Hypolite Petovan 9102a37b37 Move master translation file away from util 
- Rewrite translation documentation
- Delete unused util/strings.php
- Updated references to util/messages.po and util/strings.php
 2018-11-28 22:57:55 -05:00
Michael Vogel ea4e772b1e
Merge pull request #6199 from MrPetovan/task/move-config-to-php-array 
Move config to PHP array
 2018-11-26 23:57:56 +01:00
Hypolite Petovan 5a929c587f
Merge pull request #6204 from annando/escaping 
We are now escaping many template fields
 2018-11-26 16:31:13 -05:00
Hypolite Petovan 0c21bd488f Use constants instead of strings for register_policy 2018-11-26 07:40:44 -05:00
Tobias Diekershoff ce099b6cd3 Add missing closing tags 
The summery template for the admin panel was missing a closing link tag
for the deferred worker queue. This tag has been added for the general
template and the template used by the frio theme.
 2018-11-26 11:58:58 +01:00
Michael 069c92049a Just some misspelling 2018-11-25 23:49:40 +00:00
Michael 73528fa279 Some correction 2018-11-25 20:40:30 +00:00
Michael 6075245b84 Much more escapes 2018-11-25 20:34:02 +00:00
Michael 7381540039 Escaping the address field 2018-11-25 20:04:01 +00:00
Michael 56f21a4b89 Some more escaping 2018-11-25 19:26:46 +00:00
Michael 4f9f86e310 We are now escaping many template fields 2018-11-25 18:56:26 +00:00
Jonny Tischbein 5e577ed133 Change html b to strong 2018-11-25 09:03:01 +01:00
Jonny Tischbein 3af59eaba4 Move all warning text in L10n + frio: make warning closable 2018-11-25 08:32:05 +01:00
Hypolite Petovan 833c57cc35 Remove obsolete INI config files 2018-11-25 01:56:28 -05:00
Hypolite Petovan 98d90e131d Update install to generate config/local.config.php 2018-11-25 01:44:09 -05:00
Jonny Tischbein 38838173b1 Readd relocate warning for non-frio themes 2018-11-24 23:00:33 +01:00
Jonny Tischbein 66a18702c0 Frio: Move relocation warning from headline to bootstrap danger box 2018-11-24 22:50:42 +01:00
Jonny Tischbein 36aca259d5 Change saving active panel from js localStorage to via html #anker 2018-11-24 00:44:11 +01:00
Jonny Tischbein 62f09fdd57 Only store last opened panel for one reload (the POST reload after a submit) 2018-11-21 19:23:06 +01:00
Jonny Tischbein 278d42dbc9 Save last collapsed panel + restore to open and scroll to top of panel 2018-11-21 19:15:59 +01:00
Jonny Tischbein 860b7bad73 Frio: Add collapsable panel-groups for admin/site 2018-11-21 17:27:10 +01:00
Michael 191c1a400a The expiry of conversations can now be configured in the admin panel 2018-11-19 06:58:46 +00:00
Hypolite Petovan f5d58d07e1
Merge pull request #6154 from JonnyTischbein/issue_open_commentbox_post_with_replies 
[frio] Fix opening comment box when Post has replies
 2018-11-17 10:01:05 -05:00
Jonny Tischbein dd7d556c86 Fix opening comment box when Post has replies 2018-11-17 15:53:34 +01:00
Alexandre Alapetite 4d092872a5 Escaping moved to template 
https://github.com/friendica/friendica/pull/6147#pullrequestreview-176051481
 2018-11-17 14:01:07 +01:00
Tobias Diekershoff 31d9be8337 CS, FR, PL translation updates 2018-11-16 20:08:31 +01:00
Adam Magness 218f0734be Rename removeTags to escapeTags 
rename function and update calls.
 2018-11-09 13:29:42 -05:00
Adam Magness ffc406d819 normalise_link calls 
implement normaliseLink function
 2018-11-08 11:28:29 -05:00
Adam Magness 0efcbe5d15 protect_sprintf calls 
implement protectSprintf function
 2018-11-08 10:30:45 -05:00
Adam Magness a0f65ca7a1 notags calls 
implement removeTags function
 2018-11-08 10:14:37 -05:00
Michael 077a96fb28 Using CSS for custom emojis 2018-11-08 07:42:19 +00:00
Jonny Tischbein 93d50af700 move live update: update_contacts to update_contact 2018-11-06 22:22:42 +01:00
Tobias Diekershoff 6dbe307a27 PL translation update THX waldis 2018-11-01 07:59:05 +01:00
Tobias Diekershoff 1ad5f2dc46 CS translation update THX Aditoo 2018-11-01 07:58:53 +01:00
Tobias Diekershoff a4cd01a13a DE translation THX vinz 2018-11-01 07:58:43 +01:00
Jonny Tischbein b73be5749b Add support for quattro 2018-10-31 20:17:11 +01:00
Jonny Tischbein 6b43174a74 Fix for vier theme / NonAjax Call 2018-10-31 20:09:44 +01:00
Jonny Tischbein b66bcb20da Redirect to previous page after NON-AJAX Post delete via second parameter in /item/drop 2018-10-31 20:09:44 +01:00
Adam Magness 70f01d6c00 Template Engine and props to Renderer 
move methods and props from App to Renderer
 2018-10-31 13:25:38 -04:00
Adam Magness 35abc4bb64 get markup template 
implement getMarkupTemplate function
 2018-10-31 10:44:06 -04:00
Adam Magness 91facd2d0a replace macros 
implement new replaceMacros function
 2018-10-31 10:35:50 -04:00
Hypolite Petovan f8ef92f84a
Merge pull request #6052 from rabuzarus/20181030_-_frio_fix_link_highlight 
Frio - on mobiles the links in the thread will always have the link color (disabling thread hover effect)
 2018-10-31 09:04:17 -04:00
rabuzarus d02f940811 Frio - some cleanups for default.php 2018-10-31 10:22:32 +01:00
rabuzarus bfe59b4054 Frio - on mobiles the links in thread will always have the link color (disabling thread hover effect) 2018-10-31 10:14:02 +01:00
rabuzarus ec9f22de92 Frio - add desktop or mobile view class to the html body 2018-10-31 10:07:51 +01:00
Tobias Diekershoff 423b831f84 DE translation THX vinz 2018-10-31 09:36:49 +01:00
Adam Magness 50da89d861 Logger Levels 
update logger levels in calls
 2018-10-30 09:58:45 -04:00
Adam Magness 14fde5dc9b Log function 
implement log() function.
 2018-10-30 09:57:14 -04:00
Hypolite Petovan f7147fae96
Merge pull request #6041 from nupplaphil/install_to_module 
Install to Module
 2018-10-30 08:17:26 -04:00
Jonny Tischbein f4d2f78233 Enables error messages for files too 2018-10-29 23:28:20 +01:00
Jonny Tischbein 780d1edf04 Show error message if image exceeds limit + fix close button 2018-10-29 23:06:42 +01:00
Philipp Holzer f0382ab919
Refactoring Installation 
- centralized installation
- renamed Core\Install to Core\Installer
- avoid using $a->data[] for states
- removed unnecessary code
 2018-10-29 18:44:39 +01:00
Hypolite Petovan 7ee8bdafc5
Merge pull request #5966 from JeroenED/theme/frio/oembed/view-active-class 
fixed view of active embedded videos
 2018-10-26 19:25:30 -04:00
Tobias Diekershoff 96d1664187 CS translation update THX Aditoo 2018-10-26 07:37:31 +02:00
Jonny Tischbein e022bac339 Code Standard + renaming deleteAllTags + move its call and add type param 2018-10-25 21:47:10 +02:00
Jonny Tischbein 272eb5eb82 fix doxygen header + indent 2018-10-25 21:47:10 +02:00
Jonny Tischbein fd2e06781d Fix adding / removing photo tags + tagrm delete via GET + Item::update / add Term::deleteAllTags 2018-10-25 21:47:10 +02:00
Michael Vogel dbfe5c9d2a
Merge pull request #6017 from MrPetovan/task/move-pager-out-of-app 
Road to Router Part 5: Move pager out of App
 2018-10-25 21:21:23 +02:00
Ralf Thees 4ddf59e016 indents now with tabs 2018-10-25 09:33:01 +02:00
Hypolite Petovan 14237a9599 Move $pager and $page_offset out of App 
- Move infinite scroll data output in a module hook
- Use Pager instead of paginate() and alt_pager()
 2018-10-25 00:07:15 -04:00
Ralf Thees dfbaa6e198 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-24 21:14:45 +02:00
Hypolite Petovan 9c9ebfc7c9
Merge pull request #6013 from JonnyTischbein/issue_comment_media_link_prompt 
[frio] Add media / link prompt in comments
 2018-10-24 12:17:58 -04:00
Jonny Tischbein 6cd17f2229 Code Standard: indent + renaming function in camelcase 2018-10-24 18:09:54 +02:00
Ralf Thees 722fd653ae Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-24 16:38:29 +02:00
Jonny Tischbein d2b5f77be9 Add multimedia link for jot + enables hover text in jot + autosize in when paste link + renaming / Code Standards 2018-10-24 16:20:10 +02:00
Michael 95dc030926 Show deferred worker tasks in the admin interface and workerqueue logs 2018-10-23 20:38:28 +00:00
Jonny Tischbein ee006bdc18 Code Standards 2018-10-23 20:12:53 +02:00
Jonny Tischbein d0c43c5597 Add prompt for link and media in comment + remove video symbol 2018-10-23 19:50:19 +02:00
Ralf Thees ff203c277d Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-22 23:20:00 +02:00
Hypolite Petovan ac19a9cddc
Merge pull request #5959 from vinzv/patch-2 
Fix broken credits box
 2018-10-21 17:03:55 -04:00
Vinzenz Vietzke 934639654c reverted css changes, adapted credits.tpl from default theme for frio 2018-10-21 22:50:41 +02:00
Ralf Thees 2f7f9ffdd8 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-20 04:40:48 +02:00
Hypolite Petovan afeb6df225
[frio] Enable click through image caption in file browser 2018-10-19 10:46:09 -04:00
Jeroen De Meerleer bad7d1a9dc updated to match coding styles 2018-10-19 09:45:00 +02:00
Jeroen De Meerleer 65f2fc39e2 fixed view of active embedded videos 2018-10-19 09:37:15 +02:00
Hypolite Petovan d0681075bf Add itemsource module 2018-10-18 22:49:25 -04:00
vinzv 2b663ed2b6
Fix broken credits box 
Otherwise the content is exceeding the box, both on desktop and mobile.
 2018-10-18 22:49:03 +02:00
Ralf Thees 5201e9009d Inserted missing hidden input with form_security_token 2018-10-17 22:53:24 +02:00
Jonny Tischbein 3065d1c40a Add Link promt in comment + only add URL instead of attachement via parse_url 2018-10-17 21:05:45 +02:00
Adam Magness 2db8c7d64f Fix template urls from contacts/ to contact/ 
Update templates to match recent contact/ changes.
 2018-10-17 07:25:23 -04:00
Jonny Tischbein 5fd4402074 code standards + fixing navigation links to /contact/... 2018-10-14 20:03:22 +02:00