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