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
Tobias Diekershoff
64655ee546
Merge pull request #1687 from annando/1506-location-api
...
API: Return the geo coordinates
2015-06-25 00:00:01 +02:00
Michael Vogel
db256217e6
Removed test
2015-06-24 22:51:46 +02:00
Michael Vogel
5bf7a3b7a5
Fixed inReplyTo in conversations
2015-06-24 22:31:38 +02:00
Michael Vogel
0bac4722cb
Vier: Just another thread improvment
2015-06-24 21:49:51 +02:00
Michael Vogel
c66d095389
Merge remote-tracking branch 'upstream/develop' into 1506-ostatus-evenbetter
2015-06-24 21:05:38 +02:00
Tobias Diekershoff
40bff1a4cf
Merge pull request #1686 from annando/1506-vier-threading-2
...
Improved width for nested comments
2015-06-24 16:27:53 +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
Michael Vogel
87ade53162
Some test code added
2015-06-24 14:21:42 +02:00
Michael Vogel
3841c41186
Improved width for nested comments.
2015-06-24 14:20:08 +02:00
Fabrixxm
bd3f29f266
remove close timeout
2015-06-24 11:27:24 +02:00
Fabrixxm
d8f69737ab
remove debug logs
2015-06-24 11:04:38 +02:00
Fabrixxm
4549773389
fix desktop notification logic, add onclick handler
2015-06-24 10:56:10 +02:00
Fabrixxm
cc9da2512b
move field help text css to global.css
2015-06-24 10:11:11 +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
Michael Vogel
2112b9cacc
Merge pull request #1684 from fabrixxm/install
...
Install: load htconfig template from view/templates/
2015-06-23 14:19:30 +02:00
Fabrixxm
a3cd16bd9f
remove localized htconfig templates
2015-06-23 12:35:51 +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
Tobias Diekershoff
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
Tobias Diekershoff
1e030df286
Merge pull request #1681 from fabrixxm/issue-1629
...
Add contact detail to contact drop confirm
2015-06-23 11:04:26 +02:00
Fabrixxm
4203132e1a
Remove various unused crypto functions
2015-06-23 10:52:02 +02:00
Fabrixxm
600c9c8474
remove RINO from htconfig.php
2015-06-23 10:51:29 +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
Tobias Diekershoff
24c91a4fed
Merge pull request #1679 from fabrixxm/smallfixestothemes
...
use fields template in photo edit form
2015-06-23 09:12:25 +02:00
fabrixxm
2076b95179
Merge pull request #1680 from annando/issue-1642-again
...
Just some more fixing for issue 1642
2015-06-23 09:09:29 +02:00
Michael Vogel
7e4fc930b4
API: Return the geo coordinates
2015-06-23 07:32:14 +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
Tobias Diekershoff
a58596e00a
Merge pull request #1678 from annando/1506-ostatus-completion
...
OStatus: Still some room for improvements
2015-06-22 07:59:40 +02:00
Tobias Diekershoff
bc82b94564
Merge pull request #1677 from annando/1506-vier-threads
...
Vier: Improved threading
2015-06-22 07:55:39 +02:00
Tobias Diekershoff