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 |
|
