fabrixxm
18e44001e5
Merge pull request #1630 from annando/1505-ostatus
...
OStatus communication improvements
2015-05-31 10:08:24 +02:00
fabrixxm
1cf3e778e8
Merge pull request #1622 from rabuzarus/albums_widget
...
move html to photo_albums.tpl
2015-05-31 10:07:43 +02:00
Michael Vogel
d732d9d1a8
OStatus replies should now work even if the thread starter isn't in the mentions.
2015-05-31 00:26:11 +02:00
Michael Vogel
788d3cf1ab
Ostatus: The automatical adding of @-replies now uses the correct contact.
2015-05-30 21:45:43 +02:00
rabuzarus
74267310d6
html to section_title.tpl
2015-05-30 02:21:30 +02:00
rabuzarus
b61e39a1cb
cleaning after local merge
2015-05-29 16:30:42 +02:00
rabuzarus
553a152345
Merge photo-template into develop
2015-05-29 16:24:58 +02:00
rabuzarus
a7d417abb2
remove whitespace
2015-05-29 16:18:30 +02:00
rabuzarus
5cbb5b140c
css work
2015-05-29 16:08:17 +02:00
9a22b4818e
Merge pull request #1618 from rabuzarus/vcard
...
remove html and make use of vcard-widget.tpl
2015-05-29 08:52:27 +02:00
rabuzarus
3e0635992f
change the conditions
2015-05-29 04:05:41 +02:00
rabuzarus
a2a8afa583
block local directory for public access
2015-05-28 19:54:23 +02:00
rabuzarus
5990d62b06
use z_root
2015-05-28 16:15:48 +02:00
rabuzarus
415a606a59
better solution to exclude Contact Photos and include count of Photos
2015-05-28 15:54:53 +02:00
rabuzarus
1067718018
little revision
2015-05-27 12:44:40 +02:00
fabrixxm
b3992e1c65
Merge pull request #1599 from fabrixxm/issue-1574
...
Issue #1574
2015-05-27 11:07:30 +02:00
fabrixxm
50b3e49b5d
Merge pull request #1601 from rabuzarus/event-warning
...
event can not end before it has started warning
2015-05-27 11:06:47 +02:00
rabuzarus
15499ff1aa
first step to get html code from photos.php removed
2015-05-27 03:35:29 +02:00
rabuzarus
46338f5e87
using sprintf
2015-05-26 14:49:53 +02:00
rabuzarus
f309f3a681
remove html and use vcard-widget.tpl
2015-05-26 14:32:40 +02:00
rabuzarus
3ad674fa67
better space handling
2015-05-25 16:49:57 +02:00
rabuzarus
e040b60f67
make the heading of the search result translatable
2015-05-24 20:46:40 +02:00
rabuzarus
b754a79968
event can not end before it has started.
2015-05-24 13:33:07 +02:00
Michael Vogel
c6e605992b
Events: Query improvement
2015-05-24 11:46:20 +02:00
fabrixxm
b29b01fad4
Merge branch 'develop' into issue-1574
2015-05-24 10:26:21 +02:00
fabrixxm
3a71978b0d
Merge pull request #1598 from rabuzarus/datepicker
...
new datetimepicker for event creation
2015-05-24 10:16:29 +02:00
fabrixxm
83697cf3e5
Delete attachments on item deletion
...
Delete video from videos page
2015-05-23 22:35:02 +02:00
Michael Vogel
ab67788b4e
SQL speed increase for query and search.
2015-05-23 01:23:31 +02:00
rabuzarus
2ad8fdc40b
port of red matrix datepicker implementation
2015-05-22 18:53:18 +02:00
72e3ffbb4d
Merge pull request #1563 from annando/1505-no-intelligent-shortening
...
Disable intelligent shortening - issue 1540
2015-05-16 12:04:28 +02:00
Michael Vogel
472a6f1380
Added explanation for shortening.
2015-05-15 21:09:00 +02:00
Michael Vogel
d995fc3994
The intelligent shortening for social media systems like Twitter, GNU Social and App.net can now be disabled.
2015-05-15 20:56:05 +02:00
rabuzarus
de197405d0
port of red's event editing preview
2015-05-14 13:20:58 +02:00
9244e8727d
dbesc and normalise_link
2015-05-10 09:10:27 +02:00
0b8b1fdef3
add procy_url around the profile images
2015-05-06 16:14:27 +02:00
fd8c9a9dac
avoid some contacts from profile match listing
2015-05-06 13:02:02 +02:00
Michael Vogel
237b5a6e40
New page setting for the maximum frontend load value.
2015-05-02 22:05:04 +02:00
Michael Vogel
100f6343ad
Highlighting of user names should now work in every case
2015-04-30 06:11:05 +02:00
Michael Vogel
5368fbba82
Bugfix: The android app will have readable notifications again.
2015-04-26 13:25:04 +02:00
Michael Vogel
c348f27e84
Show unread notifications in a different order than read notifications
2015-04-23 08:59:30 +02:00
Michael Vogel
7254f42333
Show unread mails and introductions as well.
2015-04-23 08:37:31 +02:00
Michael Vogel
04cda104ca
New function that will prevent notifications from deleted posts
2015-04-22 08:39:27 +02:00
Michael Vogel
e2827c0af7
The ID field will be stored with notifications as well.
2015-04-21 10:14:20 +02:00
Michael Vogel
261cd441c7
Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications
2015-04-21 10:13:28 +02:00
Michael Vogel
7a1db2e083
Only show one notification per parent
2015-04-16 06:47:09 +02:00
8367cadeef
dont normalise OpenID URLs and fallback to https if no protocol is specified
2015-04-14 12:27:36 +02:00
Michael Vogel
2285b3b7a7
Storing the parent with every notification
2015-04-14 06:54:41 +02:00
Michael Vogel
64e343ed4b
Some refinement to the contact update
2015-04-12 10:32:02 +02:00
Michael Vogel
1058d055d1
Merge remote-tracking branch 'upstream/develop' into 1504-contact-update
...
Conflicts:
mod/contacts.php
2015-04-12 09:59:28 +02:00
fabrixxm
8b2742dc7d
Merge pull request #1505 from annando/1504-unified-follow
...
The behaviour when following a new contact is now unified
2015-04-12 08:48:36 +02:00
Michael Vogel
2c3e2908b2
There is now a new possibility to update contact data.
2015-04-11 23:51:47 +02:00
Michael Vogel
0e895e24f7
Code reworks: replaced hardcoded network text with the corresponding constants.
2015-04-11 22:14:56 +02:00
Michael Vogel
190b7d6070
Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow
2015-04-10 11:34:21 +02:00
dea1b067bd
Merge pull request #1479 from annando/1504-parse_url
...
The order for the page parsing is changed
2015-04-10 10:13:13 +02:00
Michael Vogel
489af0d55d
Just added some forgotten escaping.
2015-04-10 00:54:42 +02:00
Michael Vogel
662fd84891
Automention of communities when a single contact is selected on the network page.
2015-04-10 00:42:03 +02:00
Michael Vogel
e81f9c91fa
Merge remote-tracking branch 'upstream/develop' into 1504-parse_url
2015-04-09 19:49:33 +02:00
Michael Vogel
ccbac6874b
The "connect" link ar the display page now directs to the new "follow" page as well.
2015-04-09 07:45:48 +02:00
Michael Vogel
f6ea872986
The behaviour when following a new contact is now unified.
2015-04-09 00:10:21 +02:00
Michael Vogel
539a93b3f1
The timestamp was at the wrong place
2015-04-06 13:49:57 +02:00
Michael Vogel
3cbd72d907
API: New picture upload function (Enhanced Twidere support)
2015-04-06 03:19:12 +02:00
8ae90035f4
Merge pull request #1480 from annando/1504-diaspora-enhancement
...
Diaspora uses this to fetch single public items
2015-04-05 21:24:21 +02:00
Michael Vogel
32206cd681
Diaspora uses this to fetch single public items.
2015-04-05 20:50:15 +02:00
Michael Vogel
57528cb987
New function for building the "share" header
2015-04-05 20:43:06 +02:00
Michael Vogel
aea83f0bec
The order for the page parsing is changed.
2015-04-05 20:40:31 +02:00
106b0b5d23
Merge pull request #1460 from FlxAlbroscheit/develop
...
Issue 1163: Feature allowing desktop-notifications
2015-04-05 11:37:05 +02:00
fabrixxm
2d3437daa3
different help text for different network
2015-04-04 18:02:26 +02:00
Silke Meyer
c05f95b54e
Improved help text, issue 1349.
2015-04-01 10:10:00 +02:00
fabrixxm
0226258e7b
Block settings page for unauthorized users
...
fixes issue #1459
2015-03-31 10:24:23 +02:00
FlxAlbroscheit
001e940c6c
Feature for desktop-notifications
...
see issue #1163
2015-03-31 02:06:07 +02:00
Michael Vogel
f1c6d6f1ba
Merge pull request #1442 from fabrixxm/issue-1362
...
Add scheme if missing to url inserted by user in 'insert link' jot button
2015-03-24 12:34:31 +01:00
fabrixxm
250b466ed3
Fix blank reponse if no siteinfo are fetched
2015-03-22 11:03:46 +01:00
fabrixxm
1cc9e7db0f
Add scheme if missing to url inserted by user in 'insert link' jot
...
button
2015-03-22 10:59:00 +01:00
fabrixxm
05d1aaf0ed
Use correct class name to send post to email recipients. Fix #1437
2015-03-22 10:12:16 +01:00
fabrixxm
c18ace5517
Merge pull request #1436 from annando/1503-global-copy-comments
...
The global copy now copies comments as well
2015-03-22 09:49:49 +01:00
Michael Vogel
81b199cfdc
The global copy now copies comments as well. This is important for the search.
2015-03-21 20:23:47 +01:00
fabrixxm
9bdd41b774
Merge pull request #1435 from FlxAlbroscheit/develop
...
Access a contact directly from the contact-manager-page [UPDATED]
2015-03-20 15:13:17 +01:00
FlxAlbroscheit
1e15cba631
Access a contact directly from the contact-manager-page
...
Improved my former commit (see: https://github.com/friendica/friendica/pull/1428 )
2015-03-20 15:10:55 +01:00
dd21750d90
Merge pull request #1428 from FlxAlbroscheit/develop
...
Access a contact directly from the contact-manager-page
2015-03-12 07:13:31 +01:00
FlxAlbroscheit
21237ddba6
Give access to contact's profile-URL
2015-03-10 22:44:57 +01:00
Michael Vogel
ea06a1ec45
There is now a "global" field in the item table that tells if this item is present as global copy as well.
2015-03-09 00:45:53 +01:00
Michael Vogel
b080eddf8d
Improved logging for the search.
2015-03-08 03:24:54 +01:00
Michael Vogel
dbe8275ae5
Added some more timestamp measuring
2015-03-07 23:14:26 +01:00
Michael Vogel
1cf3cb493f
removed unneeded code.
2015-03-07 21:39:28 +01:00
Michael Vogel
7c4a1a059d
New fields for the term table, improved query for the tag search. Changed the cache handling for rendered bbcode.
2015-03-07 21:24:39 +01:00
Michael Vogel
027b11ebb5
Small bugfix for likes
2015-03-02 23:34:59 +01:00
Michael Vogel
3f1d186106
Remove the old hashtag functions, change it to the new functionality.
2015-03-01 20:40:38 +01:00
20208acb23
Merge pull request #1417 from annando/1502-improved-markdown
...
Updated libraries for Markdown and mobile detection
2015-02-28 08:17:22 +01:00
Michael Vogel
25eb323d69
Removed the last traces of the old Markdown library
2015-02-23 23:56:44 +01:00
Michael Vogel
440e2d82b1
Global setting for the behaviour of likes.
2015-02-23 12:44:50 +01:00
Michael Vogel
6504568f2e
Merge remote-tracking branch 'upstream/develop' into 1502-like-no-update-commented
2015-02-23 12:35:22 +01:00
fabrixxm
d4b092cec6
Merge pull request #1356 from silke/develop
...
Added help text as requested in #1349 .
2015-02-23 08:51:02 +01:00
Michael Vogel
9eeff0d891
Received "likes" and "dislikes" don't update the "commented" value anymore.
2015-02-22 17:34:04 +01:00
Michael Vogel
f3cc065e66
Show the profile visibility only for Friendica contacts.
2015-02-21 20:03:02 +01:00
Michael Vogel
8179f2f65e
Only show the relation on native networks.
2015-02-20 23:56:41 +01:00
Michael Vogel
1dc961713d
Bugfix: If "all" is selected then no contacts were shown.
2015-02-20 23:33:21 +01:00
Michael Vogel
a8a37a35db
Only show the options that fit to the current network.
2015-02-20 23:12:04 +01:00
Michael Vogel
4a1105ede6
scrape/noscrape now contains the date the profile was last updated or the last message was sent.
2015-02-18 23:40:46 +01:00
Michael Vogel
219932f692
Removed Statusnet from the counting of contacts for scrape/noscrape
2015-02-17 19:27:13 +01:00
Michael Vogel
a26d04574d
Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape
2015-02-17 19:18:17 +01:00
Michael Vogel
2dafc9eac1
Merge remote-tracking branch 'upstream/develop' into 1502-poco-generation-counter
2015-02-15 10:54:41 +01:00
Michael Vogel
d1d794f1ab
The global contacts now contain a "generation" value that defines how we know this contact
2015-02-15 10:52:45 +01:00
d39612ac25
Merge pull request #1393 from annando/1502-cleaned-item-storage-code
...
Additional check for notifications
2015-02-14 15:40:35 +01:00
Johannes Schwab
12d7ca9b84
improved infinite scrollling
2015-02-13 00:40:59 +01:00
Michael Vogel
1a75503b1c
Relocated the cache code.
2015-02-10 08:22:21 +01:00
Michael Vogel
21c63e8b65
Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape
2015-02-09 10:16:48 +01:00
Michael Vogel
e7b2c5dbf3
Bugfix: The value for "global community" wasn't read.
2015-02-09 08:25:12 +01:00
Michael Vogel
c0411ae25a
Enhanced SQL query so that the search is faster.
2015-02-08 23:50:45 +01:00
Michael Vogel
842ac46857
Scrape now contains the number of contacts as well.
2015-02-08 23:35:29 +01:00
Michael Vogel
2a02e1cb9c
Just cleaning up the code.
2015-02-08 20:55:48 +01:00
Michael Vogel
7e9ae24511
Moved several settings from .htconfig.php to the admin settings page.
2015-02-08 20:35:40 +01:00
Michael Vogel
a97d4383a1
Searching for items now always searches public entries from the central item storage with uid=0.
2015-02-08 15:59:22 +01:00
Michael Vogel
8871591a98
Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default
...
Conflicts:
mod/admin.php
2015-02-08 13:26:28 +01:00
Michael Vogel
f931eba7f2
Noscrape is now enabled all the time.
2015-02-08 12:07:35 +01:00
Michael Vogel
1d48ab0191
"altpager" is now the standard value and can be disabled. Depending upon the user reactions we can disable it in an upcoming version.
2015-02-08 11:54:42 +01:00
Michael Vogel
89f260eb6c
The title in the bookmarklet had several asterisk in the title. This had no use for friendica.
2015-02-06 21:10:49 +01:00
be40d9d265
Merge pull request #1359 from annando/1502-more-detailled-location
...
More details in the location field for poco
2015-02-05 08:31:15 +01:00
Silke Meyer
cdd3089444
Help text sounded too complicated
2015-02-04 16:43:31 +01:00
Silke Meyer
6bccf0be79
Added help text as requested in #1349 .
2015-02-04 16:13:07 +01:00
ed280df383
typo in side panel link
2015-02-04 11:27:54 +01:00
Michael Vogel
29f732e811
More details in the location field for poco.
2015-02-04 10:43:30 +01:00
Michael Vogel
8490bedefe
Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage
2015-02-02 22:15:39 +01:00
677f46c076
Merge pull request #1338 from annando/1501-global-contacts
...
Added "about" to noscrape
2015-02-02 21:52:09 +01:00
Michael Vogel
9c0dc86eea
Merge pull request #1342 from tobiasd/20150202_admin
...
added diagnostics tools to the admin side panel
2015-02-02 21:14:41 +01:00
e5766a4793
make strings translate able
2015-02-02 20:37:05 +01:00
8a17c3d348
added diagnostics tools to the admin side panel
2015-02-02 18:26:38 +01:00
Silke Meyer
57a80c3867
Let the browser check if it's a valid email address
2015-02-01 16:25:49 +01:00
Michael Vogel
e02b982f77
Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage
2015-02-01 13:28:32 +01:00
Michael Vogel
e3da549ab5
Reshared diaspora items that aren't on this server are now stored with uid=0
2015-02-01 10:26:35 +01:00
Silke Meyer
8991319d9d
Added a description to the help field
2015-01-31 16:09:59 +01:00
Silke Meyer
c90e47556a
added setting for server's sender email address
2015-01-31 15:54:12 +01:00
Silke Meyer
89946b8660
fixed a typo
2015-01-31 15:23:36 +01:00
Michael Vogel
036ccf84de
And yet another two places where pictures have to be sent through the proxy.
2015-01-28 23:34:46 +01:00
Michael Vogel
b309187e3d
Just two more places where pictures have to be send through the proxy function.
2015-01-28 10:09:16 +01:00
Michael Vogel
04ab875a62
Added "about" to noscrape.
2015-01-27 19:52:54 +01:00
Michael Vogel
848c09935a
The contact list in mails now contains not only the name but also the address.
2015-01-27 08:04:24 +01:00
Michael Vogel
583c2ce13e
poco can now be used to query the global contacts.
2015-01-27 08:01:37 +01:00
Michael Vogel
e8bfa32b37
Scrape now doesn't fetch page data when its twitter and Co./Update script that updates the contacts from the profile
2015-01-26 01:07:15 +01:00
Michael Vogel
bc2c046446
poco: Only update the global contacts when there is a network value/Export your own contact as well
2015-01-25 16:40:20 +01:00
Michael Vogel
105d6a22a4
gender will be updated in the profiles as well.
2015-01-25 13:22:25 +01:00
Michael Vogel
2f400627c7
Support for keywords and gender in (global) contacts.
2015-01-25 13:19:37 +01:00
Michael Vogel
dff2384e82
Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts
2015-01-25 08:44:42 +01:00
1c424a5425
Merge pull request #1315 from annando/1501-issue-1283
...
issue 1283 - Share-it button support for friendica
2015-01-25 08:24:21 +01:00
Michael Vogel
344210bd6d
Global contacts are now added with reshares as well. Better support for "aboutme" and "location" in poco.
2015-01-25 00:19:59 +01:00
Michael Vogel
58d814b793
issue 1283 - Share-it button support for friendica
2015-01-25 00:10:58 +01:00
eaaed02ffd
use type email in users settings as well
2015-01-24 09:40:01 +01:00
8b558eb7ea
type email for email field in add user form
2015-01-24 09:30:44 +01:00
Michael Vogel
1f23d691f3
Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus
2015-01-21 01:30:09 +01:00
Michael Vogel
ed037124b3
Merge pull request #1299 from fabrixxm/optional-text-only-email
...
Optional text only email
2015-01-20 23:26:44 +01:00
Michael Vogel
184dcf75a7
Caching for scrape, keywords for remote_self, notifications for addresses that aren't in your contact list.
2015-01-20 22:54:25 +01:00
fabrixxm
816d3f86e7
reword checkbox help text
2015-01-20 22:17:03 +01:00
fabrixxm
b2527039b7
add text-only email option
...
add a checkbok to notification settings. if checked, html body is not added to email.
2015-01-20 19:19:58 +01:00
3483cd35f8
use HTML5 attributes in the installer wizard
2015-01-16 19:32:31 +01:00
Johannes Schwab
9cb3a4188e
fix network tab urls
2015-01-16 02:25:17 +01:00
Michael Vogel
beaca70126
OStatus: Replies now arrive their target.
2015-01-12 00:14:51 +01:00
Michael Vogel
94fb0305f7
Poco now shows "about" and the location as well.
2015-01-10 00:34:08 +01:00
Michael Vogel
8f1cfac20a
The global contacts now contain the network name so that the suggestions can select between this.
2015-01-08 07:59:20 +01:00
Michael Vogel
46db8575a0
The table "unique_contacts" now has an "about" and "location" field as well.
2015-01-08 01:32:19 +01:00
Michael Vogel
044eaa778f
Markdown is now supported in the location field as well.
2015-01-08 00:13:43 +01:00
Michael Vogel
e7e3857f5c
The "about" section is now run through bbcode.
2015-01-07 18:06:32 +01:00
Michael Vogel
b36d799044
Fetching "location" and "about" from diaspora. Displaying them on the "display" page.
2015-01-07 01:46:13 +01:00
Michael Vogel
16e4e61cc5
Only show contacts from open networks
2015-01-05 22:44:55 +01:00
Michael Vogel
011f5b9cae
Bugfix: Postings disappeared due to a small variable ...
2015-01-05 14:28:17 +01:00
Michael Vogel
47560fc6c7
Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco
2015-01-04 21:07:45 +01:00
Michael Vogel
47129c01f8
Check for filesize before trying to fetch site infos.
2015-01-04 20:04:59 +01:00
Michael Vogel
11c82816b3
Poco now returns the last update date as well. This date will be stored in the gcontact table.
2015-01-04 19:19:47 +01:00
fabrixxm
ecc76c6090
Merge pull request #1254 from annando/1409-shadow-items
...
Global Community
2014-12-31 18:13:58 +01:00
Rabuzarus
5939a8cea5
revert last commit f59e574, remove some html code
2014-12-26 14:44:48 +01:00
Rabuzarus
f59e574068
removed Pagination
2014-12-26 12:54:23 +01:00
Rabuzarus
cb47fdfcb9
minor change: rel should not be part of the PHP
2014-12-26 03:32:21 +01:00
Rabuzarus
73f9d06e3e
move some html code from photos.php to photo_album.tpl
2014-12-25 16:20:55 +01:00
Michael Vogel
043c406091
Update function for creating the shadow entries.
2014-12-21 21:19:37 +01:00
Michael Vogel
d054ac8d9c
redone the changes I accidentally overwrote ... Me and GIT will never be in love ...
2014-12-21 11:02:31 +01:00
Michael Vogel
bc5c470cac
Fix for issue 1191 - Embedded Youtube video isn't playing when SSL is active
2014-12-14 12:47:16 +01:00
Michael Vogel
086b3e30c6
Clarification for the hidewall property.
2014-12-12 23:03:23 +01:00
Michael Vogel
9124d922e9
In "parse_url" now links with [ or ] are replaced with shortened versions to avoid parsing problems.
2014-12-01 22:54:01 +01:00
Michael Vogel
9a414cc4a0
Bugfix: There was a SQL error when trying to deliver friendica posts because of a parameter mismatch
2014-11-15 19:21:54 +01:00
Fabrixxm
2fee5966f1
fix #1222
2014-11-10 15:37:52 +01:00
Fabrixxm
84e93602de
small indentation fix
2014-11-10 15:07:35 +01:00
fabrixxm
fd61391e3e
Merge pull request #1221 from annando/1411-default-value-type
...
Fix: "not null" fields were not set
2014-11-10 09:57:42 +01:00
Michael Vogel
030784ad35
Fix for issue "Field 'type' doesn't have a default value" in the challenge table.
2014-11-08 20:52:15 +01:00
Michael Vogel
70ba1667e1
It is now possible to define the hostname from the admin page. This should definetely end the problem that the hostname couldn't be detected unter certain conditions.
2014-11-08 00:07:21 +01:00
Michael Vogel
691aa17025
fetch further information: it is now possible to define a blacklist for keywords for "fetch further information"
2014-10-30 00:24:23 +01:00
ec4e3d76bc
Merge pull request #1212 from annando/1410-remote-self
...
Remote-Self is now working for Friendica and Diaspora contacts as well
2014-10-29 15:06:21 +01:00
Michael Vogel
59517f6e58
Remote self is now working for diaspora contacts as well.
2014-10-29 01:42:43 +01:00
Michael Vogel
3e57954807
remote-self: Moved the code in a single function and cleaned it up.
2014-10-29 01:05:09 +01:00
Michael Vogel
b1cdaefcb2
Merge branch 'develop' of github.com:annando/friendica into 1410-remote-self
2014-10-27 11:45:39 +01:00
Michael Vogel
2b5372aebe
Forcing all non-SSL requests to SSL requests is now an option.
2014-10-26 22:15:12 +01:00
fabrixxm
4c66a3486a
Merge pull request #1207 from annando/1410-remote-self-with-keywords
...
remote self: There is now an option if the keyswords should be used as tags or not
2014-10-24 10:55:22 +02:00
Michael Vogel
c77a63fb27
remote self: There is now an option if the keyswords should be used as tags or not.
2014-10-24 01:37:33 +02:00
Michael Vogel
26c82f210e
Merge pull request #1198 from fabrixxm/issues/1190
...
Issues/1190
2014-10-23 22:29:50 +02:00
Fabrixxm
f7cf72e450
fix use of $->query_string
2014-10-22 09:32:24 +02:00
Fabrixxm
63168905ec
Fix #1190
2014-10-22 09:04:32 +02:00
Michael Vogel
f6522658f6
Using "remote self" to synchronize Frandiaca accounts
2014-10-22 08:30:16 +02:00
fabrixxm
9d6bcd2572
Merge pull request #1195 from annando/1410-new-hook-getsiteinfo
...
New hook "getsiteinfo" and "page_info_data"
2014-10-22 08:18:42 +02:00
Michael Vogel
97ec2787c6
New feature: Storing the field "extid" is now possible
2014-10-20 08:21:23 +02:00
Michael Vogel
3600289262
New hook "getsiteinfo", separating fetching site info from generating bbcode
2014-10-20 08:03:47 +02:00
56cd536652
use noscrape by default, add opt-out option to disable it
2014-10-13 19:19:54 +02:00
fabrixxm
bff688ef91
Merge pull request #1175 from fabrixxm/master
...
Friendica 'Ginger' 3.3
2014-10-06 10:18:36 +02:00
Fabrixxm
e2dc4f922c
Friendica 'Ginger' 3.3
2014-10-06 08:56:55 +02:00
Michael Vogel
759f199b6f
Created hashtags from keywords now are links. URL are cleaned from tracking data.
2014-10-03 13:02:15 +02:00
Michael Vogel
904f8ac422
Creating hashtags from keywords of a feed, when additional data should be fetched.
2014-10-03 12:18:33 +02:00
Michael Vogel
459fc2fabd
Security issue: Encoding of GUID in itemcache to avoid directory bypassing with a malificious formatted GUID.
2014-09-27 12:49:00 +02:00
Fabrixxm
51e6c30188
add id to album name tag
...
this should be in template
2014-09-17 11:02:18 +02:00
Fabrixxm
f971f52482
remove messages link from notification tabs bar
2014-09-17 11:01:47 +02:00
Fabrixxm
fbe664cc44
fix settings page aside menu active item
...
add aside menu to delegate page
2014-09-17 11:00:34 +02:00
Michael Vogel
f9bec79a2c
In the profiles the remote connect field was missing
2014-09-11 23:38:24 +02:00
Michael Vogel
c8482ae19e
Bugfix: When repairing the url, the nurl wasn't set.
2014-09-11 23:37:55 +02:00
fabrixxm
7687342849
fix email for
...
- registration request
- registration approval
- account created by admin
add a reditect after registration approval or deny
2014-09-09 22:07:47 +02:00
fabrixxm
3ac5e4508b
fix email to new registerd users.
...
fix notification in case of error sending email.
2014-09-07 17:46:31 +02:00
fabrixxm
21b1e09fad
Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup
2014-09-07 14:28:03 +02:00
fabrixxm
a8c90155f8
db update mail via notification()
...
remove last template
2014-09-07 14:23:03 +02:00
fabrixxm
5861bdd6e9
registration request as system notification
...
kill the template
send email to all admins
2014-09-07 13:55:02 +02:00
fabrixxm
5997fb19ee
More template gore!
2014-09-07 12:29:13 +02:00
fabrixxm
803854738b
another massacre of templates
2014-09-07 11:48:23 +02:00
fabrixxm
36a67158d2
Merge pull request #1119 from annando/1409-issue-881
...
The useragent string doesn't contains of the words "Mozilla" anymore
2014-09-07 11:41:51 +02:00
fabrixxm
89f8341ce8
Merge pull request #1117 from annando/1409-suppress-unsported-themes
...
Unsupported themes aren't displayed anymore
2014-09-07 11:37:25 +02:00
fabrixxm
fe02619114
fix indentation
2014-09-07 11:31:42 +02:00
fabrixxm
9a0c37eb47
new password mail via notification()
...
new include/text.php::deindent() function
remove unused templates
2014-09-07 11:20:06 +02:00
Michael Vogel
7af5c3c560
The useragent string doesn't contains of the words "Mozilla" anymore - but the name "Friendica" and the base url
2014-09-07 10:47:37 +02:00
fabrixxm
d85bdd8fb0
lost password verification mail via notification()
2014-09-07 10:27:39 +02:00
Michael Vogel
871b425c6e
Unsupported themes aren't displayed anymore
2014-09-07 10:06:57 +02:00
fabrixxm
1bdddebd44
connection confirm notification mail via notification()
...
remove unused email templates
add a check for unexpected reponse from server
2014-09-06 17:28:46 +02:00
Michael Vogel
3b6c6d0cd9
Issue 1094: "remote self" is not working on twitter contacts but can be activated. It is now disabled to enable it.
2014-09-06 17:22:59 +02:00
0e9c8f6f1a
Merge pull request #1108 from tugelbend/master
...
jquery update to version 1.11
2014-09-06 16:35:24 +02:00
hauke
87fa2ee2af
updated jquery to version 1.11, updated themes frost and diabook where necessary
2014-09-06 16:21:03 +02:00
ca1f408f9b
Merge pull request #1107 from annando/1409-issue-964
...
Issue 964 "Image upload from Twidere" is solved now
2014-09-06 15:57:35 +02:00
Michael Vogel
f8845b6014
Issue 964 "Image upload from Twidere" is solved now
2014-09-06 15:47:45 +02:00
2312b56947
when editing a posting save it, not edit it to submit the changes
2014-09-06 12:49:34 +02:00
7eef05e4f5
Merge pull request #1098 from Beanow/release/profile-editor-improvements
...
Profile editor improvements
2014-09-05 22:20:31 +02:00
Beanow
992684c362
Merge branch 'feature/edit-profile-improvements' into develop
2014-09-04 23:58:22 +02:00
Michael Vogel
e21bcb82d2
Enhance the database structure checks when they failed.
2014-09-04 09:26:56 +02:00
Michael Vogel
e32e458cb8
Added new file for ignoring threads
2014-09-04 01:04:43 +02:00
Michael Vogel
dd908c8415
Bugfix: Messages when ignoring, blocking and archiving contacts now returns the correct messages.
2014-09-03 01:03:23 +02:00
Michael Vogel
2b182b2dcf
After a new friendica contact is added, the user is directed to the contact page of the new contact. (Instead of the remote profile)
2014-09-01 16:55:16 +02:00
Michael Vogel
e35c55dd3b
Remote-self: It is now possible to chose between two different modes of mirroring.
2014-09-01 14:00:21 +02:00
Michael Vogel
4bdd905b3e
Only show foreign items if the profile of the user isn't hidden. Show the user's theme - not the theme of the viewed profile.
2014-08-28 01:06:41 +02:00
Michael Vogel
4ad2bbddc7
If a post is a pure reshare, then show the profile of the original author on the display page.
2014-08-26 17:10:46 +02:00
Michael Vogel
69bb3ff637
Make the network page the new default page after login.
2014-08-25 23:34:29 +02:00
Michael Vogel
dd511ac70a
The "display" page now shows the current author profile with a "connect" link (if there is no current connection)
2014-08-25 14:09:56 +02:00
Michael Vogel
94d2557077
Vier: Some more design changes to "plus" style.
2014-08-21 01:00:56 +02:00
Michael Vogel
d23d26f44d
Reduced options when adding a friendica contact and an address was provided via URL parameter.
2014-08-21 00:56:21 +02:00
Michael Vogel
271a184e1e
proxy: Added support for long addresses. "vier": New style "Plus"
2014-08-16 01:40:38 +02:00
Michael Vogel
de75d8ca7f
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
mod/admin.php
2014-08-13 00:18:05 +02:00
Michael Vogel
d4b2d3bf8a
Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings.
2014-08-13 00:13:13 +02:00
d28c1febc7
Merge pull request #1069 from annando/master
...
Solved (possible) encoding problem, encoding of URLs with GUID
2014-08-12 09:01:12 +02:00
016b6428a0
Merge pull request #1067 from Beanow/feature/noscrape
...
Added noscrape feature.
2014-08-10 13:24:21 +02:00
Beanow
9026810496
Added noscrape feature.
2014-08-10 12:45:34 +02:00
Michael Vogel
b99737986d
The GUID in the link to the items has to be encoded, since it could contain special characters
2014-08-09 09:17:28 +02:00
cf0ebd952f
Merge pull request #1065 from annando/master
...
Refreshing of the network page only when the page is at the beginning
2014-08-07 08:42:25 +02:00
Michael Vogel
f2f73799ba
When storing items, the object-type is detected and stored.
2014-08-07 08:02:24 +02:00
Michael Vogel
e974e586cc
Unified user agent string when fetching data.
2014-08-07 07:58:20 +02:00
Michael Vogel
4d6f28d224
Optimized version of the possibility to reload the content of the network page only at its top.
2014-08-02 00:35:25 +02:00
Michael Vogel
1a865bf400
New description for the option to reload the page only when on top.
2014-08-01 20:11:56 +02:00
Michael Vogel
2f89a9b3e8
Auto update of network page only at top of the page
2014-08-01 19:59:06 +02:00
fabrixxm
27024e3b1d
preferred item image size for theme, get smallest photo near scale requested
...
themes can declare preferred image size for images in items, with
$a->theme_info = array(
"item_image_size" => 1
);
0: original, 1:640px, 2:320px
mod/photo.php returns the nearest scaled image near requested one
if it doesn't exists, instead of nothing
2014-07-30 15:37:34 +02:00
Michael Vogel
25237c0929
Make the friendica android client work again (it had problems with the GUID in the notifications)
2014-07-26 15:01:01 +02:00
Michael Vogel
dbcfe58ea8
parse_url: Removing of warnings with invalid charsets
2014-07-24 22:50:56 +02:00
Michael Vogel
ed1dce93d6
Usage of /display/(guid) as path instead of /display/(user)/(id)
...
Bugfix for adding tags to photos
2014-07-22 00:36:20 +02:00
Michael Vogel
bb5f797047
Preventing an endless loop while fetching site infos
2014-07-14 08:37:40 +02:00
Michael Vogel
58c3ac09a3
Improved option to suppress message flooding by some users.
2014-07-10 23:13:50 +02:00
Michael Vogel
6f5bc8d9a7
Setting the user agent to "Mozilla/5.0 (compatible; Friendica)"
2014-07-10 23:13:07 +02:00
829a92a10e
Merge pull request #1042 from annando/master
...
Workaround for likes from Diaspora, disabling of the automatic reload of the network page
2014-07-10 07:45:27 +02:00
Michael Vogel
6e67d39241
Relocate the site now relocates adresses in the "unique_contacts" table as well.
2014-07-09 21:36:20 +02:00
Michael Vogel
c980e6d20d
Possibility to disable the automatic reload of the network page
2014-07-09 21:32:32 +02:00
Michael Vogel
660bd39efa
Let an item be accssible via the GUI (additionally to uid and item id)
2014-07-09 20:48:34 +02:00
Beanow
e9dc6e4faa
Some changes to the labels and an edit profile button.
2014-07-03 18:39:22 +02:00
Beanow
6089bc94b3
Extend profile editor information.
...
* Labels for splitting fields into sections.
* Security token for profile_photo action.
2014-06-28 01:31:11 +02:00
Beanow
e6364f6680
Redirect profiles list to default profile, when multi_profiles is disabled.
2014-06-28 01:30:10 +02:00
Beanow
a3895c8dee
Exposes new profile data for templating.
...
* Boolean value of whether multi_profiles is enabled.
* Array needed for yesno_field for the hide-friends option.
2014-06-27 18:12:15 +02:00
3600ab1ffc
Merge pull request #1033 from annando/master
...
Temporary paths are now defined automatically
2014-06-24 06:29:35 +02:00
Michael Vogel
5ed5773f57
The temporary paths (temp, lock, itemcache) are now detected automatically when used.
2014-06-23 01:24:39 +02:00
b6e546d1e3
don't add http:// if homepage is not set
2014-06-22 09:44:59 +02:00
Michael Vogel
405a0aaee2
Community: New option to reduce the maximum amount if posts per person.
2014-06-10 20:21:43 +02:00
Michael Vogel
48e2b422dd
Preparation for an bidirectional app.net connector
2014-06-04 21:25:31 +02:00
Michael Vogel
0c77cee667
New database update system that uses the database structure defined in dbstructure.php
2014-06-04 00:44:58 +02:00
Michael Vogel
13fea42d8c
Merge remote-tracking branch 'upstream/master'
2014-05-29 23:04:57 +02:00
Michael Vogel
00b8355ad5
The number of comments per post are now editable.
2014-05-29 22:26:03 +02:00
fabrixxm
d5f80f54d4
Merge pull request #999 from annando/master
...
Starring now works again
2014-05-29 14:22:15 +02:00
Michael Vogel
3da39a0b0d
Starring now works again
2014-05-29 14:17:37 +02:00
fabrixxm
77a54c66be
Merge pull request #998 from annando/master
...
"Vier": New font version, fallback for oembed, more tracking variables removed
2014-05-29 14:04:04 +02:00
Michael Vogel
53d925095f
Added some functionality if oembed isn't working. (Should be extended in the future)
2014-05-29 11:45:32 +02:00
97e74f1570
Merge pull request #987 from annando/master
...
Auto-killing processes, somce changed code in the plaintext function and speed issues in network
2014-05-25 07:59:22 +02:00
Michael Vogel
235eae66bb
New query parameter that Speeds up the network viee when there are many contacts
2014-05-24 11:01:52 +02:00
01c146414c
Merge pull request #965 from annando/master
...
Only show connectors when not "hide wall" is enabled
2014-05-10 06:28:41 +02:00
31312ab1d2
Merge pull request #956 from annando/master
...
New database system that uses PDO if present/Test script for doing database upgrades.
2014-05-09 21:55:01 +02:00
Michael Vogel
5616c58535
Better error handling during install.
2014-05-09 20:44:25 +02:00
fd7e17f91e
save selection to suppress language results (fix 961)
2014-05-05 13:44:33 +02:00
Michael Vogel
6b38968f80
The template "register_adminadd_eml.tpl" was missing for all languages except german. That lead to an empty page when adding users.
2014-05-04 21:11:25 +02:00
Michael Vogel
c41b1c2d55
Building a central functionality to export postings to all networks that only support plaintext postings. In near future this will replace the similar code in the several addons.
2014-05-03 12:04:54 +02:00
Michael Vogel
2db1029830
APC support is removed due to problems with PHP 5.5.
2014-05-03 12:02:25 +02:00
Michael Vogel
a6b03b6263
The remove page now has the settings menu.
2014-04-29 22:34:48 +02:00
Michael Vogel
7b7e372fb0
Suppress showing unsupported addons in the administration.
2014-04-29 14:22:37 +02:00
Fabrixxm
aba27ad404
fix photo comments: use $drop array as in wall_thread and search_item
2014-04-28 09:29:48 -04:00
a9c8aed9b1
Merge pull request #942 from davidmoerike/master
...
Line: 68 f.
2014-04-26 09:16:03 +02:00
c1d14bcc98
Merge pull request #944 from annando/master
...
Some more frontend stuff/Native Diaspora reshare
2014-04-26 09:13:17 +02:00
Michael Vogel
2846dfeb05
Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values.
2014-04-26 02:22:30 +02:00
David
741aab0916
Now more friendly error message. Will tomorrow add a german translation.
...
David
2014-04-25 06:29:03 +02:00
2dfbd448a3
ideni.ca is now pump.io, so don't mention it in OStatus settings
2014-04-24 21:18:12 +02:00
Michael Vogel
9ae9b66328
Export personal data: Now the settings menu on the left side is taken from the settings module.
2014-04-24 11:58:04 +02:00
