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
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
Alexandre Alapetite
4d092872a5
Escaping moved to template
...
https://github.com/friendica/friendica/pull/6147#pullrequestreview-176051481
2018-11-17 14:01:07 +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
Jonny Tischbein
780d1edf04
Show error message if image exceeds limit + fix close button
2018-10-29 23:06:42 +01: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
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
934639654c
reverted css changes, adapted credits.tpl from default theme for frio
2018-10-21 22:50:41 +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
bfa05156ca
change links from /contacts to /contact
2018-10-13 13:29:56 +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
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
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
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
rabuzarus
26607d4a27
Frio - bugfix - don't show new event button if the button isn't available
2018-09-06 14:40:34 +02:00
rabuzarus
7c5e964581
Frio - fix missing modal for editing albums
2018-09-05 18:24:04 +02: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
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
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
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
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
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
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
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
miqrogroove
b5fe1c60a9
Fix Broken Profile Links ( #5286 )
...
* Expose the block_public setting to head.tpl
* Do not include hovercard.js if block_public
2018-07-14 16:31:46 -04:00
Jeroen De Meerleer
678efab1c9
Add worker queue details ( #5375 )
...
* Added Worker queue page
* Added worker queue template
* Added translation strings
* Added en-US translation
* #TGWHT: Thank god we have Typo
* Where donkey == true
* Added in to menu correctly
* Updated link in summary page
* Updated link on summary page for frio theme
* Updated q() to dba::select()
* Revert "Added translation strings"
This reverts commit f1f3694a2412f69c39559650759b6483013f0f17.
* Revert "Added en-US translation"
This reverts commit 61777489e3add56e81c4f976599d8a2e025265cb.
2018-07-14 14:01:17 -04:00
80ac7da01d
admins can mark their nodes for explicit content ( #5373 )
...
* added field explicidContent to the metadata in the nodeinfo
* admins can mark their nodes for explicit content
* booleans shall be small
2018-07-14 12:08:06 -04:00
30cef1a739
some plugins left over ( #5369 )
...
* tinymce is not used anymore, we can delete the cuson CSS file
* mv the plugins_details template to addon_details
* renamed template called from admin panel
* some CSS classes that should be addon where still plugin
* Insert a warning into the generated quattro CSS files
2018-07-12 13:18:45 -04:00
Andreas Neustifter
dd00a943f2
Only make changes for frio. ( #5347 )
2018-07-11 11:28:38 -04:00
39abfb547d
Update wall_thread.tpl ( #5352 )
...
* Update wall_thread.tpl
named an unnamed style definition to can address it via css
* Update style.css
Added div wall-spacer definition
* Update wall_thread.tpl
removed wall-spacer definition. moved to main css
* Update style.css
* Update wall_thread.tpl
2018-07-10 09:31:29 -04:00
Andreas Neustifter
32ef5623ab
[frio] Improve Group Editing ( #5349 )
...
* Improve group-editing and edit-navigation.
Use icons next to groups and header for navigation to editing groups and adding new groups.
Also use icon from group-sidebar for editing groups.
* Unify look&feel of contact search bars.
* Remove nogroup page and replace with /group/none.
* Make sure proper items are selected in aside.
* Use icon instead of link for 'View Contacs' on profile page.
* Fix none-working /group/none.
* Fix highlighting for everyone in group aside.
2018-07-09 18:36:50 -04:00
rabuzarus
a2fc1be187
fix scroll position in stream while ajax update
2018-06-16 13:05:33 +02:00
rabuzarus
2b69571cbf
Frio: add addon_hooks to head.tpl
2018-06-15 22:55:00 +02:00
rabuzarus
aaeb85c944
Frio: scroll to the contact request in notifications module
2018-06-14 18:49:53 +02:00
rabuzarus
b8186ba98b
Frio: provide a template for received contact suggestions
2018-06-14 17:05:23 +02:00
rabuzarus
9c9b82ba59
Frio: move tos link to a another place in the nave menu
2018-05-27 09:55:05 +02:00
rabuzarus
0d7d688649
frio - add "info about the instance" link into the navbar for non-authed users
2018-05-22 12:44:35 +02:00
Hypolite Petovan
c41332364f
Merge pull request #5089 from tobiasd/20180519-tos
...
privacy statement
2018-05-20 08:20:16 -04:00
c70ebadd7d
Issue-3412 related: Don't send connection posts anymore
2018-05-19 19:34:51 +00:00
dd629d5fa4
registration: added display of privacy statement if enabled
2018-05-19 18:53:54 +02:00
f285d9c7eb
add link to TOS in frios registration template if enabled
2018-05-16 13:41:56 +02:00
eec0826750
added link to the TOS page if it is activated
2018-05-16 11:57:06 +02:00
Andreas Neustifter
babb45efd8
Fix login page layout without OpenId.
...
When OpenId is disabled and the input therefore is missing from the login the page looks
weird. Fix that.
2018-04-27 20:00:46 +00:00
rabuzarus
a19784d209
Merge pull request #4890 from astifter/reorganize_login
...
Reorganize Login to Fix #4878
2018-04-27 19:56:25 +02:00
Hypolite Petovan
86e4690b5f
[frio] Add background-repeat attribute to background image options
...
- Update background image options names and labels
- Add background image option label tag
2018-04-24 20:42:23 -04:00
Hypolite Petovan
0f82c3348d
[frio] Rename bgcolor to background-color
2018-04-24 20:39:34 -04:00
Hypolite Petovan
3bfa6facfc
[frio] Fix typo schema -> scheme
2018-04-24 20:26:14 -04:00
Andreas Neustifter
1a69265da4
Fix missing background tiles.
2018-04-24 21:16:15 +00:00
rabuzarus
ac753e3320
frio - provide a template for invite page
2018-04-24 17:33:48 +02:00
Andreas Neustifter
6a1ce9c9c0
Fix login dialog layout for frio.
...
Rearrange login dialog distinguish better between logging und registering.
2018-04-23 20:29:55 +00:00
Andreas Neustifter
fe74a3d697
Remove empty help spans from templates.
...
The empty spans from the templates mess up the layout sometimes, and are useless weight anyway.
Lets get rid of them.
2018-04-23 20:29:55 +00:00
Hypolite Petovan
a66e9b81ba
Merge pull request #4873 from astifter/develop
...
Remove pagination when empty, move new Member Tips and use common widget to find people.
2018-04-23 10:23:21 -04:00
rabuzarus
763b061a2b
frio - Bugfix - there was a wrong user count in admin-users template
2018-04-23 00:26:00 +02:00
rabuzarus
04bdba0d78
frio - some work on the admin contactblock template to be more consistant with other setting pages
2018-04-22 23:06:06 +02:00
Friendica
390983a331
Haromonize Find People Widget.
...
In the right_aside on the /contacts page in the left aside there are
almost identical widgets to search for contacts. Drop one and use common
widget in both places.
2018-04-22 20:44:22 +00:00
rabuzarus
5a82ee04bc
frio - some work on the admin users template to be more consistant with other setting pages
2018-04-22 20:23:24 +02:00
rabuzarus
54c3efccab
frio - don't show the "insert image" button in modals (because it doesn't work at the current state)
2018-04-21 14:27:57 +02:00
fabrixxm
f976361935
Frio admin/users template: show account type in user details
2018-04-20 14:30:04 +02:00
fabrixxm
23e5225b20
Frio admn/users: use icons for page flags and account type in table
...
to have more space
2018-04-20 14:11:34 +02:00
fabrixxm
516eb2b9ea
Frio admin/users template: fix users avatars, table cols width to have more space
2018-04-20 14:07:11 +02:00
fabrixxm
abd7b2666c
Frio: admin/users template
...
- replace last a href=# with button
- use smallest breakpoint for panels footers
2018-04-19 19:00:16 +02:00
fabrixxm
e909beee04
Frio: admin/users template
...
- move checkboxes on first column
- move select/deselect all as button group on panel footer
- use existing jquery in mod_admin.js for select/deselect all functionality
- add page content wrapper, without padding
- fix user avatar size in "pending deletion" table
2018-04-19 18:17:46 +02:00
fabrixxm
20a2918bda
Frio: admin/user template fixes
...
- small fixes to html
- move js and css to extern files
- move checkboxes to first column
2018-04-18 21:43:33 +02:00
fabrixxm
362654abf0
Fix indentation
2018-04-18 19:44:10 +02:00
fabrixxm
1017e244ca
Frio: add template for admin/users
2018-04-18 17:52:34 +02:00
00311af79b
added missiing information to theme templates
2018-04-12 10:33:28 +02:00
Hypolite Petovan
59d42e9681
Merge pull request #4762 from annando/frio-accessibility
...
Some more accessibility for "Frio"
2018-04-06 17:07:25 -04:00
ed316b38ee
Some more accessibility for "Frio"
2018-04-06 20:42:38 +00:00
Michael Vogel
05cff59f70
Merge pull request #4722 from MrPetovan/task/add-content_filter-hook
...
Add content_filter hook
2018-04-06 06:42:52 +02:00
3792012723
Improved accessibility for "Frio"
2018-04-05 21:50:34 +00:00
Hypolite Petovan
180f7d8218
Add disabled_cw user setting
2018-04-04 23:08:47 -04:00
8bdd417b04
Asynchronous Javascript is deactivated
2018-03-27 05:45:56 +00:00
Hypolite Petovan
daffc27061
Move suppress_tags config to template
...
- Add new item.suppress_tags template variable
- Fix template formatting
2018-03-25 00:38:23 -04:00
Hypolite Petovan
27d94023ee
Merge branch 'master' into develop
2018-03-23 06:15:55 -04:00
858fd127a1
Fix: subscribing to the old followers hadn't worked
2018-03-14 00:27:15 +00:00
Hypolite Petovan
15099a97d5
[frio] Add asynchronous javascript assets loading
2018-03-07 08:08:37 -05:00
