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
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
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
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
rabuzarus
c01dbc274c
fix remote-link button in vier
2015-06-11 02:49:09 +02:00
rabuzarus
afd1e0e6d0
make use of global.css
2015-05-31 13:55:21 +02:00
rabuzarus
553a152345
Merge photo-template into develop
2015-05-29 16:24:58 +02:00
rabuzarus
5cbb5b140c
css work
2015-05-29 16:08:17 +02:00
fabrixxm
8990a22dc0
duepuntozer: style video delete button
2015-05-24 10:35:55 +02:00
fabrixxm
d204e2524b
vier: style video delete button
2015-05-24 10:34:17 +02:00
fabrixxm
646ea377ac
quattro: readd video delete button styles
...
because i'm not so good at resolving merge conflicts...
2015-05-24 10:28:15 +02:00
fabrixxm
b29b01fad4
Merge branch 'develop' into issue-1574
2015-05-24 10:26:21 +02:00
fabrixxm
4554526515
Merge pull request #1570 from rabuzarus/archive-widget
...
port of red matrix archive widget
2015-05-24 10:18:10 +02:00
fabrixxm
3a71978b0d
Merge pull request #1598 from rabuzarus/datepicker
...
new datetimepicker for event creation
2015-05-24 10:16:29 +02:00
fabrixxm
7c2608e07d
quattro: style video delete button
2015-05-23 22:51:34 +02:00
rabuzarus
5e6c140fc1
add double click on calendar day for frost theme
2015-05-23 20:02:57 +02:00
rabuzarus
6731ffbfc8
event preview for frost theme
2015-05-23 19:23:32 +02:00
rabuzarus
3504b3b94f
make frost + frost-mobile work with datepicker
2015-05-23 18:49:56 +02:00
rabuzarus
76283ff205
cleanup quattro less file
2015-05-23 17:50:18 +02:00
rabuzarus
9c803f7dbb
quattro css changes added to the less file
2015-05-23 17:45:44 +02:00
rabuzarus
30348a1bc0
port of red matrix archive-widget
2015-05-19 01:03:08 +02:00
Johannes Schwab
107b495183
fix infinite scrolling with frost-mobile
2015-04-07 13:26:09 +02:00
Michael Vogel
2eba5a32df
New screenshot for "vier".
2015-03-09 23:21:40 +01:00
Michael Vogel
bf0f7c3d0a
New bbcode elements h1 to h6 for a better conversion of Diaspora content
2015-03-01 20:07:56 +01:00
Michael Vogel
19af382ffb
"plus" is now the default style at "vier" for new installations
2015-02-21 09:44:13 +01:00
Michael Vogel
7e42315d9c
Merge pull request #1408 from tobiasd/issue885
...
decreasing bubble display time in themes from 10s to 5s
2015-02-19 23:02:55 +01:00
Tobias Diekershoff
985d771b13
decreasing bubble display time in themes from 10s to 5s
2015-02-19 21:24:09 +01:00
Michael Vogel
4a1105ede6
scrape/noscrape now contains the date the profile was last updated or the last message was sent.
2015-02-18 23:40:46 +01:00
Michael Vogel
a26d04574d
Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape
2015-02-17 19:18:17 +01:00
Michael Vogel
52de6c11b1
There is now a link to the profile behind the avatar picture on the display page
2015-02-17 17:33:28 +01:00
Johannes Schwab
9f4523dc9a
fix infinite scrolling with frost
2015-02-13 01:21:57 +01:00
Johannes Schwab
12d7ca9b84
improved infinite scrollling
2015-02-13 00:40:59 +01:00
Michael Vogel
842ac46857
Scrape now contains the number of contacts as well.
2015-02-08 23:35:29 +01:00
Michael Vogel
f5ec5a4349
Some diabook features can dramatically slow down the system. There is a new switch to disable this.
2015-02-03 19:59:47 +01:00
Michael Vogel
dbe52c74b5
Added Beanow as author, since he did most of the last changes.
2015-02-02 21:03:14 +01:00
Michael Vogel
9f0e19762e
New version for "Vier". The navigation was restructured and several other stuff was changed as well, thanks to Beanow!
2015-02-02 21:00:32 +01:00
Michael Vogel
6a34210353
Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list
2015-01-27 10:20:00 +01:00
Michael Vogel
848c09935a
The contact list in mails now contains not only the name but also the address.
2015-01-27 08:04:24 +01:00
fabrixxm
44df625bad
Merge pull request #1305 from tobiasd/20150123-quaddro
...
making the ignore button in contact suggestions visible in quattro
2015-01-25 11:59:17 +01:00
Michael Vogel
cb9196f6d6
Issue 1197: New hook for "oembed_fetch_url"
2015-01-25 00:58:51 +01:00
Tobias Diekershoff
a33ca89bb7
adding missing styling to the ignore button in quattro
2015-01-24 07:22:55 +01:00
Tobias Diekershoff
d3bb944700
making the ignore button in contact suggestions visible in quattro
2015-01-23 09:51:24 +01:00
fabrixxm
b2527039b7
add text-only email option
...
add a checkbok to notification settings. if checked, html body is not added to email.
2015-01-20 19:19:58 +01:00
Tobias Diekershoff
a21fe4059b
Merge pull request #1285 from annando/1501-enhanced-poco
...
"location" and "about" for contacts, improved suggestions, improved contacts exchange
2015-01-09 08:37:05 +01:00
Michael Vogel
b36d799044
Fetching "location" and "about" from diaspora. Displaying them on the "display" page.
2015-01-07 01:46:13 +01:00
Tobias Diekershoff
b0ffe11b21
add thread un/ignore functionality to quattro theme
2015-01-05 09:05:27 +01:00
hauke
a72d60f481
Added h-card and functionality for IndieAuth/Web-sign-in
2014-12-28 15:48:24 +01:00
Michael Vogel
8b433c2d11
Vier: New style "dark"
2014-12-13 23:13:34 +01:00
Silke Meyer
f493252ac8
Use a sans-serif font-family in breathe
2014-12-06 20:05:30 +01:00
fabrixxm
bd0b93e630
Merge pull request #1165 from annando/1409-issue-1157
...
Issue 1157: Unused javascript function is removed.
2014-09-27 19:03:20 +02:00
Michael Vogel
2bbd7ab67f
Issue 1157: Unused javascript function is removed.
2014-09-27 14:17:50 +02:00
hauke
2743514791
bug fix #1135 , show more is usable again
2014-09-22 13:53:16 +02:00
fabrixxm
6da5cf8037
fix residual curCSS, should fix #1153
2014-09-20 11:24:06 +02:00
Fabrixxm
d1029e1fb2
tweak quattro theme
2014-09-17 10:59:19 +02:00
hauke
76535578ba
bug fix: live function is deprecated
2014-09-15 19:48:17 +02:00
Michael Vogel
f9bec79a2c
In the profiles the remote connect field was missing
2014-09-11 23:38:24 +02:00
fabrixxm
fd97f3013d
fix quattro scroll and flash and vier flash on display page
2014-09-11 18:56:33 +02:00
Tobias Diekershoff
2234f257b6
missed the settings template for duepunto
2014-09-07 18:02:58 +02:00
fabrixxm
b7bd29c347
Merge pull request #1124 from tobiasd/duepuntoderivs
...
added variations of duepuntozero to the theme as options to be selected
2014-09-07 15:04:26 +02:00
hauke
baabb5ba8b
removed fancybox as it is not used anywhere
2014-09-07 14:54:10 +02:00
Tobias Diekershoff
6415cc1a2c
remove screenshot for greenzero
2014-09-07 14:31:46 +02:00
Tobias Diekershoff
2c8ca3ec36
deleted some editicon.png copies
2014-09-07 14:23:24 +02:00
Tobias Diekershoff
a9782251e5
updating config files for duepuntozero
2014-09-07 14:00:09 +02:00
Tobias Diekershoff
c72d850113
added slackr to duepuntoderivates
2014-09-07 13:57:51 +02:00
Tobias Diekershoff
0989ad335f
added purplezero to duepunto as variation
2014-09-07 13:41:02 +02:00
Tobias Diekershoff
22d0190041
revive easterbunny from the dead
2014-09-07 13:29:56 +02:00
Tobias Diekershoff
bbf22938ae
added Comix as a colorset of duepuntozero
2014-09-07 13:09:02 +02:00
Tobias Diekershoff
2802402e57
added darkzero as colorset of duepuntozero
2014-09-07 13:01:23 +02:00
Tobias Diekershoff
f0aaafa7aa
added Greenzero as colorset of duepuntozero
2014-09-07 12:48:23 +02:00
fabrixxm
735e6bbcb4
Merge pull request #1121 from Beanow/hotfix/bug-1105
...
Fix illegal offset error for vier and quattro.
2014-09-07 12:48:13 +02:00
Beanow
8345ac7313
Fix illegal offset error for vier and quattro.
...
Fixes #1105
2014-09-07 11:47:08 +02:00
fabrixxm
cab46e2772
Merge pull request #1120 from silke/deprecated-themes
...
Deprecated themes
2014-09-07 11:42:04 +02:00
fabrixxm
a58e990cfc
Merge pull request #1118 from tugelbend/master
...
bug fix #1115 : settings were hidden on "social network" and "plugin" page
2014-09-07 11:37:55 +02:00
Silke Meyer
12012be79d
marked four more themes as unsupported
2014-09-07 11:00:58 +02:00
Silke Meyer
d001ee5c65
Marked several themes from the zero theme as deprecated (all but
...
duepunto).
2014-09-07 10:26:45 +02:00
hauke
a162ea7251
bug fix #1115
2014-09-07 10:26:38 +02:00
Silke Meyer
a9b69b063c
Marked several old themes as unsupported
2014-09-07 08:17:22 +02:00
hauke
392b53dbf9
minified js files where out of date and inconsistently used. Removed until decision on minifying strategy
2014-09-06 17:46:31 +02:00
hauke
5205756898
Merge branch 'release/ui-improvements'
2014-09-06 17:02:25 +02:00
hauke
7dcf37f053
changed cursor style on settings page globally
2014-09-06 17:01:05 +02:00
hauke
25d7087d9e
Merge branch 'feature/2014-09-hackathon-ui-improvements' into develop
2014-09-06 16:55:07 +02:00
tobiasd
0e9c8f6f1a
Merge pull request #1108 from tugelbend/master
...
jquery update to version 1.11
2014-09-06 16:35:24 +02:00
hauke
87fa2ee2af
updated jquery to version 1.11, updated themes frost and diabook where necessary
2014-09-06 16:21:03 +02:00
Silke Meyer
6369399b9f
Shrink user icons in timeline to 48x48
2014-09-06 14:38:43 +02:00
Silke Meyer
b9b490057a
different minor modifications
2014-09-06 14:25:36 +02:00
hauke
ec68e33c6b
make items on settings pages fold/unfold on click
2014-09-06 13:53:23 +02:00
Silke Meyer
3290f6b360
Reduced height of navbar
2014-09-06 12:20:55 +02:00
hauke
9a8d106414
fixed contact action button bar, typo correction
2014-09-06 11:49:31 +02:00
hauke
191595766d
removed old comment that is no longer true
2014-09-06 00:14:25 +02:00
Michael Vogel
0e2376b457
Updated font awesome to new version
2014-09-04 01:01:39 +02:00
