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
Michael Vogel
e9542a8d17
OStatus: Support for events and questions
2015-06-21 22:36:24 +02:00
Michael Vogel
da9bbc92d3
OStatus: Support for bookmarks
2015-06-21 22:02:44 +02:00
Michael Vogel
bc42b6440a
Vier: Improved threading
2015-06-21 20:40:39 +02:00
fabrixxm
50af1fc2c3
Merge pull request #1676 from tobiasd/20150620-markdown
...
markdownification problems
2015-06-21 11:46:13 +02:00
Michael Vogel
2afc9c31f9
Changed logging behaviour
2015-06-21 08:32:03 +02:00
Michael Vogel
5221f38db7
ACL: Don't show OStatus contacts in ACL, since you cannot send private messages to them.
2015-06-21 01:37:09 +02:00
Michael Vogel
8229737d2d
Small restructuring
2015-06-21 01:36:23 +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
Michael Vogel
846edd5bbb
Bugfix for repeated items in conversations
2015-06-20 17:26:47 +02:00
Michael Vogel
1bbbf2a5f2
Stuff ...
2015-06-20 14:41:53 +02:00
Michael Vogel
c8430f4c44
Moved all OStatus code in a single file.
2015-06-20 14:40:30 +02:00
Tobias Diekershoff
7c48ed60eb
hide some HTML coded chars from markdownification
2015-06-20 14:27:42 +02:00
Tobias Diekershoff
8fa2030023
<3 causes troubles in D*
2015-06-20 12:31:34 +02:00
Michael Vogel
168906f9c9
Code cleanup
2015-06-20 09:15:19 +02:00
Michael Vogel
6fbb03801c
The OStatus completion is now called before the original item is stored.
2015-06-20 08:44:29 +02:00
Tobias Diekershoff
650e6bc575
Merge pull request #1674 from fraengii/patch-2
...
Update Quick-Start-groupsandpages.md
2015-06-17 10:52:11 +02:00
Frank Dieckmann
3c135c4d78
Update Quick-Start-groupsandpages.md
...
Changed the style in line 12. I think it is better now.
2015-06-17 10:48:23 +02:00
Tobias Diekershoff
f1dbbfd291
Merge pull request #1673 from fraengii/patch-1
...
Update Connectors.md
2015-06-17 10:39:41 +02:00
