|
|
9575fd4a73
|
Merge pull request #1560 from rabuzarus/add_event
Double click on day in calendar creats new event starting that day
|
2015-05-15 08:20:15 +02:00 |
|
rabuzarus
|
fc4a76c033
|
Double click on day in calendar creats new event starting that day
|
2015-05-15 00:07:41 +02:00 |
|
fabrixxm
|
cbbb5da321
|
Merge pull request #1558 from rabuzarus/event-preview
Event preview
|
2015-05-14 16:32:24 +02:00 |
|
rabuzarus
|
de197405d0
|
port of red's event editing preview
|
2015-05-14 13:20:58 +02:00 |
|
|
|
2dd8db7de8
|
Merge pull request #1554 from FlxAlbroscheit/develop-1
Issue #1504: Creating groups directly from the sidebar in contacts-page
|
2015-05-13 19:59:58 +02:00 |
|
rabuzarus
|
5837fd4f81
|
Merge pull request #1 from friendica/develop
Update from friendica develop branch
|
2015-05-13 13:41:37 +02:00 |
|
FlxAlbroscheit
|
4667d0e7e8
|
Add a group with one click
|
2015-05-12 14:09:51 +02:00 |
|
FlxAlbroscheit
|
57c47a8e36
|
Add a group with one click
|
2015-05-12 14:04:42 +02:00 |
|
|
|
a138d5d8c0
|
Merge pull request #1549 from annando/1505-diaspora-fetch-missing
Fetch missing Diaspora posts
|
2015-05-12 07:14:16 +02:00 |
|
Michael Vogel
|
33e572409d
|
There was no check for duplicated GUIDs, so doubled posts could occur.
|
2015-05-10 20:43:41 +02:00 |
|
Michael Vogel
|
362d3214ba
|
Merge pull request #1547 from tobiasd/2014-05-06-match
avoid some contacts from profile match listing
|
2015-05-10 10:12:16 +02:00 |
|
|
|
9244e8727d
|
dbesc and normalise_link
|
2015-05-10 09:10:27 +02:00 |
|
fabrixxm
|
34ace563a8
|
Merge pull request #1550 from annando/1505-login-delegated
Set the login date for every identity of the user.
|
2015-05-10 08:47:01 +02:00 |
|
Michael Vogel
|
5d1bd96076
|
Set the login date for every identity of the user.
|
2015-05-09 23:47:45 +02:00 |
|
Michael Vogel
|
9d257df700
|
Fetch missing Diaspora posts
|
2015-05-09 19:39:47 +02:00 |
|
|
|
0b8b1fdef3
|
add procy_url around the profile images
|
2015-05-06 16:14:27 +02:00 |
|
|
|
fd8c9a9dac
|
avoid some contacts from profile match listing
|
2015-05-06 13:02:02 +02:00 |
|
|
|
da23543ffd
|
Merge pull request #1546 from annando/1505-diaspora
Bugfix: Shadow copy. Improvement: Fetching of missing items for pictures
|
2015-05-04 08:02:08 +02:00 |
|
Michael Vogel
|
b2ecf805ea
|
Missing $
|
2015-05-03 22:40:20 +02:00 |
|
Michael Vogel
|
faeae280c7
|
Bugfix: There should be no problems anymore with empty Diaspora reshares.
|
2015-05-03 22:15:26 +02:00 |
|
Michael Vogel
|
d4a172c142
|
Bugfix: Shadow copy. Improvement: Fetching of missing items for pictures
|
2015-05-03 21:25:03 +02:00 |
|
|
|
a37f31b82f
|
Merge pull request #1545 from annando/1503-load-issues
Value for maximum load until the frontend quits service
|
2015-05-03 09:15:54 +02:00 |
|
|
|
23ddc6c77d
|
Merge pull request #1544 from annando/1505-oembed-bbcode
OEmbed: Automatic height, changed behaviour in attachments
|
2015-05-03 09:14:56 +02:00 |
|
Michael Vogel
|
237b5a6e40
|
New page setting for the maximum frontend load value.
|
2015-05-02 22:05:04 +02:00 |
|
Michael Vogel
|
0812b7a7ac
|
Merge remote-tracking branch 'upstream/develop' into 1503-load-issues
|
2015-05-02 21:47:34 +02:00 |
|
Michael Vogel
|
439aee0a82
|
Automatically resize iframe if no height was provided.
|
2015-05-01 14:29:53 +02:00 |
|
Michael Vogel
|
747607fe97
|
Merge remote-tracking branch 'upstream/develop' into 1505-oembed-bbcode
|
2015-05-01 11:06:39 +02:00 |
|
Michael Vogel
|
be96b1eaa4
|
rich content in oembed now replaces the content in attachments
|
2015-05-01 10:42:43 +02:00 |
|
|
|
c9e07fa3ac
|
Merge pull request #1543 from annando/1504-oembed-stylesheet
The oembed iframe now has a class name to use it for stylesheets.
|
2015-05-01 10:34:40 +02:00 |
|
|
|
36188f3727
|
Merge pull request #1542 from annando/1504-ping
Highlighting of user names should now work in every case
|
2015-05-01 10:34:14 +02:00 |
|
Michael Vogel
|
b5e10329f2
|
The oembed iframe now has a class name to use it for stylesheets.
|
2015-04-30 06:12:21 +02:00 |
|
Michael Vogel
|
100f6343ad
|
Highlighting of user names should now work in every case
|
2015-04-30 06:11:05 +02:00 |
|
|
|
37cd2c45d1
|
Merge pull request #1539 from annando/issue-1536
Redefined the conditions when notifications and introductions are shown.
|
2015-04-27 07:55:37 +02:00 |
|
Michael Vogel
|
d8558366aa
|
Redefined the conditions when notifications and introductions are shown.
|
2015-04-26 22:16:38 +02:00 |
|
|
|
8184eac42f
|
Merge pull request #1538 from annando/1504-api-twidere-conversations
API: The "conversation" function can now be called with every message id
|
2015-04-26 14:02:36 +02:00 |
|
|
|
96d46588f2
|
Merge pull request #1537 from annando/1504-notifications-android-app
Bugfix: The android app will have readable notifications again.
|
2015-04-26 14:01:42 +02:00 |
|
Michael Vogel
|
58aeb1879b
|
API: The "conversation" function can now be called with every message id of a post in that conversation. Not only the parent.
|
2015-04-26 13:26:48 +02:00 |
|
Michael Vogel
|
5368fbba82
|
Bugfix: The android app will have readable notifications again.
|
2015-04-26 13:25:04 +02:00 |
|
|
|
7e514d56fe
|
Merge pull request #1535 from annando/1504-matrix-detection
New function that detects red matrix accounts
|
2015-04-25 13:46:48 +02:00 |
|
|
|
fe1e62560d
|
Merge pull request #1534 from tobiasd/20150425_de
DE update to the strings
|
2015-04-25 11:22:14 +02:00 |
|
|
|
e9dd3b38f3
|
DE update to the strings
|
2015-04-25 11:18:30 +02:00 |
|
Michael Vogel
|
8e19d36d27
|
Exchanged the hard coded comparism with the new function.
|
2015-04-25 11:08:53 +02:00 |
|
Michael Vogel
|
20fc0e5285
|
Don't generate a preview in an item from Diaspora if it is a posting from red matrix.
|
2015-04-25 00:50:48 +02:00 |
|
|
|
d2d88e25e4
|
Merge pull request #1530 from tobiasd/20150424
linefeeds in DE docs part of #1478
|
2015-04-24 10:02:42 +02:00 |
|
|
|
deee750dc4
|
linefeeds in DE docs part of #1478
|
2015-04-24 09:55:16 +02:00 |
|
fabrixxm
|
4f01c4947c
|
Merge pull request #1529 from annando/1504-condensed-notifications
Condensed notifications
|
2015-04-24 08:42:02 +02:00 |
|
Michael Vogel
|
c348f27e84
|
Show unread notifications in a different order than read notifications
|
2015-04-23 08:59:30 +02:00 |
|
Michael Vogel
|
7254f42333
|
Show unread mails and introductions as well.
|
2015-04-23 08:37:31 +02:00 |
|
|
|
893e91a14d
|
Merge pull request #1527 from fraengii/2015-04-22-Chats.md-fraengii
Chats.md: Linguistic style, capitalization of addresses
|
2015-04-22 13:29:03 +02:00 |
|
Frank Dieckmann
|
22fefb731c
|
Chats.md: Linguistic style, capitalization of addresses
|
2015-04-22 12:28:19 +02:00 |
|
