a01bdbbe2d
Fix wrong merge + nofilter in contact_edit
2018-12-18 08:39:26 -05:00
21a055f670
Merge branch '2018.12-rc' into task/6208-escape-html-true
2018-12-18 08:36:36 -05:00
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
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
e1b3bcc77d
Unescape yet more values with a focus on the vier theme
2018-12-16 22:38:32 -05:00
d0fa7f74c5
Unescape value of generic input field
2018-12-16 22:38:32 -05:00
698d12af79
Unescape variables in events and descriptions
2018-12-16 22:38:32 -05:00
c407fb7963
Avoid escaping relevant template variables
2018-12-16 22:38:32 -05:00
2241ba4540
Remove uses of HTML escaping in Smarty templates
2018-12-16 22:38:30 -05:00
b53a6c5154
The "about" field shouldn't be escaped
2018-12-11 19:24:24 +00:00
6682114069
Fix: The event name mustn't be escaped, since it can contain converted BBCode
2018-12-02 22:35:39 +00:00
924869ab5b
Merge branch 'develop' into bug/6211-fix-contact-nets-all
2018-12-02 10:24:50 -05:00
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
663ba65f17
Remove "all" value for nets parameter
2018-11-30 05:43:07 -05:00
5a929c587f
Merge pull request #6204 from annando/escaping
...
We are now escaping many template fields
2018-11-26 16:31:13 -05:00
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
069c92049a
Just some misspelling
2018-11-25 23:49:40 +00:00
6075245b84
Much more escapes
2018-11-25 20:34:02 +00:00
56f21a4b89
Some more escaping
2018-11-25 19:26:46 +00:00
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
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
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
Adam Magness
218f0734be
Rename removeTags to escapeTags
...
rename function and update calls.
2018-11-09 13:29:42 -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
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
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
Adam Magness
14fde5dc9b
Log function
...
implement log() function.
2018-10-30 09:57:14 -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
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
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
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
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
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
ac19a9cddc
Merge pull request #5959 from vinzv/patch-2
...
Fix broken credits box
2018-10-21 17:03:55 -04:00
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
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
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
307286fc47
parameters and getURLpath to getURLPath
2018-10-10 01:18:47 +02:00
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
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
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
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
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
a6996601d5
Merge pull request #5789 from friendica/master
...
Update develop from master-2019.09
2018-09-23 18:55:20 -04: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
73c1ebc6fd
[frio] Move relevant code to new footer.tpl
2018-09-20 21:02:55 -04:00
Jonny Tischbein
fedaf08bd1
remove old TODO
2018-09-20 17:26:19 +02:00
Jonny Tischbein
763ed35bc3
correct textarea id in insertFormattingToPost
2018-09-20 17:23:29 +02:00
Jonny Tischbein
9bc6238b59
Make formatbar work
2018-09-20 17:20:57 +02:00
Jonny Tischbein
f590d31b4b
Add format bar in new post jot
2018-09-20 17:14:32 +02:00
Jonny Tischbein
5edb124660
make share button visivle via theme js. Avoid illegal multiple use of html id
2018-09-20 17:09:39 +02:00
Jonny Tischbein
4c56724715
make share button visible in preview
2018-09-20 16:50:58 +02:00
Jonny Tischbein
b1720c07ec
Add Share button for preview new post
2018-09-20 16:20:33 +02:00
Hypolite Petovan
18c8a7f247
Fix inline code span display
2018-09-19 23:10:41 -04:00
Hypolite Petovan
7dd6fb3b3c
Rewrite JS hooks
...
- Use event listeners instead of homebrew hooks
- Remove view/js/addon-hooks.js and its references
- Update Addon docs
2018-09-19 22:51:51 -04:00
Hypolite Petovan
8fbcbbda16
Remove references to Pear Text_Highlighter stylesheets
2018-09-19 21:36:21 -04:00
63b5cb4fc6
Issue 5721: Temporarily deactivate the picture upload from private mails
2018-09-13 15:46:37 +00:00
Hypolite Petovan
11a3b45957
[frio] Fix ACL selection in new event modal
...
- Fix this.allow_cid.push isn't a function error
2018-09-09 10:10:17 -04:00
rabuzarus
26607d4a27
Frio - bugfix - don't show new event button if the button isn't available
2018-09-06 14:40:34 +02:00
Hypolite Petovan
8a1581cadd
Merge pull request #5727 from rabuzarus/20180905_-_rise_frio_version
...
Frio - rise frio version
2018-09-05 12:52:42 -04:00
rabuzarus
f9fe162f2f
Frio - rise version
2018-09-05 18:31:09 +02:00
rabuzarus
7c5e964581
Frio - fix missing modal for editing albums
2018-09-05 18:24:04 +02:00
rabuzarus
85fed927c3
Frio - addToModal() can now be used with an element ID as a parameter
2018-09-05 17:30:07 +02:00
Hypolite Petovan
0d8e5eace5
[frio] Mobile: force input font size to 16px
2018-08-25 19:30:18 -04:00
Hypolite Petovan
3bfd0ceed6
[frio] Fix HTML warnings
...
- Add missing space between attributes
- Add missing closing tag to logo SVG mask
2018-08-25 19:30:18 -04:00
Michael Vogel
edcd0a3744
Issue 4960: Ignoring and blocking of contacts should work again ( #5657 )
...
* Issue 4960: Ignoring and blocking of contacts should work again
* Renamed functions
* This function should be renamed as well.
* We now have a frontend to block and ignore public contacts
* Hide some parts for public contacts
* Removed notices, public contact is now accessible from dirfind as well
* We now show contact conversations and contact posts
* We now use a new conversation mode
* The update functionality is disabled until it will work completely
* Fixing tabs chaos
* Update after posts on the contacts page will now work
* Show connect link
2018-08-25 09:48:00 -04:00
Michael Vogel
29b73877a9
Fix the settings in frio ( #5650 )
2018-08-22 00:14:16 -04:00
334c628511
And again ... notices
2018-08-20 21:20:21 +00:00
rabuzarus
dd2d680258
Frio: new photos upload template ( #5637 )
...
* frio - add missing page template to various photo pages (fix missing background)
* frio - rework photo upload album selection
* frio - rework photo upload button
* frio - fix photo upload button and acl
2018-08-20 00:29:50 -04:00
rabuzarus
47c2565917
Merge pull request #5634 from astifter/photo_view_page_icons
...
[frio] Add icons on photo view page.
2018-08-19 23:04:28 +02:00
Andreas Neustifter
66d8a67884
Add icons on photo view page.
...
This page still had textual links, change them to icons. Also remove missleading header.
2018-08-19 21:53:32 +02:00
Andreas Neustifter
fc3aa9e58b
[frio] Vertically align toolbar items. ( #5633 )
2018-08-19 02:19:36 +00:00
rabuzarus
e1d2ee3400
frio - add missing page template to various photo pages (fix missing background) ( #5613 )
2018-08-14 23:58:51 +00:00
Michael Vogel
1283b99c6f
Removed notices in the frio theme ( #5610 )
...
* Removed notices in the frio theme
* And fixed notices in the notifications
* And some more in frio
* Null is the default value
* And some small notice in the probing removed
* Added note
* Clarified note
* And a removed notice in OStatus
2018-08-14 19:37:44 +00:00
Michael Vogel
880b7177c8
And again, and again, and again, ... some more notices removed ( #5601 )
...
* And again, and again, and again, ... some more notices removed
* And some more notices ...
* Some more place
2018-08-11 23:05:42 +02:00
rabuzarus
7cecc5a24c
frio - improve some hover effects to action link/buttons
2018-08-11 13:41:55 +02:00
rabuzarus
8789aedf6b
Frio - Bring back some padding space ( #5585 )
...
* frio - bring back the optical dividing space in the profile widget
* frio - bring back the optical dividing space between the profile picture and the separator line
2018-08-08 12:58:58 +02:00
8b804fa1a2
frio: common_tabs.tpl has now accesskeys as well
2018-08-07 12:55:37 +02:00
083fcd3c9a
frio implemented accesskeys to the nav.tpl
2018-08-07 10:28:41 +02:00
Michael Vogel
8ab661aaed
Merge pull request #5553 from MrPetovan/task/improve-frio-mobile-display
...
[frio] Increase content space on <600px width devices
2018-08-04 23:11:27 +02:00
Michael Vogel
793a4bf803
Merge pull request #5554 from MrPetovan/bug/5544-fix-private-message-js-interactions
...
[frio/vier] Fix JS errors in compose private message page
2018-08-04 23:09:56 +02:00
Hypolite Petovan
e76ddd7745
[frio] Fix shared posts avatars size/position between desktop/mobile
2018-08-04 21:54:02 +02:00
b7b6194297
removing vertical spaces under the notification button ( #5555 )
...
[frio] Removing vertical spaces under the notification button
2018-08-04 21:45:30 +02:00
Hypolite Petovan
ea09a51dff
[frio] Fix JS error in compose private message page
2018-08-04 21:14:29 +02:00
Hypolite Petovan
6cf5fd56e5
[frio] Increase content space on <600px width devices
2018-08-04 20:54:58 +02:00
Michael Vogel
810c108297
Fix: Notes can be posted again. Never use "defaults" with "false" ( #5551 )
2018-08-04 16:06:36 +02:00
Michael Vogel
c72c64a6d8
Notices again ( #5543 )
...
* And again notices
* Notices in the directory
* Much more places
* Fix some double $
* Notice in ping
* Missing field
* Fix: We now remove deleted users from the directory
* Some more stuff
* Notices when removing users
* Added logging
* More logging
* Two more
2018-08-02 07:21:01 +02:00
Andreas Neustifter
7e761fa514
[frio] Fix wrongly removed content wrapper and fix CSS instead. ( #5496 ) ( #5505 )
2018-07-26 11:42:26 -04:00
Andreas Neustifter
830b2edc35
[frio] Remove frame around recent photos. ( #5496 ) ( #5499 )
...
Also layout file properly.
2018-07-25 16:21:43 -04:00
Andreas Neustifter
e8effeb3ae
[frio] Fix layout of profile aside. ( #5497 ) ( #5498 )
...
See issue (#5497 )[https://github.com/friendica/friendica/issues/5497 ] for details.
2018-07-25 16:12:30 -04:00
Andreas Neustifter
b6c254eede
[frio] Fix profile edit links. [ #5474 ] ( #5475 )
2018-07-24 10:20:16 -04:00
Jeroen De Meerleer
a44eeda463
Added bootstrap tables to queues ( #5484 )
...
* Added bootstrap tables to queues
* Changed to double quotes
2018-07-24 08:10:20 -04:00
Hypolite Petovan
a6fb3568f9
Rename dbesc to DBA::escape
2018-07-23 15:30:54 -04:00
Hypolite Petovan
ecea7425f8
Rename DBA::is_result to DBA::isResult
2018-07-23 11:04:14 -04:00
Hypolite Petovan
0ec44f3e8a
Rename DBM method calls to DBA method calls
2018-07-23 11:02:24 -04:00
Andreas Neustifter
303aef34f0
Make frio more consistent by replacing textual links with icons everywhere. ( #5415 )
...
* Make frio more consistent by replacing textual links with icons everywhere I could find them.
* [frio] Move profile add link to icon.
2018-07-21 07:31:05 -04:00
Andreas Neustifter
b26da6096b
[frio] Restyle album edit header. ( #5426 )
2018-07-20 15:23:51 -04:00
Andreas Neustifter
24fc070c5c
[frio] Restyle photo upload ( #5427 )
...
* Better wording in photo upload.
* [frio] Restyle photo uploader to conform to frio style.
2018-07-20 15:23:12 -04:00
Michael Vogel
5af9596dde
New item field "Post-type" and new table "permissionset" ( #5408 )
...
* "post-type" replaces "bookmark" and "type"
* Removed some more type
* Added index to permission set
* The permission set is now stored
* The permission set is now removed upon expiry
* Post update now stores the permission set
* New file
* Permissions are now sorted
* Changed documentation
2018-07-19 09:52:05 -04:00
