ba790def22
NL update to the strings
2015-07-14 16:31:45 +02:00
9e138a42f2
Merge pull request #1758 from annando/1507-salmon
...
OStatus Salmon improvements (Follow, Unfollow works)
2015-07-14 16:24:54 +02:00
Michael Vogel
9ebaa45670
Removed unused template
2015-07-13 23:56:45 +02:00
a54dd8a9db
DE: update to the strings
2015-07-13 08:14:00 +02:00
1efda90498
Merge pull request #1755 from annando/1507-template-update
...
Vier: Some template updates
2015-07-12 21:08:11 +02:00
Michael Vogel
5f86d3d325
removed the picture width, since it is already in the style sheet.
2015-07-12 20:31:49 +02:00
Michael Vogel
6a646d68c5
Updated templates for "vier" (See issue 1733)
2015-07-12 20:27:54 +02:00
Michael Vogel
e22ce8403e
Merge pull request #1752 from tobiasd/20150712-issue1747
...
issue 1747
2015-07-12 18:12:19 +02:00
rabuzarus
2c39387e44
fix for saving searches
2015-07-12 17:43:50 +02:00
d920cf25b0
dont use an empty li, but make a new list for visual separation
2015-07-12 16:16:54 +02:00
Michael Vogel
bc6e5a4f2d
Merge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links
2015-07-06 17:35:48 +02:00
Fabrixxm
95945ecae6
Merge branch 'master' into develop
2015-07-06 16:56:49 +02:00
Michael Vogel
c356da2cad
Diaspora: Improved parsing of linefeeds
2015-07-05 02:33:28 +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
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
b8f99f459b
DE update to the strings
2015-06-30 09:45:05 +02:00
d4fa6ccfe8
IT update to the strings
2015-06-30 09:44:53 +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
rabuzarus
36abf624d8
make supported themes compatible with get_theme_uid
2015-06-29 23:03:44 +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
Michael Vogel
b9c42c37d1
Vier: Colors for notifications changed
2015-06-29 08:00:52 +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
d8c0c62331
work on supported themes to use new acl
2015-06-26 15:44:32 +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
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
d23440af15
use colorbox to display upcomming events
2015-06-25 13:43:41 +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
Michael Vogel
0bac4722cb
Vier: Just another thread improvment
2015-06-24 21:49:51 +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
3841c41186
Improved width for nested comments.
2015-06-24 14:20:08 +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
511c2d2c91
rino: settings in admin, choose lowest common on notify
2015-06-23 17:36:26 +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
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
fabrixxm
35e9fc3b02
use fields template in photo edit form
2015-06-22 20:07:19 +02:00
Michael Vogel
bc42b6440a
Vier: Improved threading
2015-06-21 20:40:39 +02:00
Michael Vogel
66058c6cf4
Remote subscribe from a GNU Social site is now possible
2015-06-13 19:51:45 +02:00
rabuzarus
c01dbc274c
fix remote-link button in vier
2015-06-11 02:49:09 +02:00
Michael Vogel
a2ae4ccc9b
Merge pull request #1636 from rabuzarus/albums_widget
...
make use of global.css
2015-05-31 18:04:40 +02:00
rabuzarus
afd1e0e6d0
make use of global.css
2015-05-31 13:55:21 +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
2550e02399
Merge pull request #1627 from rabuzarus/section-title
...
move html of h2 headings to section_title.tpl
2015-05-31 09:52:46 +02:00
