bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
23106 commits 4 branches 62 tags 178 MiB
Commit graph

5450 commits

Author SHA1 Message Date
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 H 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