fabrixxm
5a23bd400c
Merge pull request #1715 from rabuzarus/theme_uid
...
use local theme settings for visitors
2015-06-30 08:41:07 +02:00
fabrixxm
97161413e7
Merge pull request #1714 from annando/1506-mail-link-profile
...
Show preselected mail receivers
2015-06-30 08:37:40 +02:00
fabrixxm
7a0f2b61ab
Merge pull request #1713 from annando/1506-ostatus-completion-timeframe
...
There is now two different checks for the completion of conversations
2015-06-30 08:36:33 +02:00
fabrixxm
76737fbf7b
Merge pull request #1712 from annando/1506-ostatus-guid
...
OStatus: Use the GUID format for the link to the item
2015-06-30 08:35:33 +02:00
fabrixxm
f121184158
Merge pull request #1716 from annando/1506-no-googlemap
...
Removed Google Maps
2015-06-30 08:27:59 +02:00
fabrixxm
511b4566b2
Merge pull request #1717 from annando/1506-ostatus-ignore-delete
...
OStatus: By using Qvitter, users can delete items.
2015-06-30 08:27:03 +02:00
Michael Vogel
06d446595e
OStatus: By using Qvitter, users can delete items. We can't handle that by now, so we ignore it.
2015-06-30 08:08:02 +02:00
Michael Vogel
836432bb9a
Removed Google Maps
2015-06-30 07:42:59 +02:00
rabuzarus
36abf624d8
make supported themes compatible with get_theme_uid
2015-06-29 23:03:44 +02:00
Michael Vogel
ab074e200b
Mail link in profile page
2015-06-29 22:54:26 +02:00
Michael Vogel
bffe35ab71
There is now two different checks for the completion of conversations
2015-06-29 21:53:59 +02:00
Michael Vogel
fcb3cbffe4
OStatus: Use the GUID format for the link to the item
2015-06-29 21:49:42 +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
fabrixxm
6c5b4b96a5
Merge pull request #1710 from rabuzarus/deactivate_log
...
deactivate logger in acl_lookup
2015-06-29 13:48:42 +02:00
rabuzarus
eedf829d5c
deactivate logger in acl_lookup
2015-06-29 13:46:47 +02:00
rabuzarus
68e565889d
moved formatBytes() to /include/text.php
2015-06-29 11:22:29 +02:00
fabrixxm
e46ee26f59
Merge pull request #1704 from annando/1506-vier-notifications
...
Vier: Colors for notifications changed
2015-06-29 08:16:35 +02:00
Michael Vogel
b9c42c37d1
Vier: Colors for notifications changed
2015-06-29 08:00:52 +02:00
rabuzarus
a982320ba9
show maximagesize warning in a human readable format
2015-06-29 02:39:08 +02:00
rabuzarus
4463ae11d8
change profile_url in profile_uid
2015-06-28 13:32:03 +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
729b7f0e72
restore jotplugins
2015-06-27 15:11:18 +02:00
rabuzarus
373bb0822b
get the themes settings of foreign profiles
2015-06-27 14:10:43 +02:00
d0bf3c06a4
Merge pull request #1694 from annando/1506-ostatus-mention
...
OStatus: Notifications now work - even if not mentioned in the post
2015-06-27 11:12:31 +02:00
rabuzarus
787604026f
move some identity based functions to identity.php
2015-06-26 18:57:20 +02:00
rabuzarus
d8c0c62331
work on supported themes to use new acl
2015-06-26 15:44:32 +02:00
rabuzarus
5ce125d6e0
cleanup of some unused code
2015-06-26 15:13:52 +02:00
Michael Vogel
e0f6bd6c28
Merge pull request #1695 from strk/accepted
...
Spelling error: "acepted" -> "accepted"
2015-06-26 13:51:22 +02:00
Sandro Santilli
904b76df85
Spelling error: "acepted" -> "accepted"
2015-06-26 12:03:32 +02:00
Michael Vogel
58b624f877
OStatus: Mentions should work now
2015-06-26 10:41:11 +02:00
Michael Vogel
6eebfb2e13
Merge pull request #1692 from fabrixxm/desktopnotifications
...
Desktop notifications
2015-06-26 08:45:16 +02:00
rabuzarus
37501a883e
make notes work
2015-06-25 22:57:26 +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
fabrixxm
d2a593b4a0
Merge pull request #1693 from rabuzarus/events-reminder
...
use title in events-reminder
2015-06-25 15:06:55 +02:00
rabuzarus
b6b000dd59
delete $md (event-links) because event ID is used
2015-06-25 14:21:12 +02:00
rabuzarus
bc2117c68a
one whitespace
2015-06-25 13:50:48 +02:00
rabuzarus
d23440af15
use colorbox to display upcomming events
2015-06-25 13:43:41 +02:00
rabuzarus
bfebf9636b
acl for events and photos
2015-06-25 12:38:09 +02:00
rabuzarus
12528f033a
include jotnets in populate_acl
2015-06-25 12:33:05 +02:00
fabrixxm
b1ddf28520
Merge pull request #1690 from annando/1506-vier-again
...
Vier: Just another thread improvment
2015-06-25 10:03:19 +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
33f0d00ee1
Merge pull request #1691 from annando/1506-ostatus-evenbetter
...
OStatus: Bugfix in threading, answers to OStatus messages in Friendica posts
2015-06-25 08:38:47 +02:00
Michael Vogel
704110456a
Removed test code
2015-06-25 07:30:14 +02:00
Michael Vogel
7f052b654f
PuSH now supports answers to OStatus messages inside of Friendica threads as well.
2015-06-25 07:18:02 +02:00
Michael Vogel
7581bd0f36
Send a salmon notice whenever an OStatus user is mentioned.
2015-06-25 00:47:59 +02:00
64655ee546
Merge pull request #1687 from annando/1506-location-api
...
API: Return the geo coordinates
2015-06-25 00:00:01 +02:00
