e447375cdd
Merge branch '2019.01-rc' into bug/6334-escape-get-app
2019-01-06 16:38:48 -05:00
935b86749d
Unescape invite_desc template variable
2019-01-03 21:29:30 -05:00
5e1ceb57de
Escape global namespaced get_app() calls
...
- Add deprecated status
2019-01-03 21:27:36 -05:00
e86b8ef782
Use nickname instead of email for Login Name
2019-01-03 20:42:29 -05:00
61664ee659
Update usages of User::updatePassword
...
- Add password rules in mod/settings display
2019-01-01 01:15:52 -05:00
e7ee3d7200
Merge pull request #6345 from MrPetovan/bug/6283-clear-message-notifications
...
Clear private message notifications
2018-12-31 08:21:55 +01:00
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
e9b05bd13f
Remove fake private message notifications from ping output
2018-12-30 01:11:30 -05:00
36f995ed20
Add notification clear on private message display
2018-12-30 01:11:02 -05:00
5abc22f6c5
Replace q() with DBA methods, fix code style
...
- Remove unused variables
- Fix doc block
- Fix indentation
2018-12-30 01:08:51 -05:00
d838e6d0ec
Fix unread message conversation title display
2018-12-30 01:04:52 -05:00
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
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
c07fa5d069
Merge pull request #6332 from annando/assign-uid
...
Only assign a uid to the profile if not defined by now
2018-12-27 09:28:22 -05:00
826965f6df
Only assign a uid to the profile if not defined by now
2018-12-27 09:58:21 +00:00
fabc90e9dd
Merge branch '2018.12-rc' into task/move-config-to-php-array
2018-12-27 01:47:53 -05:00
620395378e
Normalize uses of Strings::formatNetworkName to $network_link
...
- Unescape HTML template variable $network_link
2018-12-26 11:11:38 -05:00
a939581cf8
Merge pull request #6325 from annando/always-magic
...
Always use magic on the same server
2018-12-25 16:16:03 -05:00
a565406b47
Always usa magic on the same server
2018-12-25 19:43:57 +00:00
761e94d134
Remove redundant htmlentities/htmlspecialchars
2018-12-25 11:37:57 -05:00
4cd2c83d5c
Replace q() calls in mod/viewcontacts
2018-12-25 11:37:57 -05:00
00f90571ad
Remove random profile behavior from /profile
2018-12-25 11:37:57 -05:00
56d612b2f0
Merge pull request #6323 from annando/issue-6316
...
Issue 6316: Do not double encode / Avoid notice
2018-12-25 11:26:54 -05:00
9feab828c8
Fixing double encoding here as well
2018-12-25 12:30:27 +00:00
6488738790
Merge pull request #6321 from MrPetovan/bug/6316-escape-event-output
...
Escape event output
2018-12-25 08:33:43 +01:00
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
a8b0aa8c8d
Normalize expected format for event fields summary, desc and location
...
- Remove unnecessary HTML escaping on event submit
- Add HTML escaping on event display
- Add HTML to BBCode conversion for received ActivityPub events
2018-12-24 23:00:35 -05:00
c9c9fc3a96
Code cleanup in events
...
- Replace killme() with exit()
- Use correctly escaped query string
- Simplify perms2str input filtering
- Add expected json header to /events/json
2018-12-24 23:00:35 -05:00
acaee626f5
Remove include/ requires that are now done directly from Composer
2018-12-24 09:56:25 -05:00
b962fc989a
Rework mod/msearch
...
- Remove deprecated q()/killme() calls
- Ensure an output on empty search string
- Fix page number nonsense (-1, +1,...)
2018-12-24 00:57:21 -05:00
1938ec3ebe
Rework mod/match
...
- Replace classic pager with a start index
- Remove q() calls
- Ensure template is still loaded even with no results.
- Improve Minimal Pager display of next link
2018-12-24 00:56:14 -05:00
c06f7ad11e
The curl result is an object, not an array
2018-12-22 17:00:28 +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
1c58363696
Remove unused/empty template variables in register
2018-12-20 23:59:15 -05:00
66bf39216b
Remove unreliable ANY_VALUE from message list query
2018-12-19 06:41:08 -05:00
Jonny Tischbein
5d81738034
Add page-wrapper for probe + webfinder
2018-12-17 23:15:14 +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
f6c3974c8f
Issue 6257: Make notes visible again
2018-12-13 20:09:19 +00:00
cced018825
Possibly fix a memory issue with large posts
2018-12-11 18:48:33 +00:00
f2e2066d33
Non public content is now displayed again to visitors.
2018-12-09 13:09:49 +00:00
8fbe0d46e9
Fix for remote authentication when visiting contact's pages
2018-12-08 20:28:01 +00:00
491fc5f78a
Issue 6168: "redir" now mostly use OWA
2018-12-04 07:12:55 +00:00
5e60fa8210
Merge pull request #6225 from annando/http-error
...
Using the standard function to return http errors
2018-12-02 16:15:04 -05:00
02a72ef04f
Simplify the call
2018-12-02 20:14:53 +00:00
649228cd3d
More detailled HTTP error explanations
2018-12-02 20:10:53 +00:00
83489b36c4
Using the standard function to return http errors
2018-12-02 19:33:01 +00:00
924869ab5b
Merge branch 'develop' into bug/6211-fix-contact-nets-all
2018-12-02 10:24:50 -05:00
Michael Vogel
5a3991d4f7
Merge pull request #6219 from MrPetovan/task/remove-x
...
Remove x()
2018-12-01 23:40:51 +01:00
f9f4afa35c
Merge pull request #6220 from AndyHee/patch20181129
...
Fixing permanent deletion counter
2018-12-01 08:19:38 -05:00
4e20c0e50a
Typo
2018-12-01 13:25:58 +07:00
14b4fac818
Fixing permanent deletion counter
2018-12-01 13:21:54 +07: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
9d8eca2287
Using the same function for display and objects
2018-11-29 22:42:10 +00:00
39ce33f7ed
Issue 6212: No need of a redirect for fetching content
2018-11-29 15:06:00 +00:00
b42760b0e6
Move credits out of util/
2018-11-28 22:59:06 -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
4ce320fc79
Contact search is now escaped
2018-11-25 19:48:26 +00:00
56f21a4b89
Some more escaping
2018-11-25 19:26:46 +00:00
8fda63ca86
Merge pull request #6198 from MrPetovan/task/user-removal-improvements
...
User removal improvements
2018-11-25 08:45:45 +01:00
5437e99090
Merge pull request #6181 from JonnyTischbein/feature_admin_subsubpages
...
[Frio] Add collapsable panel groups for admin/site with anchors at headlines
2018-11-25 02:36:48 -05:00
Jonny Tischbein
3af59eaba4
Move all warning text in L10n + frio: make warning closable
2018-11-25 08:32:05 +01:00
c964e193b9
Replace *.ini.php by *.config.php in comments
2018-11-25 01:44:51 -05:00
1501b998fa
Add self-removal prevention in mod/admin
2018-11-24 20:59:38 -05:00
54f4ac6ae0
Remove redirection from User::remove
2018-11-24 20:58:41 -05:00
0bae80a2d3
Update deprecated calls in Model\user and mod/removeme
2018-11-24 20:56:38 -05:00
Jonny Tischbein
66a18702c0
Frio: Move relocation warning from headline to bootstrap danger box
2018-11-24 22:50:42 +01:00
Michael Vogel
3f4636d490
Merge pull request #6183 from MrPetovan/bug/6135-hide-follower-only-birthdays
...
Hide follower-only birthday reminders
2018-11-24 15:55:43 +01:00
f001a830ee
Merge pull request #6196 from annando/notices
...
Fixes a notice and wrong counting of nodes
2018-11-24 08:21:23 -05:00
Michael Vogel
42a3610a79
Merge pull request #6184 from MrPetovan/task/normalize-bbcode-hashtags
...
Normalize BBCode hashtags links
2018-11-24 13:14:50 +01:00
88894511a3
Fixes a notice and wrong counting of nodes
2018-11-24 11:38:36 +00:00
Jonny Tischbein
36aca259d5
Change saving active panel from js localStorage to via html #anker
2018-11-24 00:44:11 +01:00
c23d1b2776
Urlencode /network file parameter
2018-11-23 10:02:30 -05:00
9774fd8be9
Remove unused parameter $save in HTML::search
...
- Remove unused variables in saved_search()
2018-11-23 09:53:14 -05:00
8d7fb35463
Prevent fatal error when $friends isn't an array
2018-11-22 19:03:24 -05:00
03c5c7ca0a
Fix formatting in mod/ostatus_subscribe
2018-11-22 19:03:02 -05:00
81f89ccae8
Remove stored URL from hashtag terms
2018-11-22 09:33:42 -05:00
4874f7f8ab
Remove useless rawurlencode calls for building hashtag bbcode
...
- Fix some formatting
2018-11-22 09:32:41 -05:00
d71e856535
Replace remaining occurrences of "0001-01-01" with DBA::NULL_DATE
2018-11-21 23:53:45 -05:00
c91a87bc07
Fix typo in comment in mod/redir
2018-11-21 22:27:57 -05:00
20e7e7e3ac
Add new REGISTER_INVITATION value to mod/friendica output
2018-11-21 22:27:50 -05:00
2ef23300a3
Merge pull request #6179 from Alkarex/sql-distinct-fix
...
Fix SQL grammar error: ORDER BY clause is not in SELECT
2018-11-21 08:07:33 -05:00
Alexandre Alapetite
a1238d03a6
Fix SQL grammar error: ORDER BY clause is not in SELECT
...
```
2018-11-21T08:31:28Z@e3393hprfvfqnblturqp56rjnp [Info]:DBA.php:557:p
DB Error 3065: Expression #1 of ORDER BY clause is not in SELECT list,
references column 'friendica.item.created' which is not in SELECT list;
this is incompatible with DISTINCT
q, profile_content, update_profile_content,
LegacyModule::runModuleFunction, LegacyModule::content, call_user_func,
App::runFrontend
SELECT DISTINCT(`parent-uri`) AS `uri` FROM `item` INNER JOIN `contact`
ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND
NOT `contact`.`pending` WHERE `item`.`uid` = 1 AND `item`.`visible` AND
(NOT `item`.`deleted` OR `item`.`gravity` = 3) AND NOT
`item`.`moderated` AND `item`.`wall` AND `item`.`unseen` ORDER BY
`item`.`created` DESC
```
2018-11-21 09:57:34 +01:00
85529ed8ff
"viewcontacts" hadn't displayed the AP contacts
2018-11-21 08:50:43 +00:00
d89e3f4264
To safe or not so save, that is the question
2018-11-19 16:36:31 +00:00
b486e48cd6
14 days
2018-11-19 10:02:44 +00:00
ad3502078f
Merge remote-tracking branch 'upstream/develop' into dbclean
2018-11-19 10:01:09 +00:00
191c1a400a
The expiry of conversations can now be configured in the admin panel
2018-11-19 06:58:46 +00:00
43079bfaf8
Several default features are now in the core
2018-11-18 20:13:46 +00:00
Jonny Tischbein
7c690c93bb
Fix setting permisson as post for uploaded photo in album via modal create post
2018-11-17 19:14:59 +01:00
22fedc9a1a
Merge pull request #6152 from JonnyTischbein/issue_delete_from_saved_folder
...
Fix deleting last element and displaying empty saved folder
2018-11-17 11:59:24 -05:00
Jonny Tischbein
590fbe8c6f
More Code Standard
2018-11-17 17:27:12 +01:00
Jonny Tischbein
4f8e50d834
Code Standard
2018-11-17 17:24:30 +01:00
fabrixxm
1e9e06a325
Use appropriate redirect in dfrn_poll
...
Got an error while remote auth to a local user, where $destination_url
is relative.
2018-11-17 16:12:45 +01:00
Jonny Tischbein
56406b9910
Fix SQL Error if no items where found + Fix setting to null
2018-11-17 13:22:32 +01:00
Jonny Tischbein
52eb2281e4
Fix deleting last element from saved folder + Fix displaying empty saved folder
2018-11-17 12:41:00 +01:00
Alexandre Alapetite
b190c2e9c7
Title difference for two different ATOM feeds
...
Fix for
https://github.com/friendica/friendica/issues/6128#issuecomment-439016471
2018-11-17 00:05:13 +01:00
Alexandre Alapetite
51f0d52100
WebSub fixes
...
More fixes related to https://github.com/friendica/friendica/issues/6128
* Bug when using direct ATOM URL, which ends with .atom after nick name
* Bug when callback URL already has some ?query=parameters (which is
quite usual)
Slight refactoring
2018-11-15 12:54:04 +01:00
b0d8a2fcd0
Merge pull request #6127 from annando/notice
...
Avoid "Cannot modify header information - headers already sent"
2018-11-14 10:20:47 +01:00
