179201d2bf
Merge pull request #1750 from annando/1507-contact-update
...
Automatic contact update
2015-07-12 15:32:29 +02:00
Michael Vogel
fe137a92ef
Automatically update contact data.
2015-07-11 14:36:04 +02:00
a22581e86c
typo
2015-07-08 13:15:14 +02:00
Fabrixxm
95945ecae6
Merge branch 'master' into develop
2015-07-06 16:56:49 +02:00
fabrixxm
75998b62de
Merge pull request #1726 from rabuzarus/acl-var
...
fix for #1725
2015-07-02 12:13:14 +02:00
rabuzarus
b827c2e805
inlude jotnets for bookmark acl
2015-07-02 12:09:40 +02:00
3349bba665
Merge pull request #1722 from annando/1506-password-on-install
...
Ability to enter a password when the first user is created
2015-07-01 07:53:25 +02:00
Michael Vogel
836058c477
Added help text
2015-07-01 00:41:04 +02:00
Michael Vogel
055ee962c9
Ability to enter a password when the first user is created
2015-06-30 23:37:31 +02:00
rabuzarus
cf2a90dfa2
system settings is now a variable in settings_display.tpl
2015-06-30 14:51:14 +02:00
fabrixxm
5a23bd400c
Merge pull request #1715 from rabuzarus/theme_uid
...
use local theme settings for visitors
2015-06-30 08:41:07 +02:00
Michael Vogel
836432bb9a
Removed Google Maps
2015-06-30 07:42:59 +02:00
fabrixxm
28f0e9a2de
Merge pull request #1696 from rabuzarus/acl-var
...
move jotnets to populate_acl
2015-06-29 13:53:37 +02:00
fabrixxm
1a1c2d74f6
Merge pull request #1698 from rabuzarus/identity
...
move some identity related functions to identity.php
2015-06-29 13:52:07 +02:00
fabrixxm
17514e0d68
Merge pull request #1703 from rabuzarus/readable_bytes
...
show maximagesize warning in a human readable format
2015-06-29 13:50:55 +02:00
rabuzarus
a982320ba9
show maximagesize warning in a human readable format
2015-06-29 02:39:08 +02:00
Michael Vogel
b795bf2935
Merge pull request #1683 from fabrixxm/issue-1655
...
Deprecate RINO1 function, implements RINO2, remove unused crypro functions
2015-06-27 17:39:00 +02:00
rabuzarus
8cca849c2e
Merge acl-var into develop
...
Conflicts:
mod/settings.php
2015-06-27 15:23:19 +02:00
rabuzarus
373bb0822b
get the themes settings of foreign profiles
2015-06-27 14:10:43 +02:00
rabuzarus
787604026f
move some identity based functions to identity.php
2015-06-26 18:57:20 +02:00
rabuzarus
5ce125d6e0
cleanup of some unused code
2015-06-26 15:13:52 +02:00
rabuzarus
65286f79ed
respect hidewall
2015-06-25 20:29:09 +02:00
rabuzarus
94b21245bc
some more work to get acl data into populate_acl
2015-06-25 18:57:42 +02:00
rabuzarus
bfebf9636b
acl for events and photos
2015-06-25 12:38:09 +02:00
Fabrixxm
6fc864c947
rework mod/ping and desktop notification logic
...
`mod/ping.php` returns all notifications ordered by date
mixing system notifications, private messages, intros, registrations
remove 'notify_full' mode
remove `&arr;` from unseen notes, 'seen' attrib now is "1" or "0"
new note attribute 'timestamp'
desktop notification logic use timestamp to check which notification show to the user
notification html template use timestamp to show full date to user in tooltip
`relative_date()` don't append full date on dates older than 24 hours
2015-06-25 10:02:26 +02:00
Fabrixxm
e29d05ce4a
notifications order, unseen css class
...
ping return notfications ordered by notification id
notifications list get seen/unseen class from ping xml
global.css define 'notify-unseen'
2015-06-24 16:10:06 +02:00
Fabrixxm
4036ad2554
Fix desktop notification
...
use on/off field for enable/disable desktop notification
show only new notifications after enable
use localstorage to save enabled/disalbed and last notification id
hide settings on browsers without desktop notification
2015-06-24 09:49:53 +02:00
Fabrixxm
17e8c29768
fix spelling
2015-06-24 08:23:56 +02:00
Fabrixxm
511c2d2c91
rino: settings in admin, choose lowest common on notify
2015-06-23 17:36:26 +02:00
Fabrixxm
6fbb02fb93
RINO 2 based on php-encryption
...
reenable RINO 1 functions, add a deprecation note.
use by default RINO 2 , with crypto from php-encryption
fallback to RINO 1 for old nodes.
2015-06-23 16:13:09 +02:00
Fabrixxm
d06beb1431
install: load htconfig template from templates/
2015-06-23 12:35:51 +02:00
Fabrixxm
7d83a19fd4
Disable RINO
...
Comment out functions for RINO crypt and disable RINO request and response.
2015-06-23 12:02:35 +02:00
5549dd1dbe
Merge pull request #1682 from fabrixxm/issue-1625
...
admin: allow deletion of any users but yourself
2015-06-23 11:05:16 +02:00
Fabrixxm
3168b44317
admin: allow deletion of any users but yourself
...
fix #1625
2015-06-23 10:39:28 +02:00
Fabrixxm
53e6dd6637
Add contact detail to contact drop confirm
...
fix #1629
2015-06-23 10:09:27 +02:00
24c91a4fed
Merge pull request #1679 from fabrixxm/smallfixestothemes
...
use fields template in photo edit form
2015-06-23 09:12:25 +02:00
Michael Vogel
a7cf3639f0
Just some more fixing for issue 1642
2015-06-22 23:47:08 +02:00
fabrixxm
35e9fc3b02
use fields template in photo edit form
2015-06-22 20:07:19 +02:00
Michael Vogel
df7b907bc4
Display: Look for the network name when fetching the contact (important because of the statusnet connector)
2015-06-21 01:34:57 +02:00
78321c2a43
Merge pull request #1670 from annando/setup-rewrite-check
...
The installation prozess has a problem with self signed certificates
2015-06-15 13:25:54 +02:00
Michael Vogel
7feda0120f
This is working fix for issue 1642
2015-06-15 01:20:04 +02:00
Michael Vogel
0e157b1288
Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check
2015-06-15 00:55:05 +02:00
fabrixxm
42f4f3fce9
Merge pull request #1668 from annando/issue-1642
...
Better detection for the mobile client to avoid "{0}" in notifications
2015-06-14 15:58:52 +02:00
Michael Vogel
abc84f96ab
The installation prozess has a problem with self signed certificates.
2015-06-13 21:58:40 +02:00
Michael Vogel
c89c0916e2
Better detection for the mobile client to avoid "{0}" in notifications.
2015-06-13 20:23:26 +02:00
Michael Vogel
66058c6cf4
Remote subscribe from a GNU Social site is now possible
2015-06-13 19:51:45 +02:00
e02546880f
Merge pull request #1662 from annando/issue-1628
...
The values for "sitename" and "register_text" was nedlessly encoded
2015-06-11 06:33:38 +02:00
Michael Vogel
5907c62851
The values for "sitename" and "register_text" was nedlessly encoded with "htmlentities"
2015-06-11 00:12:16 +02:00
Michael Vogel
df3b38679f
This fixes issue 1657
2015-06-10 22:54:41 +02:00
Michael Vogel
cb0351dba0
Send a salmon notification to every mentioned person.
2015-06-09 08:27:04 +02:00
Michael Vogel
419a3ab2d3
Better behaviour when contact wasn't found.
2015-06-08 01:19:40 +02:00
Michael Vogel
a3c497190d
Complete new OStatus import.
2015-06-07 23:18:02 +02:00
Michael Vogel
ba36910343
Removed bad plink detection.
2015-06-03 21:03:46 +02:00
Michael Vogel
c416ce4893
Improved tagging
2015-06-03 11:27:56 +02:00
Michael Vogel
b60677ef1b
OStatus: New fields in OStatus export/ Auto-tagging of replyed authors.
2015-06-03 01:26:46 +02:00
Michael Vogel
39d4856abb
Merge remote-tracking branch 'upstream/develop' into 1506-tag-users
2015-06-02 23:19:00 +02:00
7305a27392
Merge pull request #1647 from annando/1506-performance
...
Performance improvements when searching for existing GUIDs
2015-06-02 22:46:07 +02:00
Michael Vogel
b5129a3e11
Store the GUID from here as well.
2015-06-02 22:10:28 +02:00
Michael Vogel
1a26d464dd
Always add the addressed contacts in a post to the tags.
2015-06-02 20:36:10 +02:00
fabrixxm
a36014fb0f
Merge pull request #1619 from rabuzarus/block-local-dir
...
block local directory for public access
2015-06-02 17:53:19 +02:00
fabrixxm
46052740be
Merge pull request #1632 from annando/1505-ostatus2
...
Send a hubsub notification for every comment
2015-06-01 09:00:17 +02:00
fabrixxm
c12a647f13
Merge pull request #1639 from rabuzarus/albums_widget
...
fix photo_albums upload
2015-06-01 08:34:18 +02:00
rabuzarus
8257e7e1e5
block poco if block_local_dir is true
2015-06-01 01:50:27 +02:00
rabuzarus
a674e782b2
fix Issue #1638
2015-06-01 01:36:37 +02:00
Michael Vogel
fae3592c79
Bugfix: You wasn't able to add an OStatus contact when you are following the same contact via Statusnet connector.
2015-05-31 13:28:16 +02:00
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
