miklo
/
friendica
sforkowany z mirror/friendica
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność
22 553 Commity
3 Gałęzie
56 Tagi
164 MiB
Wykres commitów

5361 Commity (f190aa2140514003d79071e9feb344a9ec1943d8)

Autor SHA1 Wiadomość Data
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
Jonny Tischbein bfa05156ca change links from /contacts to /contact 2018-10-13 13:29:56 +02:00
Jonny Tischbein 738cb4ace6 finish refactoring to Module\Contact 2018-10-13 11:35:51 +02:00
Jonny Tischbein cdbddd0103 Renaming functions and class 2018-10-13 11:23:52 +02:00
Jonny Tischbein 80ea86113d Move mod Contacts to /src/Module 2018-10-11 23:14:12 +02:00
Philipp Holzer 307286fc47
parameters and getURLpath to getURLPath 2018-10-10 01:18:47 +02:00
Philipp Holzer 5a02e39a65
Rename App Methods 
- renamed a lot of App methods to CamelCase
- replaced direct public variables with get-/set-Methods
 2018-10-10 00:16:06 +02:00
Hypolite Petovan 903290a764
Revert "Word Wrap for long words in comments" 2018-10-09 15:09:51 -04:00
Jonny Tischbein c0fc3c9845 frio set working css property + adding fix for vier 2018-10-09 17:12:28 +02:00
Jonny Tischbein 05d27e48aa word-wrap for comments in frio style.css 2018-10-09 16:47:28 +02:00
Hypolite Petovan 58c6ef2bc0
Merge pull request #5841 from JonnyTischbein/issue_profile_edit_sexual_marital 
Fix (short) profile editing showing 'e' for martial and sexual preferences
 2018-10-06 07:13:04 -04:00
Jonny Tischbein 17019772a4 Fix (short) profile editing showing 'e' for martial and sexual preference 2018-10-06 11:37:15 +02:00
Tobias Diekershoff 632dd93145 DE translation update 2018-10-06 10:12:37 +02:00
Tobias Diekershoff f361947044 CS translation update THX Aditoo 2018-10-06 10:03:04 +02:00
Tobias Diekershoff 4a7aad3ec8 PL translation update THX waldis 2018-10-06 10:02:14 +02:00
Jonny Tischbein 5a5a281ed2 css for submit button 2018-10-05 00:11:13 +02:00
Jonny Tischbein 2802f031d4 Submit button for rss poll 2018-10-05 00:08:16 +02:00
Michael Vogel 103535d620
Merge pull request #5773 from MrPetovan/task/rewrite-js-hooks 
Rewrite JS hooks
 2018-10-01 17:10:30 +00:00
Jonny Tischbein 1add30cc5b Adding serversettings table in template for non frio themes 2018-09-27 20:04:33 +02:00
Jonny Tischbein 1803862fc5 associative array + adding mysql value + removing table header 2018-09-27 19:46:28 +02:00
Jonny Tischbein 16d37acca1 fix indent 2018-09-27 19:00:24 +02:00
Jonny Tischbein 24117c24ce Get PHP Configuration for upload limit and display in /admin summary site 2018-09-27 18:53:16 +02:00
Hypolite Petovan 8b55bc5881 Normalize padding of inline code 
- [frio] Remove redundant CSS
 2018-09-24 08:32:17 -04:00
Hypolite Petovan be348cf8c8 Remove addon_hooks template variable 
- Update addon documentation
 2018-09-24 08:16:26 -04:00
Hypolite Petovan a6996601d5
Merge pull request #5789 from friendica/master 
Update develop from master-2019.09
 2018-09-23 18:55:20 -04:00
Hypolite Petovan c17a2b8a4e Add missing change to quattro main less file 2018-09-23 12:52:50 -04:00
Tobias Diekershoff 780571bb68 CS translation update THX Aditoo 2018-09-22 19:30:26 +02:00
Jonny Tischbein b7e7850b75 disable formatbar in xs screens 2018-09-21 17:46:39 +02:00
Benjamin Lorteau f0cdd25e34 Register Friendica stylesheet using App->registerStylesheet() 
- Remove mentions of {{$stylesheet}} in head.tpl templates
 2018-09-21 09:54:09 -04:00
Jonny Tischbein 08879298ea unique html id for share button in preview 2018-09-21 11:12:20 +02:00
Hypolite Petovan 2ae6556b32 Add new 'head' hook 
- Add new App->registerStylesheet method
- Reworked App->init_pagehead into App->initHead
 2018-09-20 21:30:51 -04:00
Hypolite Petovan cc73aec3ba Add postprocess_liveupdate JS event dispatch on post preview 2018-09-20 21:03:23 -04:00